Google Git
Sign in
eclipse/pde/eclipse.pde.ui/refs/heads/flat^!/.
commit
4faa1c9cfd0bf39f6e21f71a0c72164acc510410
[log]
author
cvs2svn <platform-releng-dev@eclipse.org>
Fri Oct 14 23:20:15 2005 +0000
committer
cvs2svn <platform-releng-dev@eclipse.org>
Fri Oct 14 23:20:15 2005 +0000
tree
eed63f1cad045c280303a0467cffd9db940ef444
parent
bdec3f3186cf5a150e2add353d08d4eb1b38f195 [diff]
This commit was manufactured by cvs2svn to create branch 'flat'.

Sprout from master 2005-10-14 23:20:13 UTC Wassim Melhem <wmelhem> '*** empty log message ***'
Delete:
    ui/org.eclipse.pde.junit.runtime/.classpath
    ui/org.eclipse.pde.junit.runtime/.cvsignore
    ui/org.eclipse.pde.junit.runtime/.project
    ui/org.eclipse.pde.junit.runtime/.settings/org.eclipse.pde.prefs
    ui/org.eclipse.pde.junit.runtime/META-INF/MANIFEST.MF
    ui/org.eclipse.pde.junit.runtime/about.html
    ui/org.eclipse.pde.junit.runtime/build.properties
    ui/org.eclipse.pde.junit.runtime/plugin.properties
    ui/org.eclipse.pde.junit.runtime/plugin.xml
    ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/CoreTestApplication.java
    ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/LegacyCoreTestApplication.java
    ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/LegacyRemotePluginTestRunner.java
    ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/LegacyUITestApplication.java
    ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/RemotePluginTestRunner.java
    ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/UITestApplication.java
    ui/org.eclipse.pde.runtime/.classpath
    ui/org.eclipse.pde.runtime/.cvsignore
    ui/org.eclipse.pde.runtime/.project
    ui/org.eclipse.pde.runtime/META-INF/MANIFEST.MF
    ui/org.eclipse.pde.runtime/about.html
    ui/org.eclipse.pde.runtime/build.properties
    ui/org.eclipse.pde.runtime/icons/dlcl16/clear.gif
    ui/org.eclipse.pde.runtime/icons/dlcl16/collapseall.gif
    ui/org.eclipse.pde.runtime/icons/dlcl16/export_log.gif
    ui/org.eclipse.pde.runtime/icons/dlcl16/filter_ps.gif
    ui/org.eclipse.pde.runtime/icons/dlcl16/find_obj.gif
    ui/org.eclipse.pde.runtime/icons/dlcl16/import_log.gif
    ui/org.eclipse.pde.runtime/icons/dlcl16/open_log.gif
    ui/org.eclipse.pde.runtime/icons/dlcl16/properties.gif
    ui/org.eclipse.pde.runtime/icons/dlcl16/refresh.gif
    ui/org.eclipse.pde.runtime/icons/dlcl16/remove.gif
    ui/org.eclipse.pde.runtime/icons/dlcl16/restore_log.gif
    ui/org.eclipse.pde.runtime/icons/dlcl16/th_horizontal.gif
    ui/org.eclipse.pde.runtime/icons/dlcl16/th_vertical.gif
    ui/org.eclipse.pde.runtime/icons/elcl16/clear.gif
    ui/org.eclipse.pde.runtime/icons/elcl16/collapseall.gif
    ui/org.eclipse.pde.runtime/icons/elcl16/export_log.gif
    ui/org.eclipse.pde.runtime/icons/elcl16/filter_ps.gif
    ui/org.eclipse.pde.runtime/icons/elcl16/find_obj.gif
    ui/org.eclipse.pde.runtime/icons/elcl16/import_log.gif
    ui/org.eclipse.pde.runtime/icons/elcl16/open_log.gif
    ui/org.eclipse.pde.runtime/icons/elcl16/properties.gif
    ui/org.eclipse.pde.runtime/icons/elcl16/refresh.gif
    ui/org.eclipse.pde.runtime/icons/elcl16/remove.gif
    ui/org.eclipse.pde.runtime/icons/elcl16/restore_log.gif
    ui/org.eclipse.pde.runtime/icons/elcl16/th_horizontal.gif
    ui/org.eclipse.pde.runtime/icons/elcl16/th_vertical.gif
    ui/org.eclipse.pde.runtime/icons/eview16/error_log.gif
    ui/org.eclipse.pde.runtime/icons/eview16/event_next.gif
    ui/org.eclipse.pde.runtime/icons/eview16/event_prev.gif
    ui/org.eclipse.pde.runtime/icons/eview16/hide_pane.gif
    ui/org.eclipse.pde.runtime/icons/eview16/horizontal_view.gif
    ui/org.eclipse.pde.runtime/icons/eview16/registry.gif
    ui/org.eclipse.pde.runtime/icons/eview16/vertical_view.gif
    ui/org.eclipse.pde.runtime/icons/obj16/error_st_obj.gif
    ui/org.eclipse.pde.runtime/icons/obj16/error_stack.gif
    ui/org.eclipse.pde.runtime/icons/obj16/ext_point_obj.gif
    ui/org.eclipse.pde.runtime/icons/obj16/ext_points_obj.gif
    ui/org.eclipse.pde.runtime/icons/obj16/extension_obj.gif
    ui/org.eclipse.pde.runtime/icons/obj16/extensions_obj.gif
    ui/org.eclipse.pde.runtime/icons/obj16/generic_xml_obj.gif
    ui/org.eclipse.pde.runtime/icons/obj16/info_st_obj.gif
    ui/org.eclipse.pde.runtime/icons/obj16/java_lib_obj.gif
    ui/org.eclipse.pde.runtime/icons/obj16/ok_st_obj.gif
    ui/org.eclipse.pde.runtime/icons/obj16/plugin_obj.gif
    ui/org.eclipse.pde.runtime/icons/obj16/req_plugin_obj.gif
    ui/org.eclipse.pde.runtime/icons/obj16/req_plugins_obj.gif
    ui/org.eclipse.pde.runtime/icons/obj16/runtime_obj.gif
    ui/org.eclipse.pde.runtime/icons/obj16/warning_st_obj.gif
    ui/org.eclipse.pde.runtime/icons/ovr16/run_co.gif
    ui/org.eclipse.pde.runtime/plugin.properties
    ui/org.eclipse.pde.runtime/plugin.xml
    ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/IHelpContextIds.java
    ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/OverlayIcon.java
    ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/PDERuntimeMessages.java
    ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/PDERuntimePlugin.java
    ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/PDERuntimePluginImages.java
    ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/EventDetailsDialog.java
    ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/EventDetailsDialogAction.java
    ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/FilterDialog.java
    ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/LogEntry.java
    ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/LogReader.java
    ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/LogSession.java
    ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/LogView.java
    ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/LogViewContentProvider.java
    ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/LogViewLabelProvider.java
    ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/OpenLogDialog.java
    ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/TailInputStream.java
    ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/pderuntimeresources.properties
    ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/ConfigurationElementAdapter.java
    ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/ConfigurationElementPropertySource.java
    ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/ExtensionAdapter.java
    ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/ExtensionPointAdapter.java
    ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/ExtensionPointPropertySource.java
    ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/ExtensionPropertySource.java
    ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/IPluginFolder.java
    ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/LibraryPropertySource.java
    ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/ParentAdapter.java
    ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/PluginObjectAdapter.java
    ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/PluginPropertySource.java
    ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/PrerequisitePropertySource.java
    ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowser.java
    ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowserContentProvider.java
    ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowserLabelProvider.java
    ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryPropertySource.java
    ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryPropertySourceFactory.java
    ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/TogglePropertiesAction.java
    ui/org.eclipse.pde.ui.tests/.classpath
    ui/org.eclipse.pde.ui.tests/.cvsignore
    ui/org.eclipse.pde.ui.tests/.project
    ui/org.eclipse.pde.ui.tests/.settings/org.eclipse.jdt.core.prefs
    ui/org.eclipse.pde.ui.tests/.settings/org.eclipse.pde.prefs
    ui/org.eclipse.pde.ui.tests/META-INF/MANIFEST.MF
    ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/AbstractStructuredCommand.java
    ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/BooleanSelectionCommand.java
    ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/CheckCommand.java
    ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/ChoiceSelectionCommand.java
    ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/CommandTarget.java
    ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/EditorCommandTarget.java
    ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/ExpansionCommand.java
    ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/FocusCommand.java
    ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/IIndexHandler.java
    ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/IPlayable.java
    ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/IRecorderListener.java
    ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/IWidgetResolver.java
    ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/IWritable.java
    ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/KeyCommand.java
    ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/Macro.java
    ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/MacroCommand.java
    ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/MacroCommandShell.java
    ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/MacroIndex.java
    ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/MacroInstruction.java
    ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/MacroManager.java
    ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/MacroPlugin.java
    ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/MacroUtil.java
    ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/ModifyCommand.java
    ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/StructuredSelectionCommand.java
    ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/ToggleStructuredCommand.java
    ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/ViewCommandTarget.java
    ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/WaitCommand.java
    ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/WidgetIdentifier.java
    ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/WindowCommandTarget.java
    ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/WizardCommandTarget.java
    ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/XMLDefaultHandler.java
    ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/DefaultIndexHandler.java
    ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/DefaultWidgetResolver.java
    ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/IndexAction.java
    ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/IndexPage.java
    ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/IndexWizard.java
    ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/NewMacroWizard.java
    ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/PlaybackAction.java
    ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/RecordAction.java
    ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/RecordBlock.java
    ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/StopAction.java
    ui/org.eclipse.pde.ui.tests/about.html
    ui/org.eclipse.pde.ui.tests/build.properties
    ui/org.eclipse.pde.ui.tests/icons/external_tools.gif
    ui/org.eclipse.pde.ui.tests/icons/run_exc.gif
    ui/org.eclipse.pde.ui.tests/icons/sample.gif
    ui/org.eclipse.pde.ui.tests/icons/suspend_co.gif
    ui/org.eclipse.pde.ui.tests/icons/terminate_co.gif
    ui/org.eclipse.pde.ui.tests/plugin.xml
    ui/org.eclipse.pde.ui.tests/schema/macroSupport.exsd
    ui/org.eclipse.pde.ui.tests/scripts/macro1.emc
    ui/org.eclipse.pde.ui.tests/scripts/macro10.emc
    ui/org.eclipse.pde.ui.tests/scripts/macro11.emc
    ui/org.eclipse.pde.ui.tests/scripts/macro12.emc
    ui/org.eclipse.pde.ui.tests/scripts/macro13.emc
    ui/org.eclipse.pde.ui.tests/scripts/macro14.emc
    ui/org.eclipse.pde.ui.tests/scripts/macro15.emc
    ui/org.eclipse.pde.ui.tests/scripts/macro16.emc
    ui/org.eclipse.pde.ui.tests/scripts/macro17.emc
    ui/org.eclipse.pde.ui.tests/scripts/macro18.emc
    ui/org.eclipse.pde.ui.tests/scripts/macro19.emc
    ui/org.eclipse.pde.ui.tests/scripts/macro2.emc
    ui/org.eclipse.pde.ui.tests/scripts/macro20.emc
    ui/org.eclipse.pde.ui.tests/scripts/macro21.emc
    ui/org.eclipse.pde.ui.tests/scripts/macro22.emc
    ui/org.eclipse.pde.ui.tests/scripts/macro23.emc
    ui/org.eclipse.pde.ui.tests/scripts/macro24.emc
    ui/org.eclipse.pde.ui.tests/scripts/macro25.emc
    ui/org.eclipse.pde.ui.tests/scripts/macro26.emc
    ui/org.eclipse.pde.ui.tests/scripts/macro27.emc
    ui/org.eclipse.pde.ui.tests/scripts/macro28.emc
    ui/org.eclipse.pde.ui.tests/scripts/macro29.emc
    ui/org.eclipse.pde.ui.tests/scripts/macro3.emc
    ui/org.eclipse.pde.ui.tests/scripts/macro4.emc
    ui/org.eclipse.pde.ui.tests/scripts/macro5.emc
    ui/org.eclipse.pde.ui.tests/scripts/macro6.emc
    ui/org.eclipse.pde.ui.tests/scripts/macro7.emc
    ui/org.eclipse.pde.ui.tests/scripts/macro8.emc
    ui/org.eclipse.pde.ui.tests/scripts/macro9.emc
    ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/AllPDETests.java
    ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/Catalog.java
    ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/PDETestCase.java
    ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/imports/AllImportTests.java
    ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/imports/ImportAsBinaryTestCase.java
    ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/imports/ImportAsSourceTestCase.java
    ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/imports/ImportFeatureTestCase.java
    ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/imports/ImportWithLinksTestCase.java
    ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/performance/PDEPerformanceTests.java
    ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/performance/parts/InitializeModelsPerfTest.java
    ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/performance/parts/OpenManifestEditorPerfTest.java
    ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/performance/parts/SchemaPerfTest.java
    ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/NewSiteProjectTest.java
    ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/feature/AllNewFeatureProjectTests.java
    ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/feature/FeatureWithPluginTestCase.java
    ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/feature/SimpleFeatureTestCase.java
    ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/plugin/AllNewProjectTests.java
    ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/plugin/BasicJavaPluginTestCase.java
    ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/plugin/LibraryPluginTestCase.java
    ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/plugin/NewProjectTest.java
    ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/plugin/SimplePluginTestCase.java
    ui/org.eclipse.pde.ui.tests/test.xml
    ui/org.eclipse.pde.ui/.classpath
    ui/org.eclipse.pde.ui/.cvsignore
    ui/org.eclipse.pde.ui/.project
    ui/org.eclipse.pde.ui/.settings/org.eclipse.pde.core.prefs
    ui/org.eclipse.pde.ui/META-INF/MANIFEST.MF
    ui/org.eclipse.pde.ui/about.html
    ui/org.eclipse.pde.ui/build.properties
    ui/org.eclipse.pde.ui/icons/dlcl16/add_att.gif
    ui/org.eclipse.pde.ui/icons/dlcl16/alphab_sort_co.gif
    ui/org.eclipse.pde.ui/icons/dlcl16/ch_callees.gif
    ui/org.eclipse.pde.ui/icons/dlcl16/ch_callers.gif
    ui/org.eclipse.pde.ui/icons/dlcl16/clear.gif
    ui/org.eclipse.pde.ui/icons/dlcl16/clone_att.gif
    ui/org.eclipse.pde.ui/icons/dlcl16/clone_el.gif
    ui/org.eclipse.pde.ui/icons/dlcl16/collapseall.gif
    ui/org.eclipse.pde.ui/icons/dlcl16/dep_loop.gif
    ui/org.eclipse.pde.ui/icons/dlcl16/find_obj.gif
    ui/org.eclipse.pde.ui/icons/dlcl16/flatLayout.gif
    ui/org.eclipse.pde.ui/icons/dlcl16/full_hierarchy.gif
    ui/org.eclipse.pde.ui/icons/dlcl16/generate_class.gif
    ui/org.eclipse.pde.ui/icons/dlcl16/goto_obj.gif
    ui/org.eclipse.pde.ui/icons/dlcl16/hierarchicalLayout.gif
    ui/org.eclipse.pde.ui/icons/dlcl16/history_list.gif
    ui/org.eclipse.pde.ui/icons/dlcl16/maximize.gif
    ui/org.eclipse.pde.ui/icons/dlcl16/properties.gif
    ui/org.eclipse.pde.ui/icons/dlcl16/refresh.gif
    ui/org.eclipse.pde.ui/icons/dlcl16/remove_att.gif
    ui/org.eclipse.pde.ui/icons/dlcl16/restore.gif
    ui/org.eclipse.pde.ui/icons/dlcl16/restore_log.gif
    ui/org.eclipse.pde.ui/icons/dlcl16/search_sortmatch.gif
    ui/org.eclipse.pde.ui/icons/dlcl16/synced.gif
    ui/org.eclipse.pde.ui/icons/dlcl16/th_horizontal.gif
    ui/org.eclipse.pde.ui/icons/dlcl16/th_vertical.gif
    ui/org.eclipse.pde.ui/icons/dtool16/convjpprj_wiz.gif
    ui/org.eclipse.pde.ui/icons/dtool16/defbcon_wiz.gif
    ui/org.eclipse.pde.ui/icons/dtool16/defcon_wiz.gif
    ui/org.eclipse.pde.ui/icons/dtool16/eclipse_launcher.gif
    ui/org.eclipse.pde.ui/icons/dtool16/eclipse_launcher_wiz.gif
    ui/org.eclipse.pde.ui/icons/dtool16/exp_deployfeat.gif
    ui/org.eclipse.pde.ui/icons/dtool16/exp_deployplug.gif
    ui/org.eclipse.pde.ui/icons/dtool16/exp_product.gif
    ui/org.eclipse.pde.ui/icons/dtool16/imp_extfeat.gif
    ui/org.eclipse.pde.ui/icons/dtool16/imp_extplug.gif
    ui/org.eclipse.pde.ui/icons/dtool16/jarToPlugin.gif
    ui/org.eclipse.pde.ui/icons/dtool16/newefix_wiz.gif
    ui/org.eclipse.pde.ui/icons/dtool16/newex_wiz.gif
    ui/org.eclipse.pde.ui/icons/dtool16/newexp_wiz.gif
    ui/org.eclipse.pde.ui/icons/dtool16/newexprj_wiz.gif
    ui/org.eclipse.pde.ui/icons/dtool16/newfprj_wiz.gif
    ui/org.eclipse.pde.ui/icons/dtool16/newftrprj_wiz.gif
    ui/org.eclipse.pde.ui/icons/dtool16/newpprj_wiz.gif
    ui/org.eclipse.pde.ui/icons/dtool16/newsiteprj_wiz.gif
    ui/org.eclipse.pde.ui/icons/dtool16/prd_config_wiz.gif
    ui/org.eclipse.pde.ui/icons/dtool16/script_wiz.gif
    ui/org.eclipse.pde.ui/icons/elcl16/add_att.gif
    ui/org.eclipse.pde.ui/icons/elcl16/alphab_sort_co.gif
    ui/org.eclipse.pde.ui/icons/elcl16/ch_callees.gif
    ui/org.eclipse.pde.ui/icons/elcl16/ch_callers.gif
    ui/org.eclipse.pde.ui/icons/elcl16/clear.gif
    ui/org.eclipse.pde.ui/icons/elcl16/clone_att.gif
    ui/org.eclipse.pde.ui/icons/elcl16/clone_el.gif
    ui/org.eclipse.pde.ui/icons/elcl16/collapseall.gif
    ui/org.eclipse.pde.ui/icons/elcl16/dep_loop.gif
    ui/org.eclipse.pde.ui/icons/elcl16/find_obj.gif
    ui/org.eclipse.pde.ui/icons/elcl16/flatLayout.gif
    ui/org.eclipse.pde.ui/icons/elcl16/full_hierarchy.gif
    ui/org.eclipse.pde.ui/icons/elcl16/generate_class.gif
    ui/org.eclipse.pde.ui/icons/elcl16/goto_obj.gif
    ui/org.eclipse.pde.ui/icons/elcl16/help.gif
    ui/org.eclipse.pde.ui/icons/elcl16/hierarchicalLayout.gif
    ui/org.eclipse.pde.ui/icons/elcl16/history_list.gif
    ui/org.eclipse.pde.ui/icons/elcl16/maximize.gif
    ui/org.eclipse.pde.ui/icons/elcl16/properties.gif
    ui/org.eclipse.pde.ui/icons/elcl16/refresh.gif
    ui/org.eclipse.pde.ui/icons/elcl16/remove_att.gif
    ui/org.eclipse.pde.ui/icons/elcl16/restore.gif
    ui/org.eclipse.pde.ui/icons/elcl16/restore_log.gif
    ui/org.eclipse.pde.ui/icons/elcl16/search_sortmatch.gif
    ui/org.eclipse.pde.ui/icons/elcl16/synced.gif
    ui/org.eclipse.pde.ui/icons/elcl16/th_horizontal.gif
    ui/org.eclipse.pde.ui/icons/elcl16/th_vertical.gif
    ui/org.eclipse.pde.ui/icons/etool16/convjpprj_wiz.gif
    ui/org.eclipse.pde.ui/icons/etool16/defbcon_wiz.gif
    ui/org.eclipse.pde.ui/icons/etool16/defcon_wiz.gif
    ui/org.eclipse.pde.ui/icons/etool16/eclipse_launcher.gif
    ui/org.eclipse.pde.ui/icons/etool16/eclipse_launcher_wiz.gif
    ui/org.eclipse.pde.ui/icons/etool16/exp_deployfeat.gif
    ui/org.eclipse.pde.ui/icons/etool16/exp_deployplug.gif
    ui/org.eclipse.pde.ui/icons/etool16/exp_product.gif
    ui/org.eclipse.pde.ui/icons/etool16/imp_extfeat.gif
    ui/org.eclipse.pde.ui/icons/etool16/imp_extplug.gif
    ui/org.eclipse.pde.ui/icons/etool16/jarToPlugin.gif
    ui/org.eclipse.pde.ui/icons/etool16/newefix_wiz.gif
    ui/org.eclipse.pde.ui/icons/etool16/newex_wiz.gif
    ui/org.eclipse.pde.ui/icons/etool16/newexp_wiz.gif
    ui/org.eclipse.pde.ui/icons/etool16/newexprj_wiz.gif
    ui/org.eclipse.pde.ui/icons/etool16/newfprj_wiz.gif
    ui/org.eclipse.pde.ui/icons/etool16/newftrprj_wiz.gif
    ui/org.eclipse.pde.ui/icons/etool16/newpprj_wiz.gif
    ui/org.eclipse.pde.ui/icons/etool16/newsiteprj_wiz.gif
    ui/org.eclipse.pde.ui/icons/etool16/prd_config_wiz.gif
    ui/org.eclipse.pde.ui/icons/etool16/script_wiz.gif
    ui/org.eclipse.pde.ui/icons/eview16/plugin_depend.gif
    ui/org.eclipse.pde.ui/icons/eview16/plugins.gif
    ui/org.eclipse.pde.ui/icons/obj16/alert_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/all_sc_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/att_URI_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/att_class_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/att_file_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/att_impl_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/att_req_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/build_exec.gif
    ui/org.eclipse.pde.ui/icons/obj16/build_var_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/bundle_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/category_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/choice_sc_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/debug_exc.gif
    ui/org.eclipse.pde.ui/icons/obj16/discovery.gif
    ui/org.eclipse.pde.ui/icons/obj16/doc_section_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/element.gif
    ui/org.eclipse.pde.ui/icons/obj16/elref_sc_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/error_st_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/ext_plugin_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/ext_point_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/ext_points_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/extension_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/extensions_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/external_frgmt_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/feature_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/frgmt_dis_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/frgmt_mf_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/frgmt_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/frgmts_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/ftr_jar_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/ftr_mf_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/ftr_xml_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/gel_sc_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/generic_xml_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/group_sc_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/incomplete_tsk.gif
    ui/org.eclipse.pde.ui/icons/obj16/info_st_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/install-handler.gif
    ui/org.eclipse.pde.ui/icons/obj16/jar_l_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/jar_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/java_lib_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/julaunchpgn.gif
    ui/org.eclipse.pde.ui/icons/obj16/link_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/links_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/loop_node_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/loop_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/main_tab.gif
    ui/org.eclipse.pde.ui/icons/obj16/noref_feature_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/ok_st_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/output_folder_attrib.gif
    ui/org.eclipse.pde.ui/icons/obj16/overview_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/page_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/plugin_config_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/plugin_configs_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/plugin_dis_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/plugin_mf_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/plugin_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/processinginst.gif
    ui/org.eclipse.pde.ui/icons/obj16/product_xml_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/psearch_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/req_plugin_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/req_plugins_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/run_exc.gif
    ui/org.eclipse.pde.ui/icons/obj16/runtime_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/schema_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/scomp_jar_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/seq_sc_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/site_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/site_xml_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/source_attach_attrib.gif
    ui/org.eclipse.pde.ui/icons/obj16/swt_launcher.gif
    ui/org.eclipse.pde.ui/icons/obj16/test.gif
    ui/org.eclipse.pde.ui/icons/obj16/tsk_alert_obj.gif
    ui/org.eclipse.pde.ui/icons/obj16/update.gif
    ui/org.eclipse.pde.ui/icons/obj16/url.gif
    ui/org.eclipse.pde.ui/icons/obj16/warning_st_obj.gif
    ui/org.eclipse.pde.ui/icons/ovr16/binary_co.gif
    ui/org.eclipse.pde.ui/icons/ovr16/doc_co.gif
    ui/org.eclipse.pde.ui/icons/ovr16/error_co.gif
    ui/org.eclipse.pde.ui/icons/ovr16/export_co.gif
    ui/org.eclipse.pde.ui/icons/ovr16/external_co.gif
    ui/org.eclipse.pde.ui/icons/ovr16/jar_co.gif
    ui/org.eclipse.pde.ui/icons/ovr16/java_co.gif
    ui/org.eclipse.pde.ui/icons/ovr16/project_co.gif
    ui/org.eclipse.pde.ui/icons/ovr16/run_co.gif
    ui/org.eclipse.pde.ui/icons/ovr16/warning_co.gif
    ui/org.eclipse.pde.ui/icons/view16/error_log.gif
    ui/org.eclipse.pde.ui/icons/view16/plugin_persp.gif
    ui/org.eclipse.pde.ui/icons/view16/plugins.gif
    ui/org.eclipse.pde.ui/icons/view16/registry.gif
    ui/org.eclipse.pde.ui/icons/view16/variable_tab.gif
    ui/org.eclipse.pde.ui/icons/wizban/convjpprj_wiz.gif
    ui/org.eclipse.pde.ui/icons/wizban/defcon_wiz.gif
    ui/org.eclipse.pde.ui/icons/wizban/exp_deployfeat_wiz.gif
    ui/org.eclipse.pde.ui/icons/wizban/exp_deployplug_wiz.gif
    ui/org.eclipse.pde.ui/icons/wizban/exp_product.gif
    ui/org.eclipse.pde.ui/icons/wizban/extstr_wiz.gif
    ui/org.eclipse.pde.ui/icons/wizban/imp_extfeat_wiz.gif
    ui/org.eclipse.pde.ui/icons/wizban/imp_extplug_wiz.gif
    ui/org.eclipse.pde.ui/icons/wizban/jarToPlugin_wiz.gif
    ui/org.eclipse.pde.ui/icons/wizban/migrate_30_wiz.gif
    ui/org.eclipse.pde.ui/icons/wizban/newefix_wizban.gif
    ui/org.eclipse.pde.ui/icons/wizban/newex_wiz.gif
    ui/org.eclipse.pde.ui/icons/wizban/newexp_wiz.gif
    ui/org.eclipse.pde.ui/icons/wizban/newexprj_wiz.gif
    ui/org.eclipse.pde.ui/icons/wizban/newfprj_wiz.gif
    ui/org.eclipse.pde.ui/icons/wizban/newftrprj_wiz.gif
    ui/org.eclipse.pde.ui/icons/wizban/newpprj_wiz.gif
    ui/org.eclipse.pde.ui/icons/wizban/newsiteprj_wiz.gif
    ui/org.eclipse.pde.ui/icons/wizban/product_wiz.gif
    ui/org.eclipse.pde.ui/icons/wizban/schema_wiz.gif
    ui/org.eclipse.pde.ui/macosx/Info.plist
    ui/org.eclipse.pde.ui/pdeuiant.jar
    ui/org.eclipse.pde.ui/plugin.properties
    ui/org.eclipse.pde.ui/plugin.xml
    ui/org.eclipse.pde.ui/schema/newExtension.exsd
    ui/org.eclipse.pde.ui/schema/pluginContent.exsd
    ui/org.eclipse.pde.ui/schema/samples.exsd
    ui/org.eclipse.pde.ui/schema/templates.exsd
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/IHelpContextIds.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/IPDEUIConstants.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/IPreferenceConstants.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/OpenPDEPerspectiveAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDELabelProvider.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEPerspective.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEPlugin.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEPluginImages.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BaseBuildAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BuildFeatureAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BuildPluginAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BuildSiteAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BuildSiteJob.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/FeatureExportInfo.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/FeatureExportJob.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/PluginExportJob.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/ProductExportJob.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/AbstractPDEMarkerResolution.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/AddSingleonAttributeTo.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/BundleTextChangeListener.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/CreateJREBundleHeaderResolution.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/IModelTextChangeListener.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/ManifestHeaderErrorResolution.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/RenameAutostartResolution.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/ResolutionGenerator.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/EmptyOutlinePage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/FormEntryAdapter.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/FormOutlinePage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/GenericSourcePage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/IContextPart.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/IModelUndoManager.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/ISortableContentOutlinePage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/JarEntryEditorInput.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/JarEntryFile.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/KeyValueSourcePage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/LinkSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/ModelDataTransfer.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/ModelUndoManager.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/ModifiedTextPropertyDescriptor.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/MultiSourceEditor.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/NullUndoManager.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEDetails.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEDetailsSections.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEFormEditor.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEFormEditorContributor.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEFormPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEMasterDetailsBlock.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEMultiPageContentOutline.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEMultiPagePropertySheet.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDESection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDESourcePage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PropertiesAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/SourceOutlinePage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/StorageDocumentProvider.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/StreamDocumentProvider.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/StructuredViewerSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/SystemFileDocumentProvider.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/SystemFileEditorInput.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/SystemFileEditorInputFactory.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/SystemFileMarkerAnnotationModel.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/SystemFileStorage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/TableSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/ToggleLinkWithEditorAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/TreeSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/XMLConfiguration.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/XMLDoubleClickStrategy.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/XMLSourcePage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/AddLibraryDialog.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BinSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildClasspathSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildContentsSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildEditor.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildEditorContributor.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildInputContext.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildInputContextManager.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildOutlinePage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildSourcePage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildUndoManager.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildUtil.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/JARFileFilter.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/RuntimeInfoSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/SrcSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/context/IInputContextListener.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/context/InputContext.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/context/InputContextManager.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/context/UTF8InputContext.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/context/XMLDocumentSetupParticpant.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/context/XMLInputContext.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/Choice.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/DataDetailsSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/DataPortabilitySection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/DataSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/EditorBuildFeatureAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureAdvancedPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureDependenciesPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureEditor.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureEditorContributor.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureEditorMatchingStrategy.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureFormPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureIncludesPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureInputContext.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureInputContextManager.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureOutlinePage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureReferencePage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureSourcePage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureSpecSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureUndoManager.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/HandlerSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/IncludedFeaturesDetailsSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/IncludedFeaturesPortabilitySection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/IncludedFeaturesSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/InfoFormPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/InfoSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/InstallSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/OpenReferenceAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PluginDetailsSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PluginPortabilitySection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PluginReference.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PluginSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PortabilityChoicesDialog.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PortabilitySection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/RequiresSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/SynchronizeVersionsAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/SynchronizeVersionsWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/SynchronizeVersionsWizardPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/URLDetailsSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/URLSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/BodyTextSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/BundleInputContext.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/BundleSourcePage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/CreateManifestOperation.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/DependenciesPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/DependencyAnalysisSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/DependencyPropertiesDialog.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExportPackageSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExportPackageVisibilitySection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionDetails.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionElementDetails.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionPointDetails.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionPointsPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionPointsSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionsPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionsSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/FragmentGeneralInfoSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/GeneralInfoSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ImportPackageSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JarSelectionValidator.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeValue.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeWizardPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/LibrarySection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/LibraryVisibilitySection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/LoopDialog.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ManifestEditor.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ManifestEditorContributor.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ManifestEditorMatchingStrategy.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ManifestOutlinePage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ManifestSourcePage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/MatchSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/NewElementAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/NewRuntimeLibraryDialog.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/OverviewPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/PackageSelectionDialog.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/PluginExportAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/PluginGeneralInfoSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/PluginInputContext.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/PluginInputContextManager.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/PluginUndoManager.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/RequiredExecutionEnvironmentSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/RequiresSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ResourceAttributeValue.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/RuntimePage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/rows/BooleanAttributeRow.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/rows/ChoiceAttributeRow.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/rows/ClassAttributeRow.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/rows/ExtensionAttributeRow.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/rows/ReferenceAttributeRow.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/rows/ResourceAttributeRow.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/rows/TextAttributeRow.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/AboutSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ArgumentsSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/BrandingPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ConfigurationPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ConfigurationSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/FeatureSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/IntroSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/LauncherPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/LauncherSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/OverviewPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/PluginSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductEditor.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductEditorContributor.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductExportAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductInfoSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductInputContext.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductInputContextManager.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductOutlinePage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/SplashSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/WindowImagesSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/AttributePropertySource.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/CompositorPropertySource.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/DescriptionSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/DocSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ElementPropertySource.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ElementSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ElementSectionDragAdapter.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ElementSectionDropAdapter.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/EnumerationRestrictionPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/GrammarPropertySource.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/GrammarSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ICloneablePropertySource.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/IRestrictionPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/NewAttributeAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/NewCompositorAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/NewElementAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/NewReferenceAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/NoRestrictionPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ReferencePropertySource.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaAdapterFactory.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaContentProvider.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaDocPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaDoubleClickStrategy.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaEditor.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaEditorContributor.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaFormOutlinePage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaFormPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaInputContext.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaInputContextManager.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaObjectPropertySource.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaPropertySheet.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaSourcePage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaSpecSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/TypeRestrictionCellEditor.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/TypeRestrictionDescriptor.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/TypeRestrictionDialog.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/ArchivePage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/ArchiveSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/CategoryDetailsSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/CategorySection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/DescriptionSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/FeatureDetailsSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/FeaturesPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/MirrorsSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/NewArchiveDialog.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/PortabilitySection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteEditor.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteEditorContributor.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteFeatureAdapter.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteInputContext.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteInputContextManager.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteLabelProvider.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteOutlinePage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteSourcePage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteUndoManager.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SynchronizePropertiesAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SynchronizePropertiesWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SynchronizePropertiesWizardPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/AnnotationHover.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ColorManager.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/IColorManager.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/IPDEColorConstants.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/IReconcilingParticipant.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/NonRuleBasedDamagerRepairer.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ReconcilingStrategy.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/TextUtil.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/XMLCommentScanner.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/XMLPartitionScanner.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/XMLScanner.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/XMLSourceViewerConfiguration.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/XMLTagRule.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/XMLTagScanner.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/XMLWhitespaceDetector.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/DefaultContentProvider.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/DefaultElement.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/DefaultTableProvider.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/ElementLabelProvider.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/ElementList.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/IPDEElement.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/ListContentProvider.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/NamedElement.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/TreeContentProvider.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/AbstractPDELaunchConfigurationTabGroup.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/AbstractPluginBlock.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/ApplicationSelectionDialog.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/BaseBlock.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/ConfigurationAreaBlock.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/ConfigurationTemplateBlock.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/EclipseApplicationLauncherTabGroup.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/EquinoxLaunchShortcut.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/EquinoxLauncherTabGroup.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/EquinoxPluginBlock.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/JREBlock.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/JUnitLaunchConfiguration.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/JUnitProgramBlock.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/JUnitTabGroup.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/JUnitWorkbenchShortcut.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LaunchAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LaunchArgumentsHelper.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LaunchConfigurationHelper.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LaunchConfigurationListener.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LaunchListener.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LaunchPluginValidator.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LauncherUtils.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/MainMethodSearchEngine.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/MainTypeSelectionDialog.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/OpenLogDialog.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/PluginBlock.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/PluginStatusDialog.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/PluginValidationOperation.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/ProgramBlock.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/RunWorkbenchAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/RuntimeWorkbenchShortcut.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/SWTApplicationLaunchShortcut.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/SWTLaunchConfiguration.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/SWTLauncherTabGroup.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/SWTSourcePathComputer.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/TracingBlock.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/TracingPropertySource.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/VMHelper.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/WorkbenchSourcePathProvider.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/WorkspaceDataBlock.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsLabelProvider.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsOperation.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsWizardPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/GetNonExternalizedStringsAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/GetNonExternalizedStringsOperation.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChange.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChangeElement.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChangeFile.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChangeLabelProvider.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChangeTable.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/StringHelper.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/CheckboxTablePart.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/ComboPart.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/EditableTablePart.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/FormBrowser.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/FormEntry.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/IFormEntryListener.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/ILinkLabelProvider.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/MessageLine.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/ModifiedTextCellEditor.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/SharedPart.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/SharedPartWithButtons.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/StatusInfo.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/StructuredViewerPart.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/TablePart.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/TreePart.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/WizardCheckboxTablePart.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/CompilersConfigurationBlock.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/CompilersPreferencePage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/EditorPreferencePage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/EnvironmentBlock.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/ExternalPluginsBlock.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/MainPreferencePage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/PDEPreferencesUtil.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/PreferenceInitializer.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/SourceBlock.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/SourceCodeLocationsPreferenceNode.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/TargetEnvironmentPreferenceNode.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/TargetPlatformPreferenceNode.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/TargetPlatformPreferencePage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/properties/CompilersPropertyPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/properties/PluginDevelopmentPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/properties/SelfHostingPropertyPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/BundleManifestChange.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/ManifestPackageMoveParticipant.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/ManifestPackageRenameParticipant.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/ManifestTypeMoveParticipant.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/ManifestTypeRenameParticipant.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/MoveFromChange.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/PDEMoveParticipant.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/PDERenameParticipant.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/PluginManifestChange.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/AbstractSearchResultPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/BaseSearchAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/FindDeclarationsAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/FindPluginReferencesAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/FindReferencesAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/ISearchResultCollector.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/ManifestEditorOpener.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchActionGroup.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchOperation.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchQuery.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchResultPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PreviewReferenceAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/SearchResult.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/ShowDescriptionAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentOperation.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentQuery.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentSearchResult.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentSearchResultPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/JavaEditorOpener.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/ShowResultsAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/UnusedDependenciesAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/UnusedDependenciesJob.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/UnusedImportsDialog.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/javaparticipant/ClassSearchParticipant.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/AbstractOverlayIcon.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/ChoicePropertyDescriptor.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/FileExtensionFilter.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/FileNameFilter.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/FileValidator.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/ImageOverlayIcon.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/OverlayIcon.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/PersistablePluginObject.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/PixelConverter.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/PluginContainmentAdapter.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/PluginWorkingSet.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/SWTUtil.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/SharedLabelProvider.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/CalleesContentProvider.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/CalleesListContentProvider.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/CalleesTreeContentProvider.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/CallersContentProvider.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/CallersListContentProvider.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/CallersTreeContentProvider.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/CopyToClipboardAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/DependenciesLabelProvider.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/DependenciesView.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/DependenciesViewListPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/DependenciesViewPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/DependenciesViewPageContentProvider.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/DependenciesViewTreePage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/FileAdapterPropertySource.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/HistoryAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/HistoryDropDownAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/HistoryListAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/HistoryListDialog.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/ModelEntryPropertySource.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/OpenDependenciesAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/PluginsContentProvider.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/PluginsDragAdapter.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/PluginsLabelProvider.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/PluginsView.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/PluginsViewAdapterFactory.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/ShowInWorkspaceAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/BaseWizardSelectionPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/Category.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/FeatureSelectionDialog.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/FolderSelectionDialog.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/IDefaultValueConsumer.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/IProjectProvider.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/ListUtil.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/NewWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/PluginSelectionDialog.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/RenameDialog.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/RequiredPluginsContainerPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/ResizableWizardDialog.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardCollectionElement.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardCollectionSorter.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardElement.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardListSelectionPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardNode.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardTreeSelectionPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/AdvancedFeatureExportPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/AdvancedPluginExportPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/BaseExportWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/BaseExportWizardPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/CrossPlatformExportPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ExportWizardPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ExportWizardPageWithTable.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/FeatureExportWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/FeatureExportWizardPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/IExportWizardPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/PluginExportWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/PluginExportWizardPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ProductExportWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ProductExportWizardPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/BaseExtensionPointMainPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/ExtensionEditorSelectionPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/ExtensionEditorWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/ExtensionTreeSelectionPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionPointMainPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionPointWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionRegistryReader.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionTemplateWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewSchemaFileMainPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewSchemaFileWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/PointSelectionPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/BaseFeatureSpecPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/BasePluginListPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/FeatureData.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/FeatureSpecPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/NewFeaturePatchWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/NewFeatureProjectWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/OpenProjectWizardAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/PatchSpecPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/PluginListPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/BaseImportWizardSecondPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/BinaryProjectFilter.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/FeatureImportOperation.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/FeatureImportWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/FeatureImportWizardDetailedPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/FeatureImportWizardFirstPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/JarImportOperation.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportOperation.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardDetailedPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardExpressPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardFirstPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/AbstractFieldData.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/ClasspathComputer.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/ContentPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/FragmentContentPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/FragmentFieldData.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/LibraryPluginFieldData.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/LibraryPluginJarsPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewFragmentProjectWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginCreationOperation.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginCreationPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginProjectWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewPluginProjectWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationOperation.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/OpenProjectWizardAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/PluginClassCodeGenerator.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/PluginContentPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/PluginFieldData.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/TemplateListSelectionPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/BaseProductCreationOperation.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/NewProductFileAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/NewProductFileWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductDefinitionOperation.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductDefinitionWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductDefinitonWizardPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductFileWizadPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductFromConfigOperation.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductFromExtensionOperation.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroOperation.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroWizardPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/SynchronizationOperation.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/TextEditUtilities.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/site/NewSiteProjectCreationOperation.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/site/NewSiteProjectCreationPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/site/NewSiteProjectWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/site/OpenProjectWizardAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/BaseEditorTemplate.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/BuilderNewExtensionWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/BuilderNewWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/BuilderTemplate.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/ControlStack.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/EditorNewWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/EditorTemplate.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelloNonUIRCPNewWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelloNonUIRCPTemplate.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelloOSGiNewWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelloOSGiTemplate.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelloRCPNewWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelloRCPTemplate.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelloWorldNewWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelloWorldTemplate.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelpTemplate.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/IntroNewWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/IntroTemplate.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/MailNewWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/MailTemplate.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/MultiPageEditorNewWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/MultiPageEditorTemplate.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/NewPluginTemplateChoiceWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/NewWizardTemplate.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PDETemplateSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PluginReference.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PopupMenuNewWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PopupMenuTemplate.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PreferencePageTemplate.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PreprocessorParser.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PropertyPageNewWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PropertyPageTemplate.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/TemplateSelectionPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/ViewNewWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/ViewRCPNewWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/ViewRCPTemplate.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/ViewTemplate.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/ConvertProjectsAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/ConvertedProjectWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/ConvertedProjectsPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/CreateHelpIndexAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/ExtensionPointMappings.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/MigratePluginWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/MigratePluginWizardPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/MigrationAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/UpdateBuildpathWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/UpdateBuildpathWizardPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/UpdateClasspathAction.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/UpdateClasspathJob.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/IBasePluginWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/IBundleContentWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/IExtensionEditorWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/IExtensionWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/IFieldData.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/IFragmentFieldData.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/IPluginContentWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/IPluginFieldData.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/AbstractLauncherTab.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/AbstractPDELaunchConfiguration.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/ConfigurationTab.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/EclipseApplicationLaunchConfiguration.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/EquinoxLaunchConfiguration.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/EquinoxPluginsTab.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/EquinoxSettingsTab.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/IPDELauncherConstants.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/MainTab.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/PluginJUnitMainTab.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/PluginsTab.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/TracingTab.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/AbstractNewPluginTemplateWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/AbstractTemplateSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/BaseOptionTemplateSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/BooleanOption.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/ChoiceOption.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/ITemplateSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/IVariableProvider.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/NewPluginTemplateWizard.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/OptionTemplateSection.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/OptionTemplateWizardPage.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/StringOption.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/TemplateField.java
    ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/TemplateOption.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/AbstractEditingModel.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/DocumentHandler.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/DocumentTextNode.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/IDocumentAttribute.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/IDocumentKey.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/IDocumentNode.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/IDocumentRange.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/IDocumentTextNode.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/IEditingModel.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/XMLEditingModel.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/build/Build.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/build/BuildEntry.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/build/BuildModel.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/build/BuildModelFactory.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/BasePackageHeader.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/Bundle.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/BundleModel.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/ExportPackageHeader.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/ExportPackageObject.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/ImportPackageHeader.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/ImportPackageObject.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/LazyStartHeader.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/ManifestHeader.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/PackageFriend.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/PackageObject.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/RequiredExecutionEnvironmentHeader.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/AbstractPluginDocumentHandler.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/FragmentModel.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/FragmentNode.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/NodeOffsetHandler.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginAttribute.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginBaseNode.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginDocumentHandler.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginDocumentNode.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginDocumentNodeFactory.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginElementNode.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginExtensionNode.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginExtensionPointNode.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginImportNode.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginLibraryNode.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginModel.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginModelBase.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginNode.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginObjectNode.java
    ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginParentNode.java
    ui/org.eclipse.pde.ui/src_ant/org/eclipse/pde/internal/ui/ant/BaseExportTask.java
    ui/org.eclipse.pde.ui/src_ant/org/eclipse/pde/internal/ui/ant/ExportBuildListener.java
    ui/org.eclipse.pde.ui/src_ant/org/eclipse/pde/internal/ui/ant/FeatureExportTask.java
    ui/org.eclipse.pde.ui/src_ant/org/eclipse/pde/internal/ui/ant/PluginExportTask.java
    ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/ProjectNamesPage.java
    ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/ReviewPage.java
    ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/SampleEditor.java
    ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/SampleOperation.java
    ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/SampleStandbyContent.java
    ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/SampleWizard.java
    ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/SelectionPage.java
    ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/ShowSampleAction.java
    ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/ShowTargetPlatformAction.java
    ui/org.eclipse.pde.ui/templates/builder/java/$builderClassName$.java
    ui/org.eclipse.pde.ui/templates/builder/java/$natureClassName$.java
    ui/org.eclipse.pde.ui/templates/builder/java/ToggleNatureAction.java
    ui/org.eclipse.pde.ui/templates/editor/bin/icons/sample.gif
    ui/org.eclipse.pde.ui/templates/editor/java/$editorClass$.java
    ui/org.eclipse.pde.ui/templates/editor/java/ColorManager.java
    ui/org.eclipse.pde.ui/templates/editor/java/IXMLColorConstants.java
    ui/org.eclipse.pde.ui/templates/editor/java/NonRuleBasedDamagerRepairer.java
    ui/org.eclipse.pde.ui/templates/editor/java/TagRule.java
    ui/org.eclipse.pde.ui/templates/editor/java/XMLConfiguration.java
    ui/org.eclipse.pde.ui/templates/editor/java/XMLDocumentProvider.java
    ui/org.eclipse.pde.ui/templates/editor/java/XMLDoubleClickStrategy.java
    ui/org.eclipse.pde.ui/templates/editor/java/XMLPartitionScanner.java
    ui/org.eclipse.pde.ui/templates/editor/java/XMLScanner.java
    ui/org.eclipse.pde.ui/templates/editor/java/XMLTagScanner.java
    ui/org.eclipse.pde.ui/templates/editor/java/XMLWhitespaceDetector.java
    ui/org.eclipse.pde.ui/templates/helloWorld/bin/icons/sample.gif
    ui/org.eclipse.pde.ui/templates/helloWorld/java/$className$.java
    ui/org.eclipse.pde.ui/templates/help/bin/html/concepts/maintopic.html
    ui/org.eclipse.pde.ui/templates/help/bin/html/concepts/subtopic.html
    ui/org.eclipse.pde.ui/templates/help/bin/html/concepts/subtopic2.html
    ui/org.eclipse.pde.ui/templates/help/bin/html/gettingstarted/maintopic.html
    ui/org.eclipse.pde.ui/templates/help/bin/html/gettingstarted/subtopic.html
    ui/org.eclipse.pde.ui/templates/help/bin/html/gettingstarted/subtopic2.html
    ui/org.eclipse.pde.ui/templates/help/bin/html/maintopic.html
    ui/org.eclipse.pde.ui/templates/help/bin/html/reference/maintopic.html
    ui/org.eclipse.pde.ui/templates/help/bin/html/reference/subtopic.html
    ui/org.eclipse.pde.ui/templates/help/bin/html/reference/subtopic2.html
    ui/org.eclipse.pde.ui/templates/help/bin/html/samples/maintopic.html
    ui/org.eclipse.pde.ui/templates/help/bin/html/samples/subtopic.html
    ui/org.eclipse.pde.ui/templates/help/bin/html/samples/subtopic2.html
    ui/org.eclipse.pde.ui/templates/help/bin/html/subtopic.html
    ui/org.eclipse.pde.ui/templates/help/bin/html/tasks/maintopic.html
    ui/org.eclipse.pde.ui/templates/help/bin/html/tasks/subtopic.html
    ui/org.eclipse.pde.ui/templates/help/bin/html/tasks/subtopic2.html
    ui/org.eclipse.pde.ui/templates/help/bin/html/toc.html
    ui/org.eclipse.pde.ui/templates/help/bin/tocconcepts.xml
    ui/org.eclipse.pde.ui/templates/help/bin/tocgettingstarted.xml
    ui/org.eclipse.pde.ui/templates/help/bin/tocreference.xml
    ui/org.eclipse.pde.ui/templates/help/bin/tocsamples.xml
    ui/org.eclipse.pde.ui/templates/help/bin/toctasks.xml
    ui/org.eclipse.pde.ui/templates/help/testToc.xml
    ui/org.eclipse.pde.ui/templates/help/toc.xml
    ui/org.eclipse.pde.ui/templates/multiPageEditor/bin/icons/sample.gif
    ui/org.eclipse.pde.ui/templates/multiPageEditor/java/$contributorClassName$.java
    ui/org.eclipse.pde.ui/templates/multiPageEditor/java/$editorClassName$.java
    ui/org.eclipse.pde.ui/templates/newWizard/bin/icons/sample.gif
    ui/org.eclipse.pde.ui/templates/newWizard/java/$wizardClassName$.java
    ui/org.eclipse.pde.ui/templates/newWizard/java/$wizardPageClassName$.java
    ui/org.eclipse.pde.ui/templates/popupMenus/java/$actionClass$.java
    ui/org.eclipse.pde.ui/templates/preferences/java/$pageClassName$.java
    ui/org.eclipse.pde.ui/templates/propertyPages/java/$className$.java
    ui/org.eclipse.pde.ui/templates/view/bin/icons/sample.gif
    ui/org.eclipse.pde.ui/templates/view/java/$className$.java
    ui/org.eclipse.pde.ui/templates_3.0/builder/java/$builderClassName$.java
    ui/org.eclipse.pde.ui/templates_3.0/builder/java/$natureClassName$.java
    ui/org.eclipse.pde.ui/templates_3.0/builder/java/ToggleNatureAction.java
    ui/org.eclipse.pde.ui/templates_3.0/editor/bin/icons/sample.gif
    ui/org.eclipse.pde.ui/templates_3.0/editor/java/$editorClass$.java
    ui/org.eclipse.pde.ui/templates_3.0/editor/java/ColorManager.java
    ui/org.eclipse.pde.ui/templates_3.0/editor/java/IXMLColorConstants.java
    ui/org.eclipse.pde.ui/templates_3.0/editor/java/NonRuleBasedDamagerRepairer.java
    ui/org.eclipse.pde.ui/templates_3.0/editor/java/TagRule.java
    ui/org.eclipse.pde.ui/templates_3.0/editor/java/XMLConfiguration.java
    ui/org.eclipse.pde.ui/templates_3.0/editor/java/XMLDocumentProvider.java
    ui/org.eclipse.pde.ui/templates_3.0/editor/java/XMLDoubleClickStrategy.java
    ui/org.eclipse.pde.ui/templates_3.0/editor/java/XMLPartitionScanner.java
    ui/org.eclipse.pde.ui/templates_3.0/editor/java/XMLScanner.java
    ui/org.eclipse.pde.ui/templates_3.0/editor/java/XMLTagScanner.java
    ui/org.eclipse.pde.ui/templates_3.0/editor/java/XMLWhitespaceDetector.java
    ui/org.eclipse.pde.ui/templates_3.0/helloNonUIRCP/java/$applicationClass$.java
    ui/org.eclipse.pde.ui/templates_3.0/helloOSGi/java/$applicationClass$.java
    ui/org.eclipse.pde.ui/templates_3.0/helloRCP/java/$applicationClass$.java
    ui/org.eclipse.pde.ui/templates_3.0/helloRCP/java/ApplicationWorkbenchAdvisor.java
    ui/org.eclipse.pde.ui/templates_3.0/helloRCP/java/Perspective.java
    ui/org.eclipse.pde.ui/templates_3.0/helloWorld/bin/icons/sample.gif
    ui/org.eclipse.pde.ui/templates_3.0/helloWorld/java/$className$.java
    ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/concepts/maintopic.html
    ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/concepts/subtopic.html
    ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/concepts/subtopic2.html
    ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/gettingstarted/maintopic.html
    ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/gettingstarted/subtopic.html
    ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/gettingstarted/subtopic2.html
    ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/maintopic.html
    ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/reference/maintopic.html
    ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/reference/subtopic.html
    ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/reference/subtopic2.html
    ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/samples/maintopic.html
    ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/samples/subtopic.html
    ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/samples/subtopic2.html
    ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/subtopic.html
    ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/tasks/maintopic.html
    ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/tasks/subtopic.html
    ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/tasks/subtopic2.html
    ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/toc.html
    ui/org.eclipse.pde.ui/templates_3.0/help/bin/tocconcepts.xml
    ui/org.eclipse.pde.ui/templates_3.0/help/bin/tocgettingstarted.xml
    ui/org.eclipse.pde.ui/templates_3.0/help/bin/tocreference.xml
    ui/org.eclipse.pde.ui/templates_3.0/help/bin/tocsamples.xml
    ui/org.eclipse.pde.ui/templates_3.0/help/bin/toctasks.xml
    ui/org.eclipse.pde.ui/templates_3.0/help/testToc.xml
    ui/org.eclipse.pde.ui/templates_3.0/help/toc.xml
    ui/org.eclipse.pde.ui/templates_3.0/intro/bin/content/link_obj.gif
    ui/org.eclipse.pde.ui/templates_3.0/intro/bin/content/titlebanner.gif
    ui/org.eclipse.pde.ui/templates_3.0/intro/bin/splash.bmp
    ui/org.eclipse.pde.ui/templates_3.0/intro/content/root.css
    ui/org.eclipse.pde.ui/templates_3.0/intro/content/shared.css
    ui/org.eclipse.pde.ui/templates_3.0/intro/ext.xml
    ui/org.eclipse.pde.ui/templates_3.0/intro/introContent.xml
    ui/org.eclipse.pde.ui/templates_3.0/intro/java/Application.java
    ui/org.eclipse.pde.ui/templates_3.0/intro/java/ApplicationWorkbenchAdvisor.java
    ui/org.eclipse.pde.ui/templates_3.0/intro/java/DynamicContentProvider.java
    ui/org.eclipse.pde.ui/templates_3.0/intro/java/Perspective.java
    ui/org.eclipse.pde.ui/templates_3.0/mail/bin/icons/sample.gif
    ui/org.eclipse.pde.ui/templates_3.0/mail/bin/icons/sample.icns
    ui/org.eclipse.pde.ui/templates_3.0/mail/bin/icons/sample2.gif
    ui/org.eclipse.pde.ui/templates_3.0/mail/bin/icons/sample3.gif
    ui/org.eclipse.pde.ui/templates_3.0/mail/bin/plugin.properties
    ui/org.eclipse.pde.ui/templates_3.0/mail/bin/product_lg.gif
    ui/org.eclipse.pde.ui/templates_3.0/mail/bin/splash.bmp
    ui/org.eclipse.pde.ui/templates_3.0/mail/java/$applicationClass$.java
    ui/org.eclipse.pde.ui/templates_3.0/mail/java/ApplicationWorkbenchAdvisor.java
    ui/org.eclipse.pde.ui/templates_3.0/mail/java/ICommandIds.java
    ui/org.eclipse.pde.ui/templates_3.0/mail/java/MessagePopupAction.java
    ui/org.eclipse.pde.ui/templates_3.0/mail/java/NavigationView.java
    ui/org.eclipse.pde.ui/templates_3.0/mail/java/OpenViewAction.java
    ui/org.eclipse.pde.ui/templates_3.0/mail/java/Perspective.java
    ui/org.eclipse.pde.ui/templates_3.0/mail/java/View.java
    ui/org.eclipse.pde.ui/templates_3.0/multiPageEditor/bin/icons/sample.gif
    ui/org.eclipse.pde.ui/templates_3.0/multiPageEditor/java/$contributorClassName$.java
    ui/org.eclipse.pde.ui/templates_3.0/multiPageEditor/java/$editorClassName$.java
    ui/org.eclipse.pde.ui/templates_3.0/newWizard/bin/icons/sample.gif
    ui/org.eclipse.pde.ui/templates_3.0/newWizard/java/$wizardClassName$.java
    ui/org.eclipse.pde.ui/templates_3.0/newWizard/java/$wizardPageClassName$.java
    ui/org.eclipse.pde.ui/templates_3.0/popupMenus/java/$actionClass$.java
    ui/org.eclipse.pde.ui/templates_3.0/preferences/java/$pageClassName$.java
    ui/org.eclipse.pde.ui/templates_3.0/preferences/java/PreferenceConstants.java
    ui/org.eclipse.pde.ui/templates_3.0/preferences/java/PreferenceInitializer.java
    ui/org.eclipse.pde.ui/templates_3.0/propertyPages/java/$className$.java
    ui/org.eclipse.pde.ui/templates_3.0/view/bin/icons/sample.gif
    ui/org.eclipse.pde.ui/templates_3.0/view/java/$className$.java
    ui/org.eclipse.pde.ui/templates_3.0/viewRCP/java/$applicationClass$.java
    ui/org.eclipse.pde.ui/templates_3.0/viewRCP/java/ApplicationWorkbenchAdvisor.java
    ui/org.eclipse.pde.ui/templates_3.0/viewRCP/java/Perspective.java
    ui/org.eclipse.pde.ui/templates_3.0/viewRCP/java/View.java
    ui/org.eclipse.pde.ui/templates_3.1/editor/bin/icons/sample.gif
    ui/org.eclipse.pde.ui/templates_3.1/editor/java/$editorClass$.java
    ui/org.eclipse.pde.ui/templates_3.1/editor/java/ColorManager.java
    ui/org.eclipse.pde.ui/templates_3.1/editor/java/IXMLColorConstants.java
    ui/org.eclipse.pde.ui/templates_3.1/editor/java/NonRuleBasedDamagerRepairer.java
    ui/org.eclipse.pde.ui/templates_3.1/editor/java/TagRule.java
    ui/org.eclipse.pde.ui/templates_3.1/editor/java/XMLConfiguration.java
    ui/org.eclipse.pde.ui/templates_3.1/editor/java/XMLDocumentProvider.java
    ui/org.eclipse.pde.ui/templates_3.1/editor/java/XMLDoubleClickStrategy.java
    ui/org.eclipse.pde.ui/templates_3.1/editor/java/XMLPartitionScanner.java
    ui/org.eclipse.pde.ui/templates_3.1/editor/java/XMLScanner.java
    ui/org.eclipse.pde.ui/templates_3.1/editor/java/XMLTagScanner.java
    ui/org.eclipse.pde.ui/templates_3.1/editor/java/XMLWhitespaceDetector.java
    ui/org.eclipse.pde.ui/templates_3.1/helloRCP/java/$applicationClass$.java
    ui/org.eclipse.pde.ui/templates_3.1/helloRCP/java/ApplicationActionBarAdvisor.java
    ui/org.eclipse.pde.ui/templates_3.1/helloRCP/java/ApplicationWorkbenchAdvisor.java
    ui/org.eclipse.pde.ui/templates_3.1/helloRCP/java/ApplicationWorkbenchWindowAdvisor.java
    ui/org.eclipse.pde.ui/templates_3.1/helloRCP/java/Perspective.java
    ui/org.eclipse.pde.ui/templates_3.1/intro/bin/content/link_obj.gif
    ui/org.eclipse.pde.ui/templates_3.1/intro/bin/content/titlebanner.gif
    ui/org.eclipse.pde.ui/templates_3.1/intro/bin/splash.bmp
    ui/org.eclipse.pde.ui/templates_3.1/intro/content/concept1.xhtml
    ui/org.eclipse.pde.ui/templates_3.1/intro/content/concept2.xhtml
    ui/org.eclipse.pde.ui/templates_3.1/intro/content/concept3.xhtml
    ui/org.eclipse.pde.ui/templates_3.1/intro/content/extContent.xhtml
    ui/org.eclipse.pde.ui/templates_3.1/intro/content/root.css
    ui/org.eclipse.pde.ui/templates_3.1/intro/content/root.xhtml
    ui/org.eclipse.pde.ui/templates_3.1/intro/content/shared.css
    ui/org.eclipse.pde.ui/templates_3.1/intro/ext.xml
    ui/org.eclipse.pde.ui/templates_3.1/intro/introContent.xml
    ui/org.eclipse.pde.ui/templates_3.1/intro/java/Application.java
    ui/org.eclipse.pde.ui/templates_3.1/intro/java/ApplicationActionBarAdvisor.java
    ui/org.eclipse.pde.ui/templates_3.1/intro/java/ApplicationWorkbenchAdvisor.java
    ui/org.eclipse.pde.ui/templates_3.1/intro/java/ApplicationWorkbenchWindowAdvisor.java
    ui/org.eclipse.pde.ui/templates_3.1/intro/java/DynamicContentProvider.java
    ui/org.eclipse.pde.ui/templates_3.1/intro/java/Perspective.java
    ui/org.eclipse.pde.ui/templates_3.1/mail/bin/icons/sample.gif
    ui/org.eclipse.pde.ui/templates_3.1/mail/bin/icons/sample.icns
    ui/org.eclipse.pde.ui/templates_3.1/mail/bin/icons/sample2.gif
    ui/org.eclipse.pde.ui/templates_3.1/mail/bin/icons/sample3.gif
    ui/org.eclipse.pde.ui/templates_3.1/mail/bin/plugin.properties
    ui/org.eclipse.pde.ui/templates_3.1/mail/bin/product_lg.gif
    ui/org.eclipse.pde.ui/templates_3.1/mail/bin/splash.bmp
    ui/org.eclipse.pde.ui/templates_3.1/mail/java/$applicationClass$.java
    ui/org.eclipse.pde.ui/templates_3.1/mail/java/ApplicationActionBarAdvisor.java
    ui/org.eclipse.pde.ui/templates_3.1/mail/java/ApplicationWorkbenchAdvisor.java
    ui/org.eclipse.pde.ui/templates_3.1/mail/java/ApplicationWorkbenchWindowAdvisor.java
    ui/org.eclipse.pde.ui/templates_3.1/mail/java/ICommandIds.java
    ui/org.eclipse.pde.ui/templates_3.1/mail/java/MessagePopupAction.java
    ui/org.eclipse.pde.ui/templates_3.1/mail/java/NavigationView.java
    ui/org.eclipse.pde.ui/templates_3.1/mail/java/OpenViewAction.java
    ui/org.eclipse.pde.ui/templates_3.1/mail/java/Perspective.java
    ui/org.eclipse.pde.ui/templates_3.1/mail/java/View.java
    ui/org.eclipse.pde.ui/templates_3.1/viewRCP/java/$applicationClass$.java
    ui/org.eclipse.pde.ui/templates_3.1/viewRCP/java/ApplicationActionBarAdvisor.java
    ui/org.eclipse.pde.ui/templates_3.1/viewRCP/java/ApplicationWorkbenchAdvisor.java
    ui/org.eclipse.pde.ui/templates_3.1/viewRCP/java/ApplicationWorkbenchWindowAdvisor.java
    ui/org.eclipse.pde.ui/templates_3.1/viewRCP/java/Perspective.java
    ui/org.eclipse.pde.ui/templates_3.1/viewRCP/java/View.java
diff --git a/ui/org.eclipse.pde.junit.runtime/.classpath b/ui/org.eclipse.pde.junit.runtime/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/ui/org.eclipse.pde.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/ui/org.eclipse.pde.junit.runtime/.cvsignore b/ui/org.eclipse.pde.junit.runtime/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/ui/org.eclipse.pde.junit.runtime/.cvsignore
+++ /dev/null

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

diff --git a/ui/org.eclipse.pde.junit.runtime/.project b/ui/org.eclipse.pde.junit.runtime/.project
deleted file mode 100644
index e3c3e46..0000000
--- a/ui/org.eclipse.pde.junit.runtime/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.pde.junit.runtime</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/ui/org.eclipse.pde.junit.runtime/.settings/org.eclipse.pde.prefs b/ui/org.eclipse.pde.junit.runtime/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index d922306..0000000
--- a/ui/org.eclipse.pde.junit.runtime/.settings/org.eclipse.pde.prefs
+++ /dev/null

@@ -1,12 +0,0 @@
-#Thu Mar 17 10:55:08 EST 2005
-compilers.p.deprecated=2
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=1
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=1
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1

diff --git a/ui/org.eclipse.pde.junit.runtime/META-INF/MANIFEST.MF b/ui/org.eclipse.pde.junit.runtime/META-INF/MANIFEST.MF
deleted file mode 100644
index b72916b..0000000
--- a/ui/org.eclipse.pde.junit.runtime/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.pde.junit.runtime; singleton:=true
-Bundle-Version: 3.1.0
-Bundle-ClassPath: pdejunit.jar
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.jdt.junit.runtime,
- org.junit,
- org.eclipse.core.runtime,
- org.eclipse.core.runtime.compatibility;resolution:=optional,
- org.eclipse.ui;resolution:=optional
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.pde.internal.junit.runtime;x-internal:=true

diff --git a/ui/org.eclipse.pde.junit.runtime/about.html b/ui/org.eclipse.pde.junit.runtime/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/ui/org.eclipse.pde.junit.runtime/about.html
+++ /dev/null

@@ -1,22 +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>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation 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
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

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

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

diff --git a/ui/org.eclipse.pde.junit.runtime/plugin.properties b/ui/org.eclipse.pde.junit.runtime/plugin.properties
deleted file mode 100644
index 680b946..0000000
--- a/ui/org.eclipse.pde.junit.runtime/plugin.properties
+++ /dev/null

@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName = PDE JUnit Plug-in Test
-providerName = Eclipse.org
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.junit.runtime/plugin.xml b/ui/org.eclipse.pde.junit.runtime/plugin.xml
deleted file mode 100644
index 7d0aea3..0000000
--- a/ui/org.eclipse.pde.junit.runtime/plugin.xml
+++ /dev/null

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.pde.junit.runtime"
-   name="%pluginName"
-   version="3.1.0"
-   provider-name="%providerName">
-
-   <runtime>
-      <library name="pdejunit.jar"/>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.jdt.junit.runtime"/>
-      <import plugin="org.junit"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.runtime.compatibility" optional="true"/>
-      <import plugin="org.eclipse.ui" optional="true"/>
-   </requires>
-
-   <extension
-         id="uitestapplication"
-         point="org.eclipse.core.runtime.applications">
-      <application>
-         <run
-               class="org.eclipse.pde.internal.junit.runtime.UITestApplication">
-         </run>
-      </application>
-   </extension>
-   <extension
-         id="coretestapplication"
-         point="org.eclipse.core.runtime.applications">
-      <application>
-         <run
-               class="org.eclipse.pde.internal.junit.runtime.CoreTestApplication">
-         </run>
-      </application>
-   </extension>
-   <extension
-         id="legacyUItestapplication"
-         point="org.eclipse.core.runtime.applications">
-      <application>
-         <run
-               class="org.eclipse.pde.internal.junit.runtime.LegacyUITestApplication">
-         </run>
-      </application>
-   </extension>
-   <extension
-         id="legacyCoretestapplication"
-         point="org.eclipse.core.runtime.applications">
-      <application>
-         <run
-               class="org.eclipse.pde.internal.junit.runtime.LegacyCoreTestApplication">
-         </run>
-      </application>
-   </extension>
-
-</plugin>

diff --git a/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/CoreTestApplication.java b/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/CoreTestApplication.java
deleted file mode 100644
index f7c2b25..0000000
--- a/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/CoreTestApplication.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.junit.runtime;
-
-import org.eclipse.core.runtime.*;
-
-
-public class CoreTestApplication implements IPlatformRunnable {
-
-	/**
-	 * Runs a set of tests as defined by the given command line args.
-	 * This is the platform application entry point.
-	 * @see IPlatformRunnable
-	 */
-	public Object run(Object arguments) throws Exception {
-		RemotePluginTestRunner.main((String[])arguments);
-		return null;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/LegacyCoreTestApplication.java b/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/LegacyCoreTestApplication.java
deleted file mode 100644
index 9acba7a..0000000
--- a/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/LegacyCoreTestApplication.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.junit.runtime;
-
-import org.eclipse.core.boot.IPlatformRunnable;
-
-/**
- * A an application that launches tests once it is started.
- */
-public class LegacyCoreTestApplication implements IPlatformRunnable {
-
-	/**
-	 * Runs a set of tests as defined by the given command line args.
-	 * This is the platform application entry point.
-	 * @see IPlatformRunnable
-	 */
-	public Object run(Object arguments) throws Exception {
-		LegacyRemotePluginTestRunner.main((String[])arguments);
-		return null;
-	}
-}

diff --git a/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/LegacyRemotePluginTestRunner.java b/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/LegacyRemotePluginTestRunner.java
deleted file mode 100644
index 88ac2e3..0000000
--- a/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/LegacyRemotePluginTestRunner.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.junit.runtime;
-
-import java.util.Locale;
-
-import org.eclipse.core.runtime.Platform;
-
-import org.eclipse.jdt.internal.junit.runner.RemoteTestRunner;
-
-/**
- * Runs JUnit tests contained inside a plugin.
- */
-public class LegacyRemotePluginTestRunner extends RemoteTestRunner {
-
-	private String fTestPluginName;
-	
-	/** 
-	 * The main entry point. Supported arguments in addition
-	 * to the ones supported by RemoteTestRunner:
-	 * <pre>
-	 * -testpluginname: the name of the plugin containing the tests.
-      * </pre>
-     * @see RemoteTestRunner
-     */
-
-	public static void main(String[] args) {
-		LegacyRemotePluginTestRunner testRunner= new LegacyRemotePluginTestRunner();
-		testRunner.init(args);
-		testRunner.run();
-	}
-	
-	/**
-	 * Returns the Plugin class loader of the plugin containing the test.
-	 * @see RemotePluginTestRunner#getClassLoader()
-	 */
-	protected ClassLoader getClassLoader() {
-		if (Platform.getPluginRegistry().getPluginDescriptor(fTestPluginName) != null)
-			return Platform
-				.getPluginRegistry()
-				.getPluginDescriptor(fTestPluginName)
-				.getPluginClassLoader();
-		throw new IllegalArgumentException("No Classloader found for plug-in " + fTestPluginName); //$NON-NLS-1$
-	}
-
-	protected void init(String[] args) {
-		defaultInit(args);
-		setTestPluginName(args);
-	}
-
-	protected void setTestPluginName(String[] args) {
-		for (int i = 0; i < args.length; i++) {
-			if (args[i].toLowerCase(Locale.ENGLISH).equals("-testpluginname")) { //$NON-NLS-1$
-				if (i < args.length - 1)
-					fTestPluginName = args[i + 1];
-				return;
-			}
-		}
-		throw new IllegalArgumentException("Parameter -testpluginnname not specified."); //$NON-NLS-1$
-	}
-}	

diff --git a/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/LegacyUITestApplication.java b/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/LegacyUITestApplication.java
deleted file mode 100644
index 4694dcc..0000000
--- a/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/LegacyUITestApplication.java
+++ /dev/null

@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.junit.runtime;
-
-import junit.framework.*;
-
-import org.eclipse.core.boot.IPlatformRunnable;
-import org.eclipse.core.runtime.*;
-import org.eclipse.ui.*;
-
-public class LegacyUITestApplication implements IPlatformRunnable {
-
-	private static final String DEFAULT_APP_PRE_3_0 = "org.eclipse.ui.workbench"; //$NON-NLS-1$
-
-	public Object run(final Object args) throws Exception {
-		IPlatformRunnable object = getApplication((String[]) args);
-		
-		Assert.assertNotNull(object);
-		Assert.assertTrue(object instanceof IWorkbench);
-
-		final IWorkbench workbench = (IWorkbench) object;
-		// the 'started' flag is used so that we only run tests when the window
-		// is opened for the first time only.
-		final boolean[] started = { false };
-		workbench.addWindowListener(new IWindowListener() {
-			public void windowOpened(IWorkbenchWindow w) {
-				if (started[0])
-					return;
-				w.getShell().getDisplay().asyncExec(new Runnable() {
-					public void run() {
-						started[0] = true;
-						LegacyRemotePluginTestRunner.main((String[]) args);
-						workbench.close();
-					}
-				});
-			}
-			public void windowActivated(IWorkbenchWindow window) {
-			}
-			public void windowDeactivated(IWorkbenchWindow window) {
-			}
-			public void windowClosed(IWorkbenchWindow window) {
-			}
-		});
-		return ((IPlatformRunnable) workbench).run(args);
-	}
-	
-	
-	private IPlatformRunnable getApplication(String[] args) throws CoreException {
-		IExtension extension =
-			Platform.getPluginRegistry().getExtension(
-				Platform.PI_RUNTIME,
-				Platform.PT_APPLICATIONS,
-				DEFAULT_APP_PRE_3_0);
-
-		Assert.assertNotNull(extension);
-
-		// If the extension does not have the correct grammar, return null.
-		// Otherwise, return the application object.
-		IConfigurationElement[] elements = extension.getConfigurationElements();
-		if (elements.length > 0) {
-			IConfigurationElement[] runs = elements[0].getChildren("run"); //$NON-NLS-1$
-			if (runs.length > 0) {
-				Object runnable = runs[0].createExecutableExtension("class"); //$NON-NLS-1$
-				if (runnable instanceof IPlatformRunnable)
-					return (IPlatformRunnable) runnable;
-			}
-		}
-		return null;
-	}
-}

diff --git a/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/RemotePluginTestRunner.java b/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/RemotePluginTestRunner.java
deleted file mode 100644
index b296088..0000000
--- a/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/RemotePluginTestRunner.java
+++ /dev/null

@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.junit.runtime;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.Platform;
-
-import org.eclipse.jdt.internal.junit.runner.RemoteTestRunner;
-import org.osgi.framework.*;
-
-/**
- * Runs JUnit tests contained inside a plugin.
- */
-public class RemotePluginTestRunner extends RemoteTestRunner {
-
-	private String fTestPluginName;
-	
-	class BundleClassLoader extends ClassLoader {
-		  private Bundle bundle;
-		  public BundleClassLoader(Bundle target) {
-		    this.bundle = target;
-		  }
-		  protected Class findClass(String name) throws ClassNotFoundException {
-		    return bundle.loadClass(name);
-		  }
-		  protected URL findResource(String name) {
-		    return bundle.getResource(name);
-		  }
-		  protected Enumeration findResources(String name) throws IOException {
-			   return bundle.getResources(name);
-		  }
-	}
-	
-	/** 
-	 * The main entry point. Supported arguments in addition
-	 * to the ones supported by RemoteTestRunner:
-	 * <pre>
-	 * -testpluginname: the name of the plugin containing the tests.
-      * </pre>
-     * @see RemoteTestRunner
-     */
-
-	public static void main(String[] args) {
-		RemotePluginTestRunner testRunner= new RemotePluginTestRunner();
-		testRunner.init(args);
-		testRunner.run();
-	}
-	
-	/**
-	 * Returns the Plugin class loader of the plugin containing the test.
-	 * @see RemotePluginTestRunner#getClassLoader()
-	 */
-	protected ClassLoader getClassLoader() {
-		Bundle bundle = Platform.getBundle(fTestPluginName);
-		if (bundle == null)
-			throw new IllegalArgumentException("No Classloader found for plug-in " + fTestPluginName); //$NON-NLS-1$
-		return new BundleClassLoader(bundle);
-	}
-
-	protected void init(String[] args) {
-		defaultInit(args);
-		setTestPluginName(args);
-	}
-
-	protected void setTestPluginName(String[] args) {
-		for (int i = 0; i < args.length; i++) {
-			if (args[i].toLowerCase(Locale.ENGLISH).equals("-testpluginname")) { //$NON-NLS-1$
-				if (i < args.length - 1)
-					fTestPluginName = args[i + 1];
-				return;
-			}
-		}
-		throw new IllegalArgumentException("Parameter -testpluginnname not specified."); //$NON-NLS-1$
-	}
-}	

diff --git a/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/UITestApplication.java b/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/UITestApplication.java
deleted file mode 100644
index 0fb1fa7..0000000
--- a/ui/org.eclipse.pde.junit.runtime/src/org/eclipse/pde/internal/junit/runtime/UITestApplication.java
+++ /dev/null

@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.junit.runtime;
-
-import junit.framework.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.testing.*;
-
-/**
- * A Workbench that runs a test suite specified in the
- * command line arguments.
- */ 
-public class UITestApplication implements IPlatformRunnable, ITestHarness {
-	
-	private static final String DEFAULT_APP_3_0 = "org.eclipse.ui.ide.workbench"; //$NON-NLS-1$
-	
-	private TestableObject fTestableObject;
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IPlatformRunnable#run(java.lang.Object)
-	 */
-	public Object run(final Object args) throws Exception {
-		IPlatformRunnable application = getApplication((String[]) args);
-
-		Assert.assertNotNull(application);
-
-		fTestableObject = PlatformUI.getTestableObject();
-		fTestableObject.setTestHarness(this);
-		return application.run(args);
-	}
-	
-
-	/*
-	 * return the application to run, or null if not even the default application
-	 * is found.
-	 */
-	private IPlatformRunnable getApplication(String[] args) throws CoreException {
-		// Find the name of the application as specified by the PDE JUnit launcher.
-		// If no application is specified, the 3.0 default workbench application
-		// is returned.
-		IExtension extension =
-			Platform.getExtensionRegistry().getExtension(
-				Platform.PI_RUNTIME,
-				Platform.PT_APPLICATIONS,
-				getApplicationToRun(args));
-		
-		
-		Assert.assertNotNull(extension);
-		
-		// If the extension does not have the correct grammar, return null.
-		// Otherwise, return the application object.
-		IConfigurationElement[] elements = extension.getConfigurationElements();
-		if (elements.length > 0) {
-			IConfigurationElement[] runs = elements[0].getChildren("run"); //$NON-NLS-1$
-			if (runs.length > 0) {
-				Object runnable = runs[0].createExecutableExtension("class"); //$NON-NLS-1$
-				if (runnable instanceof IPlatformRunnable)
-					return (IPlatformRunnable) runnable;
-			}
-		}
-		return null;
-	}
-	
-	/*
-	 * The -testApplication argument specifies the application to be run.
-	 * If the PDE JUnit launcher did not set this argument, then return
-	 * the name of the default application.
-	 * In 3.0, the default is the "org.eclipse.ui.ide.worbench" application.
-	 * 
-	 */
-	private String getApplicationToRun(String[] args) {
-		IProduct product = Platform.getProduct();
-		if (product != null)
-			return product.getApplication();
-		for (int i = 0; i < args.length; i++) {
-			if (args[i].equals("-testApplication") && i < args.length -1) //$NON-NLS-1$
-				return args[i+1];
-		}
-		return DEFAULT_APP_3_0;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.testing.ITestHarness#runTests()
-	 */
-	public void runTests() {
-		fTestableObject.testingStarting();
-		fTestableObject.runTest(new Runnable() {
-			public void run() {
-				RemotePluginTestRunner.main(Platform.getCommandLineArgs());
-			}
-		});
-		fTestableObject.testingFinished();
-	}
-		
-}

diff --git a/ui/org.eclipse.pde.runtime/.classpath b/ui/org.eclipse.pde.runtime/.classpath
deleted file mode 100644
index 4848249..0000000
--- a/ui/org.eclipse.pde.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/ui/org.eclipse.pde.runtime/.cvsignore b/ui/org.eclipse.pde.runtime/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/ui/org.eclipse.pde.runtime/.cvsignore
+++ /dev/null

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

diff --git a/ui/org.eclipse.pde.runtime/.project b/ui/org.eclipse.pde.runtime/.project
deleted file mode 100644
index 5e843b1..0000000
--- a/ui/org.eclipse.pde.runtime/.project
+++ /dev/null

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

-<projectDescription>

-	<name>org.eclipse.pde.runtime</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/ui/org.eclipse.pde.runtime/META-INF/MANIFEST.MF b/ui/org.eclipse.pde.runtime/META-INF/MANIFEST.MF
deleted file mode 100644
index 624e65a..0000000
--- a/ui/org.eclipse.pde.runtime/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %name
-Bundle-SymbolicName: org.eclipse.pde.runtime; singleton:=true
-Bundle-Version: 3.1.0
-Bundle-Activator: org.eclipse.pde.internal.runtime.PDERuntimePlugin
-Bundle-Vendor: %provider-name
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.ui,
- org.eclipse.ui.views
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.pde.internal.runtime;x-internal:=true,
- org.eclipse.pde.internal.runtime.logview;x-friends:="org.eclipse.pde.ui",
- org.eclipse.pde.internal.runtime.registry;x-internal:=true

diff --git a/ui/org.eclipse.pde.runtime/about.html b/ui/org.eclipse.pde.runtime/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/ui/org.eclipse.pde.runtime/about.html
+++ /dev/null

@@ -1,22 +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>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation 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
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.runtime/build.properties b/ui/org.eclipse.pde.runtime/build.properties
deleted file mode 100644
index 3c18de4..0000000
--- a/ui/org.eclipse.pde.runtime/build.properties
+++ /dev/null

@@ -1,19 +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 Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#     IBM Corporation - initial API and implementation

-###############################################################################

-source.. = src/

-src.includes=about.html

-bin.includes = plugin.xml,\

-               plugin.properties,\

-               icons/,\

-               .,\

-               about.html,\

-               META-INF/

-               


diff --git a/ui/org.eclipse.pde.runtime/icons/dlcl16/clear.gif b/ui/org.eclipse.pde.runtime/icons/dlcl16/clear.gif
deleted file mode 100644
index 6775edf..0000000
--- a/ui/org.eclipse.pde.runtime/icons/dlcl16/clear.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/dlcl16/collapseall.gif b/ui/org.eclipse.pde.runtime/icons/dlcl16/collapseall.gif
deleted file mode 100644
index 7dc0de5..0000000
--- a/ui/org.eclipse.pde.runtime/icons/dlcl16/collapseall.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/dlcl16/export_log.gif b/ui/org.eclipse.pde.runtime/icons/dlcl16/export_log.gif
deleted file mode 100644
index a5a431e..0000000
--- a/ui/org.eclipse.pde.runtime/icons/dlcl16/export_log.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/dlcl16/filter_ps.gif b/ui/org.eclipse.pde.runtime/icons/dlcl16/filter_ps.gif
deleted file mode 100644
index f6f6219..0000000
--- a/ui/org.eclipse.pde.runtime/icons/dlcl16/filter_ps.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/dlcl16/find_obj.gif b/ui/org.eclipse.pde.runtime/icons/dlcl16/find_obj.gif
deleted file mode 100644
index f246a63..0000000
--- a/ui/org.eclipse.pde.runtime/icons/dlcl16/find_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/dlcl16/import_log.gif b/ui/org.eclipse.pde.runtime/icons/dlcl16/import_log.gif
deleted file mode 100644
index f935e22..0000000
--- a/ui/org.eclipse.pde.runtime/icons/dlcl16/import_log.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/dlcl16/open_log.gif b/ui/org.eclipse.pde.runtime/icons/dlcl16/open_log.gif
deleted file mode 100644
index 96d5334..0000000
--- a/ui/org.eclipse.pde.runtime/icons/dlcl16/open_log.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/dlcl16/properties.gif b/ui/org.eclipse.pde.runtime/icons/dlcl16/properties.gif
deleted file mode 100644
index ec394d6..0000000
--- a/ui/org.eclipse.pde.runtime/icons/dlcl16/properties.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/dlcl16/refresh.gif b/ui/org.eclipse.pde.runtime/icons/dlcl16/refresh.gif
deleted file mode 100644
index 6eafa48..0000000
--- a/ui/org.eclipse.pde.runtime/icons/dlcl16/refresh.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/dlcl16/remove.gif b/ui/org.eclipse.pde.runtime/icons/dlcl16/remove.gif
deleted file mode 100644
index 9e14298..0000000
--- a/ui/org.eclipse.pde.runtime/icons/dlcl16/remove.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/dlcl16/restore_log.gif b/ui/org.eclipse.pde.runtime/icons/dlcl16/restore_log.gif
deleted file mode 100644
index ab62179..0000000
--- a/ui/org.eclipse.pde.runtime/icons/dlcl16/restore_log.gif
+++ /dev/null
Binary files differ

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

diff --git a/ui/org.eclipse.pde.runtime/icons/dlcl16/th_vertical.gif b/ui/org.eclipse.pde.runtime/icons/dlcl16/th_vertical.gif
deleted file mode 100644
index a404f8d..0000000
--- a/ui/org.eclipse.pde.runtime/icons/dlcl16/th_vertical.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/elcl16/clear.gif b/ui/org.eclipse.pde.runtime/icons/elcl16/clear.gif
deleted file mode 100644
index af30a42..0000000
--- a/ui/org.eclipse.pde.runtime/icons/elcl16/clear.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/elcl16/collapseall.gif b/ui/org.eclipse.pde.runtime/icons/elcl16/collapseall.gif
deleted file mode 100644
index a2d80a9..0000000
--- a/ui/org.eclipse.pde.runtime/icons/elcl16/collapseall.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/elcl16/export_log.gif b/ui/org.eclipse.pde.runtime/icons/elcl16/export_log.gif
deleted file mode 100644
index 3465699..0000000
--- a/ui/org.eclipse.pde.runtime/icons/elcl16/export_log.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/elcl16/filter_ps.gif b/ui/org.eclipse.pde.runtime/icons/elcl16/filter_ps.gif
deleted file mode 100644
index 3d061d7..0000000
--- a/ui/org.eclipse.pde.runtime/icons/elcl16/filter_ps.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/elcl16/find_obj.gif b/ui/org.eclipse.pde.runtime/icons/elcl16/find_obj.gif
deleted file mode 100644
index d540a01..0000000
--- a/ui/org.eclipse.pde.runtime/icons/elcl16/find_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/elcl16/import_log.gif b/ui/org.eclipse.pde.runtime/icons/elcl16/import_log.gif
deleted file mode 100644
index cab213e..0000000
--- a/ui/org.eclipse.pde.runtime/icons/elcl16/import_log.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/elcl16/open_log.gif b/ui/org.eclipse.pde.runtime/icons/elcl16/open_log.gif
deleted file mode 100644
index 7e4c583..0000000
--- a/ui/org.eclipse.pde.runtime/icons/elcl16/open_log.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/elcl16/properties.gif b/ui/org.eclipse.pde.runtime/icons/elcl16/properties.gif
deleted file mode 100644
index 1dc19a3..0000000
--- a/ui/org.eclipse.pde.runtime/icons/elcl16/properties.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/elcl16/refresh.gif b/ui/org.eclipse.pde.runtime/icons/elcl16/refresh.gif
deleted file mode 100644
index e383147..0000000
--- a/ui/org.eclipse.pde.runtime/icons/elcl16/refresh.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/elcl16/remove.gif b/ui/org.eclipse.pde.runtime/icons/elcl16/remove.gif
deleted file mode 100644
index b6922ac..0000000
--- a/ui/org.eclipse.pde.runtime/icons/elcl16/remove.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/elcl16/restore_log.gif b/ui/org.eclipse.pde.runtime/icons/elcl16/restore_log.gif
deleted file mode 100644
index 8c4d765..0000000
--- a/ui/org.eclipse.pde.runtime/icons/elcl16/restore_log.gif
+++ /dev/null
Binary files differ

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

diff --git a/ui/org.eclipse.pde.runtime/icons/elcl16/th_vertical.gif b/ui/org.eclipse.pde.runtime/icons/elcl16/th_vertical.gif
deleted file mode 100644
index 50a54e0..0000000
--- a/ui/org.eclipse.pde.runtime/icons/elcl16/th_vertical.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/eview16/error_log.gif b/ui/org.eclipse.pde.runtime/icons/eview16/error_log.gif
deleted file mode 100644
index 58873a1..0000000
--- a/ui/org.eclipse.pde.runtime/icons/eview16/error_log.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/eview16/event_next.gif b/ui/org.eclipse.pde.runtime/icons/eview16/event_next.gif
deleted file mode 100644
index 072b184..0000000
--- a/ui/org.eclipse.pde.runtime/icons/eview16/event_next.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/eview16/event_prev.gif b/ui/org.eclipse.pde.runtime/icons/eview16/event_prev.gif
deleted file mode 100644
index 0716475..0000000
--- a/ui/org.eclipse.pde.runtime/icons/eview16/event_prev.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/eview16/hide_pane.gif b/ui/org.eclipse.pde.runtime/icons/eview16/hide_pane.gif
deleted file mode 100644
index 94004ff..0000000
--- a/ui/org.eclipse.pde.runtime/icons/eview16/hide_pane.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/eview16/horizontal_view.gif b/ui/org.eclipse.pde.runtime/icons/eview16/horizontal_view.gif
deleted file mode 100644
index 86bfc48..0000000
--- a/ui/org.eclipse.pde.runtime/icons/eview16/horizontal_view.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/eview16/registry.gif b/ui/org.eclipse.pde.runtime/icons/eview16/registry.gif
deleted file mode 100644
index c2d6375..0000000
--- a/ui/org.eclipse.pde.runtime/icons/eview16/registry.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/eview16/vertical_view.gif b/ui/org.eclipse.pde.runtime/icons/eview16/vertical_view.gif
deleted file mode 100644
index 493c2fb..0000000
--- a/ui/org.eclipse.pde.runtime/icons/eview16/vertical_view.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/error_st_obj.gif b/ui/org.eclipse.pde.runtime/icons/obj16/error_st_obj.gif
deleted file mode 100644
index 0bc6068..0000000
--- a/ui/org.eclipse.pde.runtime/icons/obj16/error_st_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/error_stack.gif b/ui/org.eclipse.pde.runtime/icons/obj16/error_stack.gif
deleted file mode 100644
index e61fc24..0000000
--- a/ui/org.eclipse.pde.runtime/icons/obj16/error_stack.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/ext_point_obj.gif b/ui/org.eclipse.pde.runtime/icons/obj16/ext_point_obj.gif
deleted file mode 100644
index 17f771a..0000000
--- a/ui/org.eclipse.pde.runtime/icons/obj16/ext_point_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/ext_points_obj.gif b/ui/org.eclipse.pde.runtime/icons/obj16/ext_points_obj.gif
deleted file mode 100644
index 52f4e5e..0000000
--- a/ui/org.eclipse.pde.runtime/icons/obj16/ext_points_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/extension_obj.gif b/ui/org.eclipse.pde.runtime/icons/obj16/extension_obj.gif
deleted file mode 100644
index 7f3f595..0000000
--- a/ui/org.eclipse.pde.runtime/icons/obj16/extension_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/extensions_obj.gif b/ui/org.eclipse.pde.runtime/icons/obj16/extensions_obj.gif
deleted file mode 100644
index e8abf43..0000000
--- a/ui/org.eclipse.pde.runtime/icons/obj16/extensions_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/generic_xml_obj.gif b/ui/org.eclipse.pde.runtime/icons/obj16/generic_xml_obj.gif
deleted file mode 100644
index 4083e21..0000000
--- a/ui/org.eclipse.pde.runtime/icons/obj16/generic_xml_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/info_st_obj.gif b/ui/org.eclipse.pde.runtime/icons/obj16/info_st_obj.gif
deleted file mode 100644
index 2da001e..0000000
--- a/ui/org.eclipse.pde.runtime/icons/obj16/info_st_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/java_lib_obj.gif b/ui/org.eclipse.pde.runtime/icons/obj16/java_lib_obj.gif
deleted file mode 100644
index cb55e33..0000000
--- a/ui/org.eclipse.pde.runtime/icons/obj16/java_lib_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/ok_st_obj.gif b/ui/org.eclipse.pde.runtime/icons/obj16/ok_st_obj.gif
deleted file mode 100644
index 9cacb96..0000000
--- a/ui/org.eclipse.pde.runtime/icons/obj16/ok_st_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/plugin_obj.gif b/ui/org.eclipse.pde.runtime/icons/obj16/plugin_obj.gif
deleted file mode 100644
index 8493df4..0000000
--- a/ui/org.eclipse.pde.runtime/icons/obj16/plugin_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/req_plugin_obj.gif b/ui/org.eclipse.pde.runtime/icons/obj16/req_plugin_obj.gif
deleted file mode 100644
index c54f2b3..0000000
--- a/ui/org.eclipse.pde.runtime/icons/obj16/req_plugin_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/req_plugins_obj.gif b/ui/org.eclipse.pde.runtime/icons/obj16/req_plugins_obj.gif
deleted file mode 100644
index 7f135be..0000000
--- a/ui/org.eclipse.pde.runtime/icons/obj16/req_plugins_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/runtime_obj.gif b/ui/org.eclipse.pde.runtime/icons/obj16/runtime_obj.gif
deleted file mode 100644
index f159bcd..0000000
--- a/ui/org.eclipse.pde.runtime/icons/obj16/runtime_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/obj16/warning_st_obj.gif b/ui/org.eclipse.pde.runtime/icons/obj16/warning_st_obj.gif
deleted file mode 100644
index 2b2e50f..0000000
--- a/ui/org.eclipse.pde.runtime/icons/obj16/warning_st_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/icons/ovr16/run_co.gif b/ui/org.eclipse.pde.runtime/icons/ovr16/run_co.gif
deleted file mode 100644
index 13077f9..0000000
--- a/ui/org.eclipse.pde.runtime/icons/ovr16/run_co.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.runtime/plugin.properties b/ui/org.eclipse.pde.runtime/plugin.properties
deleted file mode 100644
index 130205d..0000000
--- a/ui/org.eclipse.pde.runtime/plugin.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 Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#     IBM Corporation - initial API and implementation

-###############################################################################

-#

-# plugin.xml properties

-#

-

-name = Plug-in Development Environment Runtime

-provider-name = Eclipse.org

-

-views.category.name = &PDE Runtime

-views.registry.name= Plug-in Registry

-views.errorLog.name= Error Log

-ViewCommand.registryBrowser.name= Plug-in Registry

-ViewCommand.registryBrowser.description= Show the Plug-in Registry

-ViewCommand.logView.name= Error Log

-ViewCommand.logView.description= Show the Error Log

-

-propertyPages.details.name = Event Details

-propertyPages.session.name = Session Data


diff --git a/ui/org.eclipse.pde.runtime/plugin.xml b/ui/org.eclipse.pde.runtime/plugin.xml
deleted file mode 100644
index 7363fe5..0000000
--- a/ui/org.eclipse.pde.runtime/plugin.xml
+++ /dev/null

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

-<?eclipse version="3.0"?>

-<plugin>

-

-    
-<!-- Extensions -->

-   <extension

-         point="org.eclipse.ui.views">

-      <category

-            name="%views.category.name"

-            id="org.eclipse.pde.runtime">

-      </category>

-      <view

-            name="%views.registry.name"

-            icon="$nl$/icons/eview16/registry.gif"

-            category="org.eclipse.pde.runtime"

-            class="org.eclipse.pde.internal.runtime.registry.RegistryBrowser"

-            id="org.eclipse.pde.runtime.RegistryBrowser">

-      </view>

-      <view

-            name="%views.errorLog.name"

-            icon="$nl$/icons/eview16/error_log.gif"

-            category="org.eclipse.pde.runtime"

-            class="org.eclipse.pde.internal.runtime.logview.LogView"

-            id="org.eclipse.pde.runtime.LogView">

-      </view>

-   </extension>

-   <extension

-         point="org.eclipse.ui.commands">

-      <command

-            name="%ViewCommand.registryBrowser.name"

-            description="%ViewCommand.registryBrowser.description"

-            categoryId="org.eclipse.ui.category.views"

-            id="org.eclipse.pde.runtime.RegistryBrowser">

-      </command>

-      <command

-            name="%ViewCommand.logView.name"

-            description="%ViewCommand.logView.description"

-            categoryId="org.eclipse.ui.category.views"

-            id="org.eclipse.pde.runtime.LogView">

-      </command>

-   </extension>

-   <extension

-         point="org.eclipse.ui.perspectiveExtensions">

-      <perspectiveExtension

-            targetID="org.eclipse.ui.resourcePerspective">

-         <viewShortcut

-               id="org.eclipse.pde.runtime.LogView">

-         </viewShortcut>

-      </perspectiveExtension>

-      <perspectiveExtension

-            targetID="org.eclipse.jdt.ui.JavaPerspective">

-         <viewShortcut

-               id="org.eclipse.pde.runtime.LogView">

-         </viewShortcut>

-      </perspectiveExtension>

-      <perspectiveExtension

-            targetID="org.eclipse.debug.ui.DebugPerspective">

-         <viewShortcut

-               id="org.eclipse.pde.runtime.LogView">

-         </viewShortcut>

-      </perspectiveExtension>

-      <perspectiveExtension

-            targetID="org.eclipse.jdt.ui.JavaBrowsingPerspective">

-         <viewShortcut

-               id="org.eclipse.pde.runtime.LogView">

-         </viewShortcut>

-      </perspectiveExtension>

-   </extension>

-

-</plugin>


diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/IHelpContextIds.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/IHelpContextIds.java
deleted file mode 100644
index 1114075..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/IHelpContextIds.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.runtime;
-
-/**
- * @author W Melhem
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public interface IHelpContextIds {
-	public static final String PREFIX = "org.eclipse.pde.doc.user" + "."; //$NON-NLS-1$ //$NON-NLS-2$
-	
-	public static final String LOG_VIEW = PREFIX + "log_view"; //$NON-NLS-1$
-	public static final String REGISTRY_VIEW = PREFIX + "registry_view"; //$NON-NLS-1$
-
-}

diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/OverlayIcon.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/OverlayIcon.java
deleted file mode 100644
index 396e1ee..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/OverlayIcon.java
+++ /dev/null

@@ -1,114 +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 Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.pde.internal.runtime;

-

-import org.eclipse.jface.resource.*;

-import org.eclipse.swt.graphics.*;

-

-

-public class OverlayIcon extends CompositeImageDescriptor {

-	

-	static final int DEFAULT_WIDTH= 16;

-	static final int DEFAULT_HEIGHT= 16;

-	

-	private Point fSize= null;

-		

-	private ImageDescriptor fBase;

-	private ImageDescriptor fOverlays[][];

-

-	public OverlayIcon(ImageDescriptor base, ImageDescriptor[][] overlays) {

-		fBase= base;

-		if (fBase == null)

-			fBase= ImageDescriptor.getMissingImageDescriptor();

-		fOverlays= overlays;

-		fSize= new Point(DEFAULT_WIDTH, DEFAULT_HEIGHT);

-	}

-	public OverlayIcon(ImageDescriptor base, ImageDescriptor[][] overlays, Point size) {

-		fBase= base;

-		if (fBase == null)

-			fBase= ImageDescriptor.getMissingImageDescriptor();

-		fOverlays= overlays;

-		fSize= size;

-	}

-	protected void drawBottomLeft(ImageDescriptor[] overlays) {

-		if (overlays == null)

-			return;

-		int length= overlays.length;

-		int x= 0;

-		for (int i= 0; i < 3; i++) {

-			if (i < length && overlays[i] != null) {

-				ImageData id= overlays[i].getImageData();

-				drawImage(id, x, getSize().y-id.height);

-				x+= id.width;

-			}

-		}

-	}

-	protected void drawBottomRight(ImageDescriptor[] overlays) {

-		if (overlays == null)

-			return;

-		int length= overlays.length;

-		int x= getSize().x;

-		for (int i= 2; i >= 0; i--) {

-			if (i < length && overlays[i] != null) {

-				ImageData id= overlays[i].getImageData();

-				x-= id.width;

-				drawImage(id, x, getSize().y-id.height);

-			}

-		}

-	}

-	protected void drawCompositeImage(int width, int height) {

-		ImageData bg= fBase.getImageData();

-		drawImage(bg, 0, 0);

-		

-		if (fOverlays != null) {

-			if (fOverlays.length > 0)

-				drawTopRight( fOverlays[0]);

-				

-			if (fOverlays.length > 1)

-				drawBottomRight(fOverlays[1]);

-				

-			if (fOverlays.length > 2)

-				drawBottomLeft(fOverlays[2]);

-				

-			if (fOverlays.length > 3)

-				drawTopLeft(fOverlays[3]);

-		}   

-	}

-	protected void drawTopLeft(ImageDescriptor[] overlays) {

-		if (overlays == null)

-			return;

-		int length= overlays.length;

-		int x= 0;

-		for (int i= 0; i < 3; i++) {

-			if (i < length && overlays[i] != null) {

-				ImageData id= overlays[i].getImageData();

-				drawImage(id, x, 0);

-				x+= id.width;

-			}

-		}

-	}

-	protected void drawTopRight(ImageDescriptor[] overlays) {

-		if (overlays == null)

-			return;

-		int length= overlays.length;

-		int x= getSize().x;

-		for (int i= 2; i >= 0; i--) {

-			if (i < length && overlays[i] != null) {

-				ImageData id= overlays[i].getImageData();

-				x-= id.width;

-				drawImage(id, x, 0);

-			}

-		}

-	}

-	protected Point getSize() {

-		return fSize;

-	}

-}


diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/PDERuntimeMessages.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/PDERuntimeMessages.java
deleted file mode 100644
index 3313d17..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/PDERuntimeMessages.java
+++ /dev/null

@@ -1,131 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005 IBM Corporation and others. All rights reserved.   This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: 
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.pde.internal.runtime;
-
-import org.eclipse.osgi.util.NLS;
-
-public class PDERuntimeMessages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.pde.internal.runtime.pderuntimeresources";//$NON-NLS-1$
-
-	public static String LogView_column_severity;
-	public static String LogView_column_message;
-	public static String LogView_column_plugin;
-	public static String LogView_column_date;
-	public static String LogView_clear;
-	public static String LogView_clear_tooltip;
-	public static String LogView_copy;
-	public static String LogView_delete;
-	public static String LogView_delete_tooltip;
-	public static String LogView_export;
-	public static String LogView_exportLog;
-	public static String LogView_export_tooltip;
-	public static String LogView_import;
-	public static String LogView_import_tooltip;
-	public static String LogView_filter;
-	public static String LogView_readLog_reload;
-	public static String LogView_readLog_restore;
-	public static String LogView_readLog_restore_tooltip;
-	public static String LogView_severity_error;
-	public static String LogView_severity_warning;
-	public static String LogView_severity_info;
-	public static String LogView_severity_ok;
-	public static String LogView_confirmDelete_title;
-	public static String LogView_confirmDelete_message;
-	public static String LogView_confirmOverwrite_message;
-	public static String LogView_operation_importing;
-	public static String LogView_operation_reloading;
-	public static String LogView_activate;
-	public static String LogView_view_currentLog;
-	public static String LogView_view_currentLog_tooltip;
-	public static String LogView_properties_tooltip;
-
-	public static String LogView_FilterDialog_title;
-	public static String LogView_FilterDialog_eventTypes;
-	public static String LogView_FilterDialog_information;
-	public static String LogView_FilterDialog_warning;
-	public static String LogView_FilterDialog_error;
-	public static String LogView_FilterDialog_limitTo;
-	public static String LogView_FilterDialog_eventsLogged;
-	public static String LogView_FilterDialog_allSessions;
-	public static String LogView_FilterDialog_recentSession;
-
-	public static String RegistryView_extensionPointPR_id;
-	public static String RegistryView_extensionPointPR_name;
-
-	public static String RegistryView_extensionPR_id;
-	public static String RegistryView_extensionPR_name;
-	public static String RegistryView_extensionPR_point;
-
-	public static String RegistryView_libraryPR_path;
-	public static String RegistryView_libraryPR_exported;
-	public static String RegistryView_libraryPR_fullyExported;
-
-	public static String RegistryView_pluginPR_installURL;
-	public static String RegistryView_pluginPR_name;
-	public static String RegistryView_pluginPR_id;
-	public static String RegistryView_pluginPR_providerName;
-	public static String RegistryView_pluginPR_version;
-	public static String RegistryView_pluginPR_activated;
-
-	public static String RegistryView_prerequisitePR_exported;
-	public static String RegistryView_prerequisitePR_id;
-	public static String RegistryView_prerequisitePR_version;
-	public static String RegistryView_prerequisitePR_optional;
-	public static String RegistryView_prerequisitePR_match;
-	public static String RegistryView_prerequisitePR_matchedCompatible;
-	public static String RegistryView_prerequisitePR_matchedExact;
-	public static String RegistryView_prerequisitePR_matchedEquivalent;
-	public static String RegistryView_prerequisitePR_matchedGreaterOrEqual;
-	public static String RegistryView_prerequisitePR_matchedPerfect;
-
-	public static String RegistryView_refresh_label;
-	public static String RegistryView_refresh_tooltip;
-	public static String RegistryView_collapseAll_label;
-	public static String RegistryView_collapseAll_tooltip;
-
-	public static String RegistryView_folders_imports;
-	public static String RegistryView_folders_libraries;
-	public static String RegistryView_folders_extensionPoints;
-	public static String RegistryView_folders_extensions;
-	public static String EventDetailsDialog_title;
-	public static String EventDetailsDialog_date;
-	public static String EventDetailsDialog_severity;
-	public static String EventDetailsDialog_message;
-	public static String EventDetailsDialog_exception;
-	public static String EventDetailsDialog_session;
-	public static String EventDetailsDialog_noStack;
-	public static String EventDetailsDialog_previous;
-	public static String EventDetailsDialog_next;
-	public static String EventDetailsDialog_copy;
-
-	public static String RegistryView_showRunning_label;
-
-	public static String RegistryView_showPropertiesSheet_label;
-	public static String RegistryView_showPropertiesSheet_tooltip;
-	public static String RegistryView_showPropertiesSheet_desc;
-
-	public static String RegistryView_verticalOrientation_label;
-	public static String RegistryView_verticalOrientation_tooltip;
-	public static String RegistryView_verticalOrientation_desc;
-
-	public static String RegistryView_horizontalOrientation_label;
-	public static String RegistryView_horizontalOrientation_tooltip;
-	public static String RegistryView_horizontalOrientation_desc;
-
-	public static String RegistryView_titleSummary;
-	public static String OpenLogDialog_title;
-	public static String OpenLogDialog_message;
-	public static String OpenLogDialog_cannotDisplay;
-
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_NAME, PDERuntimeMessages.class);
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/PDERuntimePlugin.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/PDERuntimePlugin.java
deleted file mode 100644
index d70a780..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/PDERuntimePlugin.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 Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.pde.internal.runtime;

-

-import org.eclipse.core.runtime.*;

-import org.eclipse.pde.internal.runtime.registry.*;

-import org.eclipse.swt.widgets.*;

-import org.eclipse.ui.*;

-import org.eclipse.ui.plugin.*;

-import org.osgi.framework.*;

-

-

-public class PDERuntimePlugin extends AbstractUIPlugin {

-	

-	private static PDERuntimePlugin inst;

-

-	private BundleContext fContext;

-

-	public static IWorkbenchPage getActivePage() {

-		return getDefault().internalGetActivePage();

-	}

-	

-	public static Shell getActiveWorkbenchShell() {

-		return getActiveWorkbenchWindow().getShell();

-	}

-	

-	public static IWorkbenchWindow getActiveWorkbenchWindow() {

-		return getDefault().getWorkbench().getActiveWorkbenchWindow();

-	}

-	

-	public static PDERuntimePlugin getDefault() {

-		return inst;

-	}

-	

-	public static String getPluginId() {

-		return getDefault().getBundle().getSymbolicName();

-	}

-	

-	public PDERuntimePlugin() {

-		inst = this;

-	}

-	

-	private IWorkbenchPage internalGetActivePage() {

-		return getWorkbench().getActiveWorkbenchWindow().getActivePage();

-	}

-	/* (non-Javadoc)

-	 * @see org.eclipse.core.runtime.Plugin#start(org.osgi.framework.BundleContext)

-	 */

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		this.fContext = context;

-		IAdapterManager manager = Platform.getAdapterManager();

-		RegistryPropertySourceFactory factory =

-			new RegistryPropertySourceFactory();

-		manager.registerAdapters(factory, PluginObjectAdapter.class);

-	}

-	

-	public BundleContext getBundleContext() {

-		return this.fContext;

-	}

-	

-	/**

-	 * This method is called when the plug-in is stopped

-	 */

-	public void stop(BundleContext context) throws Exception {

-		super.stop(context);

-		inst = null;

-	}

-

-}


diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/PDERuntimePluginImages.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/PDERuntimePluginImages.java
deleted file mode 100644
index 3716bac..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/PDERuntimePluginImages.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 Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.pde.internal.runtime;

-

-import java.net.*;

-

-import org.eclipse.core.runtime.*;

-import org.eclipse.jface.resource.*;

-import org.eclipse.swt.graphics.Image;

-

-public class PDERuntimePluginImages {

-

-	private final static ImageRegistry PLUGIN_REGISTRY =

-		PDERuntimePlugin.getDefault().getImageRegistry();

-

-	public final static String ICONS_PATH = "icons/"; //$NON-NLS-1$

-

-	private static final String PATH_OBJ = ICONS_PATH + "obj16/"; //$NON-NLS-1$

-	private static final String PATH_LCL = ICONS_PATH + "elcl16/"; //$NON-NLS-1$

-	private static final String PATH_LCL_DISABLED = ICONS_PATH + "dlcl16/"; //$NON-NLS-1$

-	private static final String PATH_OVR = ICONS_PATH + "ovr16/"; //$NON-NLS-1$

-	private static final String PATH_EVENTS = ICONS_PATH + "eview16/"; //$NON-NLS-1$

-

-

-	public static final ImageDescriptor DESC_ERROR_ST_OBJ =

-		create(PATH_OBJ, "error_st_obj.gif"); //$NON-NLS-1$

-	public static final ImageDescriptor DESC_ERROR_STACK_OBJ =

-		create(PATH_OBJ, "error_stack.gif"); //$NON-NLS-1$

-	public static final ImageDescriptor DESC_EXT_POINT_OBJ =

-		create(PATH_OBJ, "ext_point_obj.gif"); //$NON-NLS-1$

-	public static final ImageDescriptor DESC_EXT_POINTS_OBJ =

-		create(PATH_OBJ, "ext_points_obj.gif"); //$NON-NLS-1$

-	public static final ImageDescriptor DESC_EXTENSION_OBJ =

-		create(PATH_OBJ, "extension_obj.gif"); //$NON-NLS-1$

-	public static final ImageDescriptor DESC_EXTENSIONS_OBJ =

-		create(PATH_OBJ, "extensions_obj.gif"); //$NON-NLS-1$

-	public static final ImageDescriptor DESC_GENERIC_XML_OBJ =

-		create(PATH_OBJ, "generic_xml_obj.gif"); //$NON-NLS-1$

-	public static final ImageDescriptor DESC_INFO_ST_OBJ =

-		create(PATH_OBJ, "info_st_obj.gif"); //$NON-NLS-1$

-	public static final ImageDescriptor DESC_JAVA_LIB_OBJ =

-		create(PATH_OBJ, "java_lib_obj.gif"); //$NON-NLS-1$

-	public static final ImageDescriptor DESC_NATIVE_LIB_OBJ =

-		create(PATH_OBJ, "native_lib_obj.gif"); //$NON-NLS-1$

-	public static final ImageDescriptor DESC_OK_ST_OBJ =

-		create(PATH_OBJ, "ok_st_obj.gif"); //$NON-NLS-1$

-	public static final ImageDescriptor DESC_PLUGIN_OBJ =

-		create(PATH_OBJ, "plugin_obj.gif"); //$NON-NLS-1$

-	public static final ImageDescriptor DESC_REQ_PLUGIN_OBJ =

-		create(PATH_OBJ, "req_plugin_obj.gif"); //$NON-NLS-1$

-	public static final ImageDescriptor DESC_REQ_PLUGINS_OBJ =

-		create(PATH_OBJ, "req_plugins_obj.gif"); //$NON-NLS-1$

-	public static final ImageDescriptor DESC_RUNTIME_OBJ =

-		create(PATH_OBJ, "runtime_obj.gif"); //$NON-NLS-1$

-	public static final ImageDescriptor DESC_WARNING_ST_OBJ =

-		create(PATH_OBJ, "warning_st_obj.gif"); //$NON-NLS-1$

-

-	/*

-	 * Local tool bar image descriptors

-	 */

-

-	public static final ImageDescriptor DESC_PROPERTIES =

-		create(PATH_LCL, "properties.gif"); //$NON-NLS-1$

-	public static final ImageDescriptor DESC_OPEN_LOG =

-		create(PATH_LCL, "open_log.gif"); //$NON-NLS-1$

-	public static final ImageDescriptor DESC_OPEN_LOG_DISABLED =

-		create(PATH_LCL_DISABLED, "open_log.gif"); //$NON-NLS-1$

-

-	public static final ImageDescriptor DESC_PROPERTIES_DISABLED =

-		create(PATH_LCL_DISABLED, "properties.gif"); //$NON-NLS-1$

-	public static final ImageDescriptor DESC_REFRESH =

-		create(PATH_LCL, "refresh.gif"); //$NON-NLS-1$

-	public static final ImageDescriptor DESC_REFRESH_DISABLED =

-		create(PATH_LCL_DISABLED, "refresh.gif"); //$NON-NLS-1$

-	public static final ImageDescriptor DESC_CLEAR = create(PATH_LCL, "clear.gif"); //$NON-NLS-1$

-	public static final ImageDescriptor DESC_CLEAR_DISABLED =

-		create(PATH_LCL_DISABLED, "clear.gif"); //$NON-NLS-1$

-

-	public static final ImageDescriptor DESC_READ_LOG =

-		create(PATH_LCL, "restore_log.gif"); //$NON-NLS-1$

-	public static final ImageDescriptor DESC_READ_LOG_DISABLED =

-		create(PATH_LCL_DISABLED, "restore_log.gif"); //$NON-NLS-1$

-		

-	public static final ImageDescriptor DESC_REMOVE_LOG =

-		create(PATH_LCL, "remove.gif"); //$NON-NLS-1$

-	public static final ImageDescriptor DESC_REMOVE_LOG_DISABLED =

-		create(PATH_LCL_DISABLED, "remove.gif"); //$NON-NLS-1$

-		

-	public static final ImageDescriptor DESC_FILTER =

-		create(PATH_LCL, "filter_ps.gif"); //$NON-NLS-1$

-	public static final ImageDescriptor DESC_FILTER_DISABLED =

-		create(PATH_LCL_DISABLED, "filter_ps.gif"); //$NON-NLS-1$

-

-	public static final ImageDescriptor DESC_EXPORT =

-		create(PATH_LCL, "export_log.gif"); //$NON-NLS-1$

-	public static final ImageDescriptor DESC_EXPORT_DISABLED =

-		create(PATH_LCL_DISABLED, "export_log.gif"); //$NON-NLS-1$

-		

-	public static final ImageDescriptor DESC_IMPORT =

-		create(PATH_LCL, "import_log.gif"); //$NON-NLS-1$

-	public static final ImageDescriptor DESC_IMPORT_DISABLED =

-		create(PATH_LCL_DISABLED, "import_log.gif"); //$NON-NLS-1$

-	

-	public static final ImageDescriptor DESC_COLLAPSE_ALL =

-		create(PATH_LCL, "collapseall.gif"); //$NON-NLS-1$

-	

-	public static final ImageDescriptor DESC_HORIZONTAL_VIEW =

-		create(PATH_LCL, "th_horizontal.gif"); //$NON-NLS-1$

-	

-	public static final ImageDescriptor DESC_HORIZONTAL_VIEW_DISABLED = 

-		create(PATH_LCL_DISABLED, "th_horizontal.gif"); //$NON-NLS-1$

-	

-	public static final ImageDescriptor DESC_VERTICAL_VIEW =

-		create(PATH_LCL, "th_vertical.gif"); //$NON-NLS-1$

-	

-	public static final ImageDescriptor DESC_VERTICAL_VIEW_DISABLED = 

-		create(PATH_LCL_DISABLED, "th_vertical.gif"); //$NON-NLS-1$

-	

-	public static final ImageDescriptor DESC_HIDE_PANE =

-		create(PATH_EVENTS, "hide_pane.gif"); //$NON-NLS-1$

-	

-	/*

-	 * Event Details

-	 */

-	public static final ImageDescriptor DESC_PREV_EVENT =

-		create(PATH_EVENTS, "event_prev.gif"); //$NON-NLS-1$

-	public static final ImageDescriptor DESC_NEXT_EVENT = 

-		create(PATH_EVENTS, "event_next.gif"); //$NON-NLS-1$

-	/*

-	 * Overlays

-	 */

-	public static final ImageDescriptor DESC_RUN_CO =

-		create(PATH_OVR, "run_co.gif"); //$NON-NLS-1$

-

-	private static ImageDescriptor create(String prefix, String name) {

-		return ImageDescriptor.createFromURL(makeIconURL(prefix, name));

-	}

-

-	public static Image get(String key) {

-		return PLUGIN_REGISTRY.get(key);

-	}

-	private static URL makeIconURL(String prefix, String name) {

-		String path = "$nl$/" + prefix + name; //$NON-NLS-1$

-		return Platform.find(PDERuntimePlugin.getDefault().getBundle(), new Path(path));

-	}

-	public static Image manage(String key, ImageDescriptor desc) {

-		Image image = desc.createImage();

-		PLUGIN_REGISTRY.put(key, image);

-		return image;

-	}

-}


diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/EventDetailsDialog.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/EventDetailsDialog.java
deleted file mode 100644
index fa2e128..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/EventDetailsDialog.java
+++ /dev/null

@@ -1,692 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.runtime.logview;
-
-import java.io.*;
-import java.text.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.internal.runtime.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.custom.*;
-import org.eclipse.swt.dnd.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-
-public class EventDetailsDialog extends Dialog {
-	private LogEntry entry, parentEntry;
-	private LogViewLabelProvider labelProvider;
-	private static int COPY_ID = 22;
-	private TreeViewer provider;
-	private int elementNum, totalElementCount;
-	private LogEntry[] entryChildren;
-	private int childIndex = 0;
-	private boolean isOpen;
-	private boolean isLastChild;
-	private boolean isAtEndOfLog;
-	
-	private Label dateLabel;
-	private Label severityImageLabel;
-	private Label severityLabel;
-	private Text msgText;
-	private Text stackTraceText;
-	private Text sessionDataText;
-	private Clipboard clipboard;
-	private Button copyButton;
-	private Button backButton;
-	private Button nextButton;
-	private Image imgNextEnabled;
-	private Image imgPrevEnabled;
-	private Image imgCopyEnabled;
-	private SashForm sashForm;
-	
-	// sorting
-	private Comparator comparator = null;
-	private Collator collator;
-	
-	// location configuration
-	private Point dialogLocation;
-	private Point dialogSize;
-	private int[] sashWeights;
-	
-	/**
-	 * 
-	 * @param parentShell shell in which dialog is displayed
-	 * @param selection entry initially selected and to be displayed
-	 * @param provider viewer
-	 * @param comparator comparator used to order all entries
-	 */
-	protected EventDetailsDialog(Shell parentShell, IAdaptable selection, ISelectionProvider provider, Comparator comparator) {
-		super(parentShell);
-		labelProvider = new LogViewLabelProvider();
-		this.provider = (TreeViewer) provider;
-		this.entry = (LogEntry)selection;
-		this.comparator = comparator;
-		setShellStyle(SWT.MODELESS | SWT.MIN | SWT.MAX | SWT.RESIZE | SWT.CLOSE | SWT.BORDER | SWT.TITLE);
-		clipboard = new Clipboard(parentShell.getDisplay());
-		initialize();
-		createImages();
-		collator = Collator.getInstance();
-		readConfiguration();
-		isLastChild = false;
-		isAtEndOfLog = false;
-	}
-
-	private void initialize() {
-		elementNum = getParentElementNum();
-		resetTotalElementCount();
-		parentEntry = (LogEntry) entry.getParent(entry);
-		if (isChild(entry)){
-			setEntryChildren(parentEntry);
-			resetChildIndex();
-		}
-		isLastChild = false;
-		isAtEndOfLog = false;
-	}
-	
-	private void resetChildIndex() {
-		for (int i = 0; i < entryChildren.length; i++) {
-			if (equal(entryChildren[i].getMessage(), entry.getMessage())
-					&& equal(entryChildren[i].getDate(), entry.getDate())
-					&& equal(entryChildren[i].getPluginId(), entry
-							.getPluginId())
-					&& entryChildren[i].getSeverity() == entry.getSeverity()
-					&& equal(entryChildren[i].getSeverityText(), entry
-							.getSeverityText())) {
-				childIndex = i;
-				break;
-			}
-		}
-	}
-	
-	private boolean equal(String str1, String str2) {
-		if (str1 == null) {
-			return str1 == str2;
-		}
-		return str1.equals(str2);
-	}
-	
-	private void createImages(){
-		imgCopyEnabled =
-			PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_COPY).createImage(
-				true);
-		//imgNextDisabled. = PDERuntimePluginImages.DESC_NEXT_EVENT_DISABLED.createImage(true);
-		//imgPrevDisabled = PDERuntimePluginImages.DESC_PREV_EVENT_DISABLED.createImage(true);
-		imgPrevEnabled = PDERuntimePluginImages.DESC_PREV_EVENT.createImage(true);
-		imgNextEnabled = PDERuntimePluginImages.DESC_NEXT_EVENT.createImage(true);
-	}
-
-	private boolean isChild(LogEntry entry) {
-		return entry.getParent(entry) != null;
-	}
-	
-	public boolean isOpen(){
-		return isOpen;
-	}
-
-	public int open(){
-		isOpen = true;
-		if (sashWeights == null){
-			int width = getSashForm().getClientArea().width;
-			if (width - 100 > 0)
-				width -= 100;
-			else
-				width = width/2;
-			sashWeights = new int[]{width, getSashForm().getClientArea().width-width};
-		}
-		getSashForm().setWeights(sashWeights);
-		return super.open();
-	}
-	
-	public boolean close() {
-		storeSettings();
-		isOpen = false;
-		imgCopyEnabled.dispose();
-		imgNextEnabled.dispose();
-		imgPrevEnabled.dispose();
-		return super.close();
-	}
-
-	public void create() {
-		super.create();
-		
-		// dialog location 
-		if (dialogLocation != null)
-			getShell().setLocation(dialogLocation);
-		
-		// dialog size
-		if (dialogSize != null)
-			getShell().setSize(dialogSize);
-		else
-			getShell().setSize(500,550);
-				
-		applyDialogFont(buttonBar);
-		getButton(IDialogConstants.OK_ID).setFocus();
-	}
-
-	protected void buttonPressed(int buttonId) {
-		if (IDialogConstants.OK_ID == buttonId)
-			okPressed();
-		else if (IDialogConstants.CANCEL_ID == buttonId)
-			cancelPressed();
-		else if (IDialogConstants.BACK_ID == buttonId)
-			backPressed();
-		else if (IDialogConstants.NEXT_ID == buttonId)
-			nextPressed();
-		else if (COPY_ID == buttonId)
-			copyPressed();
-	}
-
-	protected void backPressed() {
-		if (isChild(entry)) {
-			if (childIndex > 0) {
-				if (isLastChild){
-					setEntryChildren(parentEntry);
-					isLastChild = false;
-				}
-				childIndex--;
-				entry = entryChildren[childIndex];
-			} else
-				entry = parentEntry;
-		} else {
-			if (elementNum - 1 >= 0)
-				elementNum -= 1;
-			entry = entryChildren[elementNum];
-		}
-		setEntrySelectionInTable();
-	}
-
-	protected void nextPressed() {
-		if (isChild(entry) && childIndex < entryChildren.length-1) {
-			childIndex++;
-			entry = entryChildren[childIndex];
-			isLastChild = childIndex == entryChildren.length - 1;
-		} else if (isChild(entry) && isLastChild && !isAtEndOfLog){
-			findNextSelectedChild(entry);
-		} else if (elementNum + 1 < totalElementCount){
-			if (isLastChild){
-				setEntryChildren();
-				isLastChild = false;
-			}
-			elementNum += 1;
-			entry = entryChildren[elementNum];
-		} else { // at end of list but can branch into child elements - bug 58083
-			setEntryChildren(entry);
-			entry = entryChildren[0];
-			isAtEndOfLog = entryChildren.length == 0;
-			isLastChild = entryChildren.length == 0;
-		}
-		setEntrySelectionInTable();
-	}
-
-	protected void copyPressed() {
-		StringWriter writer = new StringWriter();
-		PrintWriter pwriter = new PrintWriter(writer);
-
-		entry.write(pwriter);
-		pwriter.flush();
-		String textVersion = writer.toString();
-		try {
-			pwriter.close();
-			writer.close();
-		} catch (IOException e) {
-		}
-		// set the clipboard contents
-		clipboard.setContents(new Object[] { textVersion }, new Transfer[] { TextTransfer.getInstance()});	
-	}
-
-	public void setComparator(Comparator comparator){
-		this.comparator = comparator;
-		updateProperties();
-	}
-	private void setComparator(byte sortType, final int sortOrder){
-		if (sortType == LogView.DATE){
-			comparator = new Comparator(){
-				public int compare(Object e1, Object e2) {
-					  try {
-	                    	SimpleDateFormat formatter = new SimpleDateFormat(
-	                    	"yyyy-MM-dd HH:mm:ss.SSS"); //$NON-NLS-1$
-	                        Date date1 = formatter.parse(((LogEntry) e1).getDate());
-	                        Date date2 = formatter.parse(((LogEntry) e2).getDate());
-	                        if (sortOrder == LogView.ASCENDING)
-	                            return date1.before(date2) ? -1 : 1;
-	                        return date1.after(date2) ? -1 : 1;
-	                    } catch (ParseException e) {
-	                    }
-	                    return 0;
-				}
-			};
-		} else if (sortType == LogView.PLUGIN){
-			comparator = new Comparator(){
-				public int compare(Object e1, Object e2) {
-					LogEntry entry1 = (LogEntry)e1;
-					LogEntry entry2 = (LogEntry)e2;
-					return collator.compare(entry1.getPluginId(), entry2.getPluginId()) * sortOrder;
-				}
-			};
-		} else {
-			comparator = new Comparator(){
-				public int compare(Object e1, Object e2) {
-					LogEntry entry1 = (LogEntry)e1;
-					LogEntry entry2 = (LogEntry)e2;
-					return collator.compare(entry1.getMessage(), entry2.getMessage()) * sortOrder;
-				}
-			};
-		}
-	}
-	
-	public void resetSelection(IAdaptable selectedEntry, byte sortType, int sortOrder){
-		setComparator(sortType, sortOrder);
-		resetSelection(selectedEntry);
-	}
-	
-	public void resetSelection(IAdaptable selectedEntry){
-		if (entry.equals(selectedEntry) &&
-				elementNum == getParentElementNum()){
-			updateProperties();
-			return;
-		}
-		entry = (LogEntry)selectedEntry;
-		initialize();
-		updateProperties();
-	}
-	
-	public void resetButtons(){
-		backButton.setEnabled(false);
-		nextButton.setEnabled(false);
-	}
-	
-	private void setEntrySelectionInTable(){
-		ISelection selection = new StructuredSelection(entry);
-		provider.setSelection(selection);
-	}
-	
-	public void updateProperties() {	
-		if (isChild(entry)){
-			parentEntry = (LogEntry) entry.getParent(entry);
-			setEntryChildren(parentEntry);
-			resetChildIndex();
-			if (childIndex == entryChildren.length - 1)
-				isLastChild = true;
-		}
-
-		resetTotalElementCount();
-		
-		dateLabel.setText(entry.getDate() != null ? entry.getDate() : ""); //$NON-NLS-1$
-		severityImageLabel.setImage(labelProvider.getColumnImage(entry, 0));
-		severityLabel.setText(entry.getSeverityText());
-		msgText.setText(entry.getMessage() != null ? entry.getMessage() : ""); //$NON-NLS-1$
-		String stack = entry.getStack();
-		if (stack != null) {
-			stackTraceText.setText(stack);
-		} else {
-			stackTraceText.setText(PDERuntimeMessages.EventDetailsDialog_noStack);
-		}
-		LogSession session = entry.getSession();
-		if (session != null && session.getSessionData() != null)
-			sessionDataText.setText(session.getSessionData());
-
-		updateButtons();
-	}
-	
-	private void updateButtons(){
-		boolean isAtEnd = elementNum == totalElementCount - 1;
-		if (isChild(entry)){
-			backButton.setEnabled(true);
-			nextButton.setEnabled(nextChildExists(entry, parentEntry, entryChildren) ||  !isLastChild || !isAtEnd || entry.hasChildren());
-		} else {
-			backButton.setEnabled(elementNum != 0);
-			nextButton.setEnabled(!isAtEnd || entry.hasChildren());
-		}
-	}
-	
-	private void findNextSelectedChild(LogEntry originalEntry){
-		if (isChild (parentEntry)){
-			// we're at the end of the child list; find next parent
-			// to select.  If the parent is a child at the end of the child
-			// list, find its next parent entry to select, etc.
-			
-			entry = parentEntry;
-			setEntryChildren((LogEntry)parentEntry.getParent(parentEntry));
-			parentEntry = (LogEntry)parentEntry.getParent(parentEntry);
-			resetChildIndex();
-			isLastChild = childIndex == entryChildren.length-1;
-			if (isLastChild){
-				findNextSelectedChild(originalEntry);
-			} else {
-				nextPressed();
-			}
-		} else {
-			entry = originalEntry;
-			isAtEndOfLog = true;
-			nextPressed();
-		}
-	}
-	
-	private boolean nextChildExists(LogEntry originalEntry, LogEntry originalParent, LogEntry[] originalEntries){
-		if (isChild (parentEntry)){
-			// we're at the end of the child list; find next parent
-			// to select.  If the parent is a child at the end of the child
-			// list, find its next parent entry to select, etc.
-			
-			entry = parentEntry;
-			setEntryChildren((LogEntry)parentEntry.getParent(parentEntry));
-			parentEntry = (LogEntry)parentEntry.getParent(parentEntry);
-			resetChildIndex();
-			if (childIndex == entryChildren.length-1){
-				nextChildExists(originalEntry, originalParent, originalEntries);
-			} else {
-				entry = originalEntry;
-				parentEntry = originalParent;
-				entryChildren = originalEntries;
-				resetChildIndex();
-				return true;
-			}
-		} 
-		entry = originalEntry;
-		parentEntry = originalParent;
-		entryChildren = originalEntries;
-		resetChildIndex();
-		return false;
-		
-	}
-	private void setEntryChildren(){
-		Object[] children = ((LogViewContentProvider)provider.getContentProvider()).getElements(null);
-
-		if (comparator != null)
-			Arrays.sort(children, comparator);
-		entryChildren = new LogEntry[children.length];
-		
-		System.arraycopy(children,0,entryChildren,0,children.length);
-	}
-	
-	private void resetTotalElementCount(){
-		totalElementCount = provider.getTree().getItemCount();
-	}
-	
-	private void setEntryChildren(LogEntry parent){
-		if (parent == null){
-			setEntryChildren();
-			return;
-		}
-		Object[] children = parent.getChildren(parent);
-		if (comparator != null)
-			Arrays.sort(children, comparator);
-		entryChildren = new LogEntry[children.length];
-		
-		System.arraycopy(children,0,entryChildren,0,children.length);
-	}
-
-	private int getParentElementNum(){
-		LogEntry itemEntry = (LogEntry)((IStructuredSelection)provider.getSelection()).getFirstElement();
-		itemEntry = getRootEntry(itemEntry);
-		
-		setEntryChildren();
-		for (int i = 0; i<provider.getTree().getItemCount(); i++){
-			try {
-				LogEntry littleEntry = entryChildren[i];
-				if (itemEntry.equals(littleEntry)){
-					return i;
-				}
-			} catch (Exception e){
-				
-			}
-		}
-		return 0;
-	}
-	
-	private LogEntry getRootEntry(LogEntry entry){
-		if (!isChild(entry))
-			return entry;
-		return getRootEntry((LogEntry)entry.getParent(entry));
-	}
-	
-	public SashForm getSashForm(){
-		return sashForm;
-	}
-	
-	protected Control createDialogArea(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		container.setLayout(layout);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		container.setLayoutData(gd);
-
-		createDetailsSection(container);
-		createSashForm(container);
-		createStackSection(getSashForm());
-		createSessionSection(getSashForm());
-
-		updateProperties();
-		Dialog.applyDialogFont(container);
-		return container;
-	}
-
-	private void createSashForm(Composite parent){
-		sashForm = new SashForm(parent, SWT.VERTICAL);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = layout.marginWidth = 0;
-		sashForm.setLayout(layout);
-		sashForm.setLayoutData(new GridData(GridData.FILL_BOTH));
-	}
-	
-	private void createToolbarButtonBar(Composite parent) {
-		Composite comp = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.marginWidth = layout.marginHeight = 0;
-		layout.numColumns = 1;
-		comp.setLayout(layout);
-		comp.setLayoutData(new GridData(GridData.FILL_VERTICAL));
-
-		Composite container = new Composite(comp, SWT.NONE);
-		layout = new GridLayout();
-		layout.marginWidth = 0;
-		layout.marginHeight = 10;
-		layout.numColumns = 1;
-		container.setLayout(layout);
-		container.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		backButton = createButton(container, IDialogConstants.BACK_ID, "", false); //$NON-NLS-1$
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 3;
-		gd.verticalSpan = 1;
-		backButton.setLayoutData(gd);
-		backButton.setToolTipText(PDERuntimeMessages.EventDetailsDialog_previous);
-		backButton.setImage(imgPrevEnabled);
-		
-		nextButton = createButton(container, IDialogConstants.NEXT_ID, "", false); //$NON-NLS-1$
-		gd = new GridData();
-		gd.horizontalSpan = 3;
-		gd.verticalSpan = 1;
-		nextButton.setLayoutData(gd);
-		nextButton.setToolTipText(PDERuntimeMessages.EventDetailsDialog_next);
-		nextButton.setImage(imgNextEnabled);
-		
-		copyButton = createButton(container, COPY_ID, "", false); //$NON-NLS-1$
-		gd = new GridData();
-		gd.horizontalSpan = 3;
-		gd.verticalSpan = 1;
-		copyButton.setLayoutData(gd);
-		copyButton.setImage(imgCopyEnabled);
-		copyButton.setToolTipText(PDERuntimeMessages.EventDetailsDialog_copy);
-	}
-
-	protected void createButtonsForButtonBar(Composite parent) {
-		// create OK button only by default
-		createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-	}
-
-	private void createDetailsSection(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		container.setLayout(layout);
-		container.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		createTextSection(container);
-		createToolbarButtonBar(container);
-	}
-
-	private void createTextSection(Composite parent) {
-		Composite textContainer = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		layout.marginHeight = layout.marginWidth = 0;
-		textContainer.setLayout(layout);
-		textContainer.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		Label label = new Label(textContainer, SWT.NONE);
-		label.setText(PDERuntimeMessages.EventDetailsDialog_date); 
-		dateLabel = new Label(textContainer, SWT.NULL);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		dateLabel.setLayoutData(gd);
-
-		label = new Label(textContainer, SWT.NONE);
-		label.setText(PDERuntimeMessages.EventDetailsDialog_severity); 
-		severityImageLabel = new Label(textContainer, SWT.NULL);
-		severityLabel = new Label(textContainer, SWT.NULL);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		severityLabel.setLayoutData(gd);
-
-		label = new Label(textContainer, SWT.NONE);
-		label.setText(PDERuntimeMessages.EventDetailsDialog_message); 
-		gd = new GridData(GridData.VERTICAL_ALIGN_BEGINNING);
-		label.setLayoutData(gd);
-		msgText = new Text(textContainer, SWT.MULTI | SWT.V_SCROLL | SWT.WRAP | SWT.BORDER);
-		msgText.setEditable(false);
-		gd = new GridData(GridData.FILL_BOTH | GridData.VERTICAL_ALIGN_BEGINNING | GridData.GRAB_VERTICAL);
-		gd.horizontalSpan = 2;
-		gd.heightHint = 44;
-		gd.grabExcessVerticalSpace = true;
-		msgText.setLayoutData(gd);
-	}
-
-	private void createStackSection(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 6;
-		container.setLayout(layout);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.heightHint = 100;
-		container.setLayoutData(gd);
-
-		Label label = new Label(container, SWT.NULL);
-		label.setText(PDERuntimeMessages.EventDetailsDialog_exception); 
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 3;
-		label.setLayoutData(gd);
-
-		stackTraceText = new Text(container, SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL | SWT.BORDER);
-		gd = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL);
-		gd.grabExcessHorizontalSpace = true;
-		stackTraceText.setLayoutData(gd);
-		stackTraceText.setEditable(false);
-	}
-
-	private void createSessionSection(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 6;
-		container.setLayout(layout);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.heightHint = 100;
-		container.setLayoutData(gd);
-
-		Label line = new Label(container, SWT.SEPARATOR | SWT.HORIZONTAL);
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gd.widthHint = 1;
-		line.setLayoutData(gd);
-		
-		Label label = new Label(container, SWT.NONE);
-		label.setText(PDERuntimeMessages.EventDetailsDialog_session); 
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		label.setLayoutData(gd);
-		sessionDataText = new Text(container, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL );
-		gd = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL);
-		gd.grabExcessHorizontalSpace = true;
-		sessionDataText.setLayoutData(gd);
-		sessionDataText.setEditable(false);
-	}
-	
-	//--------------- configuration handling --------------
-	
-	/**
-	 * Stores the current state in the dialog settings.
-	 * @since 2.0
-	 */
-	private void storeSettings() {
-		writeConfiguration();
-	}
-	/**
-	 * Returns the dialog settings object used to share state
-	 * between several event detail dialogs.
-	 * 
-	 * @return the dialog settings to be used
-	 */
-	private IDialogSettings getDialogSettings() {
-		IDialogSettings settings= PDERuntimePlugin.getDefault().getDialogSettings();
-		IDialogSettings dialogSettings = settings.getSection(getClass().getName());
-		if (dialogSettings == null)
-			dialogSettings = settings.addNewSection(getClass().getName());
-		return dialogSettings;
-	}
-
-	/**
-	 * Initializes itself from the dialog settings with the same state
-	 * as at the previous invocation.
-	 */
-	private void readConfiguration() {
-		IDialogSettings s= getDialogSettings();
-		try {
-			int x= s.getInt("x"); //$NON-NLS-1$
-			int y= s.getInt("y"); //$NON-NLS-1$
-			dialogLocation= new Point(x, y);
-			
-			x = s.getInt("width"); //$NON-NLS-1$
-			y = s.getInt("height"); //$NON-NLS-1$
-			dialogSize = new Point(x,y);
-			
-			sashWeights = new int[2];
-			sashWeights[0] = s.getInt("sashWidth1"); //$NON-NLS-1$
-			sashWeights[1] = s.getInt("sashWidth2"); //$NON-NLS-1$
-			
-		} catch (NumberFormatException e) {
-			dialogLocation= null;
-			dialogSize = null;
-			sashWeights = null;
-		}
-	}
-	
-	private void writeConfiguration(){
-		IDialogSettings s = getDialogSettings();
-		Point location = getShell().getLocation();
-		s.put("x", location.x); //$NON-NLS-1$
-		s.put("y", location.y); //$NON-NLS-1$
-		
-		Point size = getShell().getSize();
-		s.put("width", size.x); //$NON-NLS-1$
-		s.put("height", size.y); //$NON-NLS-1$
-		
-		sashWeights = getSashForm().getWeights();
-		s.put("sashWidth1", sashWeights[0]); //$NON-NLS-1$
-		s.put("sashWidth2", sashWeights[1]); //$NON-NLS-1$
-	}
-}

diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/EventDetailsDialogAction.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/EventDetailsDialogAction.java
deleted file mode 100644
index f15d29e..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/EventDetailsDialogAction.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.runtime.logview;
-
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.util.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.internal.runtime.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.actions.*;
-
-
-public class EventDetailsDialogAction extends SelectionProviderAction{
-
-	/**
-	 * The shell in which to open the property dialog
-	 */
-	private Shell shell;
-	private ISelectionProvider provider;
-	private EventDetailsDialog propertyDialog;
-	private Comparator comparator;
-	/**
-	 * Creates a new action for opening a property dialog
-	 * on the elements from the given selection provider
-	 * @param shell - the shell in which the dialog will open
-	 * @param provider - the selection provider whose elements
-	 * the property dialog will describe
-	 */
-	public EventDetailsDialogAction(Shell shell, ISelectionProvider provider){
-		super(provider, PDERuntimeMessages.EventDetailsDialog_title); 
-		Assert.isNotNull(shell);
-		this.shell = shell;
-		this.provider = provider;
-		// setToolTipText
-		//WorkbenchHelp.setHelp
-	}
-	
-	public boolean resetSelection(byte sortType, int sortOrder){
-		IAdaptable element = (IAdaptable) getStructuredSelection().getFirstElement();
-		if (element == null)
-			return false;
-		if (propertyDialog != null && propertyDialog.isOpen()){
-			propertyDialog.resetSelection(element, sortType, sortOrder);
-			return true;
-		}
-		return false;
-	}
-	public void resetSelection(){
-		IAdaptable element = (IAdaptable) getStructuredSelection().getFirstElement();
-		if (element == null)
-			return;
-		if (propertyDialog != null && propertyDialog.isOpen())
-			propertyDialog.resetSelection(element);
-	}
-	
-	public void resetDialogButtons(){
-		if (propertyDialog != null && propertyDialog.isOpen())
-			propertyDialog.resetButtons();
-	}
-	
-	public void setComparator(Comparator comparator){
-		this.comparator = comparator;
-		if (propertyDialog != null && propertyDialog.isOpen())
-			propertyDialog.setComparator(comparator);
-	}
-	
-	public void run(){
-		if (propertyDialog != null && propertyDialog.isOpen()){
-			resetSelection();
-			return;
-		}
-		
-		//get initial selection
-		IAdaptable element = (IAdaptable) getStructuredSelection().getFirstElement();
-		if (element == null)
-			return;
-		
-		propertyDialog = new EventDetailsDialog(shell, element, provider, comparator);
-		propertyDialog.create();
-		propertyDialog.getShell().setText(PDERuntimeMessages.EventDetailsDialog_title); 
-		propertyDialog.open();
-	}
-}

diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/FilterDialog.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/FilterDialog.java
deleted file mode 100644
index b3efec8..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/FilterDialog.java
+++ /dev/null

@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.runtime.logview;
-
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.pde.internal.runtime.PDERuntimeMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.IMemento;
-
-
-public class FilterDialog extends Dialog {
-	private Button limit;
-	private Text limitText;
-
-	private Button okButton;
-	private Button errorButton;
-	private Button warningButton;
-	private Button infoButton;
-	private Button showAllButton;
-	private IMemento memento;
-
-	public FilterDialog(Shell parentShell, IMemento memento) {
-		super(parentShell);
-		this.memento = memento;
-	}
-	
-	protected Control createDialogArea(Composite parent) {
-		Composite container = (Composite)super.createDialogArea(parent);		
-		createEventTypesGroup(container);
-		createLimitSection(container);
-		createSessionSection(container);
-		
-		Dialog.applyDialogFont(container);
-		return container;
-	}
-	
-	private void createEventTypesGroup(Composite parent) {
-		Group group = new Group(parent, SWT.NONE);
-		group.setLayout(new GridLayout());
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.widthHint = 275;
-		group.setLayoutData(gd);
-		group.setText(PDERuntimeMessages.LogView_FilterDialog_eventTypes); 
-		
-		infoButton = new Button(group, SWT.CHECK);
-		infoButton.setText(PDERuntimeMessages.LogView_FilterDialog_information); 
-		infoButton.setSelection(memento.getString(LogView.P_LOG_INFO).equals("true")); //$NON-NLS-1$
-		
-		warningButton = new Button(group, SWT.CHECK);
-		warningButton.setText(PDERuntimeMessages.LogView_FilterDialog_warning); 
-		warningButton.setSelection(memento.getString(LogView.P_LOG_WARNING).equals("true")); //$NON-NLS-1$
-		
-		errorButton = new Button(group, SWT.CHECK);
-		errorButton.setText(PDERuntimeMessages.LogView_FilterDialog_error); 
-		errorButton.setSelection(memento.getString(LogView.P_LOG_ERROR).equals("true"));		 //$NON-NLS-1$
-	}
-	
-	private void createLimitSection(Composite parent) {
-		Composite comp = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		comp.setLayout(layout);
-		comp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		limit = new Button(comp, SWT.CHECK);
-		limit.setText(PDERuntimeMessages.LogView_FilterDialog_limitTo); 
-		limit.setSelection(memento.getString(LogView.P_USE_LIMIT).equals("true")); //$NON-NLS-1$
-		limit.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			limitText.setEnabled(((Button)e.getSource()).getSelection());
-		}});
-		
-		limitText = new Text(comp, SWT.BORDER);
-		limitText.addModifyListener(new ModifyListener(){
-			public void modifyText(ModifyEvent e) {
-				try {
-					if (okButton == null)
-						return;
-					Integer.parseInt(limitText.getText());
-					okButton.setEnabled(true);
-				} catch (NumberFormatException e1) {
-					okButton.setEnabled(false);
-				}
-			}});
-		limitText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		limitText.setText(memento.getString(LogView.P_LOG_LIMIT));
-		limitText.setEnabled(limit.getSelection());
-
-	}
-	
-	private void createSessionSection(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		container.setLayout(new GridLayout());
-		container.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		Label label = new Label(container, SWT.NONE);
-		label.setText(PDERuntimeMessages.LogView_FilterDialog_eventsLogged); 
-		
-		showAllButton = new Button(container, SWT.RADIO);
-		showAllButton.setText(PDERuntimeMessages.LogView_FilterDialog_allSessions); 
-		GridData gd = new GridData();
-		gd.horizontalIndent = 20;
-		showAllButton.setLayoutData(gd);
-		
-		Button button = new Button(container, SWT.RADIO);
-		button.setText(PDERuntimeMessages.LogView_FilterDialog_recentSession); 
-		gd = new GridData();
-		gd.horizontalIndent = 20;
-		button.setLayoutData(gd);
-		
-		if (memento.getString(LogView.P_SHOW_ALL_SESSIONS).equals("true")) { //$NON-NLS-1$
-			showAllButton.setSelection(true);
-		} else {
-			button.setSelection(true);
-		}
-	}
-	
-	protected void createButtonsForButtonBar(Composite parent) {
-		okButton = createButton(
-				parent,
-				IDialogConstants.OK_ID,
-				IDialogConstants.OK_LABEL,
-				true);
-		createButton(
-			parent,
-			IDialogConstants.CANCEL_ID,
-			IDialogConstants.CANCEL_LABEL,
-			false);
-	}
-	
-	protected void okPressed() {
-		memento.putString(LogView.P_LOG_INFO, infoButton.getSelection() ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$
-		memento.putString(LogView.P_LOG_WARNING, warningButton.getSelection() ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$
-		memento.putString(LogView.P_LOG_ERROR, errorButton.getSelection() ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$
-		memento.putString(LogView.P_LOG_LIMIT, limitText.getText());
-		memento.putString(LogView.P_USE_LIMIT, limit.getSelection() ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$
-		memento.putString(LogView.P_SHOW_ALL_SESSIONS, showAllButton.getSelection() ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$
-		super.okPressed();
-	}
-
-}

diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/LogEntry.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/LogEntry.java
deleted file mode 100644
index 592013d..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/LogEntry.java
+++ /dev/null

@@ -1,281 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.runtime.logview;
-
-import java.io.*;
-import java.text.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.pde.internal.runtime.PDERuntimeMessages;
-import org.eclipse.ui.model.IWorkbenchAdapter;
-
-public class LogEntry extends PlatformObject implements IWorkbenchAdapter {
-	private ArrayList children;
-	private LogEntry parent;
-	private String pluginId;
-	private int severity;
-	private int code;
-	private String date;
-	private String message;
-	private String stack;
-	private LogSession session;
-
-	public LogEntry() {
-	}
-
-	public LogSession getSession() {
-		return session;
-	}
-
-	void setSession(LogSession session) {
-		this.session = session;
-	}
-
-	public LogEntry(IStatus status) {
-		processStatus(status);
-	}
-	public int getSeverity() {
-		return severity;
-	}
-
-	public boolean isOK() {
-		return severity == IStatus.OK;
-	}
-	public int getCode() {
-		return code;
-	}
-	public String getPluginId() {
-		return pluginId;
-	}
-	public String getMessage() {
-		return message;
-	}
-	public String getStack() {
-		return stack;
-	}
-	public String getDate() {
-		return date;
-	}
-	public String getSeverityText() {
-		return getSeverityText(severity);
-	}
-	public boolean hasChildren() {
-		return children != null && children.size() > 0;
-	}
-	public String toString() {
-		return getSeverityText();
-	}
-	/**
-	 * @see IWorkbenchAdapter#getChildren(Object)
-	 */
-	public Object[] getChildren(Object parent) {
-		if (children == null)
-			return new Object[0];
-		return children.toArray();
-	}
-
-	/**
-	 * @see IWorkbenchAdapter#getImageDescriptor(Object)
-	 */
-	public ImageDescriptor getImageDescriptor(Object arg0) {
-		return null;
-	}
-
-	/**
-	 * @see IWorkbenchAdapter#getLabel(Object)
-	 */
-	public String getLabel(Object obj) {
-		return getSeverityText();
-	}
-
-	/**
-	 * @see IWorkbenchAdapter#getParent(Object)
-	 */
-	public Object getParent(Object obj) {
-		return parent;
-	}
-
-	void setParent(LogEntry parent) {
-		this.parent = parent;
-	}
-
-	private String getSeverityText(int severity) {
-		switch (severity) {
-			case IStatus.ERROR :
-				return PDERuntimeMessages.LogView_severity_error;
-			case IStatus.WARNING :
-				return PDERuntimeMessages.LogView_severity_warning;
-			case IStatus.INFO :
-				return PDERuntimeMessages.LogView_severity_info;
-			case IStatus.OK :
-				return PDERuntimeMessages.LogView_severity_ok;
-		}
-		return "?"; //$NON-NLS-1$
-	}
-
-
-	void processEntry(String line) {
-		//!ENTRY <pluginID> <severity> <code> <date>
-		//!ENTRY <pluginID> <date> if logged by the framework!!!
-		StringTokenizer stok = new StringTokenizer(line, " "); //$NON-NLS-1$
-		int tokenCount = stok.countTokens();		
-		boolean byFrameWork = stok.countTokens() < 5;
-		
-		if (byFrameWork) {
-			severity = 4;
-			code = 0;
-		}
-		StringBuffer dateBuffer = new StringBuffer();
-		for (int i = 0; i < tokenCount; i++) {
-			String token = stok.nextToken();
-			switch (i) {
-				case 0:
-					break;
-				case 1:
-					pluginId = token;
-					break;
-				case 2:
-					if (byFrameWork) {
-						if (dateBuffer.length() > 0)
-							dateBuffer.append(" "); //$NON-NLS-1$
-						dateBuffer.append(token);
-					} else {
-						severity = parseInteger(token);
-					}
-					break;
-				case 3:
-					if (byFrameWork) {
-						if (dateBuffer.length() > 0)
-							dateBuffer.append(" "); //$NON-NLS-1$
-						dateBuffer.append(token);
-					} else
-						code = parseInteger(token);
-					break;
-				default:
-					if (dateBuffer.length() > 0)
-						dateBuffer.append(" "); //$NON-NLS-1$
-					dateBuffer.append(token);
-			}
-		}
-		date = dateBuffer.toString();
-	}
-	
-	int processSubEntry(String line) {
-		//!SUBENTRY <depth> <pluginID> <severity> <code> <date>
-		//!SUBENTRY  <depth> <pluginID> <date>if logged by the framework!!!
-		StringTokenizer stok = new StringTokenizer(line, " "); //$NON-NLS-1$
-		int tokenCount = stok.countTokens();		
-		boolean byFrameWork = stok.countTokens() < 5;
-		
-		StringBuffer dateBuffer = new StringBuffer();
-		int depth = 0;
-		for (int i = 0; i < tokenCount; i++) {
-			String token = stok.nextToken();
-			switch (i) {
-				case 0:
-					break;
-				case 1:
-					depth = parseInteger(token);
-					break;
-				case 2:
-					pluginId = token;
-					break;
-				case 3:
-					if (byFrameWork) {
-						if (dateBuffer.length() > 0)
-							dateBuffer.append(" "); //$NON-NLS-1$
-						dateBuffer.append(token);
-					} else {
-						severity = parseInteger(token);
-					}
-					break;
-				case 4:
-					if (byFrameWork) {
-						if (dateBuffer.length() > 0)
-							dateBuffer.append(" "); //$NON-NLS-1$
-						dateBuffer.append(token);
-					} else
-						code = parseInteger(token);
-					break;
-				default:
-					if (dateBuffer.length() > 0)
-						dateBuffer.append(" "); //$NON-NLS-1$
-					dateBuffer.append(token);
-			}
-		}
-		date = dateBuffer.toString();
-		return depth;	
-	}
-	
-	private int parseInteger(String token) {
-		try {
-			return Integer.parseInt(token);
-		} catch (NumberFormatException e) {
-			return 0;
-		}
-	}
-
-	void setStack(String stack) {
-		this.stack = stack;
-	}
-	void setMessage(String message) {
-		this.message = message;
-	}
-
-	private void processStatus(IStatus status) {
-		pluginId = status.getPlugin();
-		severity = status.getSeverity();
-		code = status.getCode();
-		DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SS"); //$NON-NLS-1$
-		date = formatter.format(new Date());
-		message = status.getMessage();
-		Throwable throwable = status.getException();
-		if (throwable != null) {
-			StringWriter swriter = new StringWriter();
-			PrintWriter pwriter = new PrintWriter(swriter);
-			throwable.printStackTrace(pwriter);
-			pwriter.flush();
-			pwriter.close();
-			stack = swriter.toString();
-		}
-		IStatus[] schildren = status.getChildren();
-		if (schildren.length > 0) {
-			children = new ArrayList();
-			for (int i = 0; i < schildren.length; i++) {
-				LogEntry child = new LogEntry(schildren[i]);
-				addChild(child);
-			}
-		}
-	}
-	void addChild(LogEntry child) {
-		if (children == null)
-			children = new ArrayList();
-		children.add(child);
-		child.setParent(this);
-	}
-	public void write(PrintWriter writer) {
-		writer.print(getSeverityText());
-		if (date != null) {
-			writer.print(" "); //$NON-NLS-1$
-			writer.print(getDate());
-		}
-		if (message != null) {
-			writer.print(" "); //$NON-NLS-1$
-			writer.print(getMessage());
-		}
-		writer.println();
-		if (stack != null)
-			writer.println(stack);
-	}
-}

diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/LogReader.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/LogReader.java
deleted file mode 100644
index 8a6f37d..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/LogReader.java
+++ /dev/null

@@ -1,200 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.runtime.logview;
-
-import java.io.*;
-import java.util.*;
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.ui.IMemento;
-
-class LogReader {
-	private static final int SESSION_STATE = 10;
-	public static final long MAX_FILE_LENGTH = 1024*1024;
-	private static final int ENTRY_STATE = 20;
-	private static final int SUBENTRY_STATE = 30;
-	private static final int MESSAGE_STATE = 40;
-	private static final int STACK_STATE = 50;
-	private static final int TEXT_STATE = 60;
-	private static final int UNKNOWN_STATE = 70;
-	
-	private static LogSession currentSession;
-		
-	public static void parseLogFile(File file, ArrayList entries, IMemento memento) {
-		ArrayList parents = new ArrayList();
-		LogEntry current = null;
-		LogSession session = null;
-		int writerState = UNKNOWN_STATE;
-		StringWriter swriter = null;
-		PrintWriter writer = null;
-		int state = UNKNOWN_STATE;
-		currentSession = null;
-		BufferedReader reader = null;
-		try {
-					
-			reader = new BufferedReader(new InputStreamReader(
-					new TailInputStream(file, MAX_FILE_LENGTH), "UTF-8")); //$NON-NLS-1$
-			for (;;) {
-				String line = reader.readLine();
-				if (line == null)
-					break;
-				line = line.trim();
-				if (line.length() == 0)
-					continue;
-
-				if (line.startsWith("!SESSION")) { //$NON-NLS-1$
-					state = SESSION_STATE;
-				} else if (line.startsWith("!ENTRY")) { //$NON-NLS-1$
-					state = ENTRY_STATE;
-				} else if (line.startsWith("!SUBENTRY")) { //$NON-NLS-1$
-					state = SUBENTRY_STATE;
-				} else if (line.startsWith("!MESSAGE")) { //$NON-NLS-1$
-					state = MESSAGE_STATE;
-				} else if (line.startsWith("!STACK")) { //$NON-NLS-1$
-					state = STACK_STATE;
-				} else
-					state = TEXT_STATE;
-			
-				if (state == TEXT_STATE) {
-					if (writer != null)
-						writer.println(line);
-					continue;
-				}
-			
-				if (writer != null) {
-					if (writerState == STACK_STATE && current != null) {
-						current.setStack(swriter.toString());
-					} else if (writerState == SESSION_STATE && session != null) {
-						session.setSessionData(swriter.toString());
-					} else if (writerState == MESSAGE_STATE && current != null){
-						String message = current.getMessage() + swriter.toString();
-						message = message.trim();
-						current.setMessage(message);
-					}
-					writerState = UNKNOWN_STATE;
-					swriter = null;
-					writer.close();
-					writer = null;
-				}
-			
-				if (state == STACK_STATE) {
-					swriter = new StringWriter();
-					writer = new PrintWriter(swriter, true);
-					writerState = STACK_STATE;
-				} else if (state == SESSION_STATE) {
-					session = new LogSession();
-					session.processLogLine(line);
-					swriter = new StringWriter();
-					writer = new PrintWriter(swriter, true);
-					writerState = SESSION_STATE;
-					updateCurrentSession(session);
-					if (!currentSession.equals(session) && !memento.getString(LogView.P_SHOW_ALL_SESSIONS).equals("true")) //$NON-NLS-1$
-						entries.clear();
-				} else if (state == ENTRY_STATE) {
-					LogEntry entry = new LogEntry();
-					entry.setSession(session);
-					entry.processEntry(line);
-					setNewParent(parents, entry, 0);
-					current = entry;
-					addEntry(current, entries, memento, false);
-				} else if (state == SUBENTRY_STATE) {
-					if (parents.size() > 0) {
-						LogEntry entry = new LogEntry();
-						entry.setSession(session);
-						int depth = entry.processSubEntry(line);
-						setNewParent(parents, entry, depth);
-						current = entry;
-						LogEntry parent = (LogEntry) parents.get(depth - 1);
-						parent.addChild(entry);
-					}
-				} else if (state == MESSAGE_STATE) {
-					swriter = new StringWriter();
-					writer = new PrintWriter(swriter, true);
-					String message = ""; //$NON-NLS-1$
-					if (line.length() > 8)
-						message = line.substring(9).trim();
-					message = message.trim();
-					if (current != null)
-						current.setMessage(message);
-					writerState = MESSAGE_STATE;
-				}
-			} 
-			
-			if (swriter != null && current != null && writerState == STACK_STATE)
-				current.setStack(swriter.toString());
-		} catch (FileNotFoundException e) {
-		} catch (IOException e) {
-		} finally {
-			try {
-				if (reader != null)
-					reader.close();
-			} catch (IOException e1) {
-			}
-			if (writer != null)
-				writer.close();
-		}
-	}
-		
-	private static void updateCurrentSession(LogSession session) {
-		if (currentSession == null) {
-			currentSession = session;
-			return;
-		}		
-		Date currentDate = currentSession.getDate();
-		Date sessionDate = session.getDate();		
-		if (currentDate == null && sessionDate != null)
-			currentSession = session;
-		else if (currentDate != null && sessionDate == null)
-			currentSession = session;
-		else if (currentDate != null && sessionDate != null && sessionDate.after(currentDate))
-			currentSession = session;	
-	}
-	
-	public static void addEntry(LogEntry current, ArrayList entries, IMemento memento, boolean useCurrentSession) {
-		int severity = current.getSeverity();
-		boolean doAdd = true;
-		switch(severity) {
-			case IStatus.INFO:
-				doAdd = memento.getString(LogView.P_LOG_INFO).equals("true"); //$NON-NLS-1$
-				break;
-			case IStatus.WARNING:
-				doAdd = memento.getString(LogView.P_LOG_WARNING).equals("true"); //$NON-NLS-1$
-				break;
-			case IStatus.ERROR:
-				doAdd = memento.getString(LogView.P_LOG_ERROR).equals("true"); //$NON-NLS-1$
-				break;
-		}
-		if (doAdd) {
-			if (useCurrentSession)
-				current.setSession(currentSession);
-			entries.add(0, current);
-			
-			if (memento.getString(LogView.P_USE_LIMIT).equals("true") //$NON-NLS-1$
-				&& entries.size() > memento.getInteger(LogView.P_LOG_LIMIT).intValue())
-				entries.remove(entries.size() - 1);
-		}
-	}
-
-	private static void setNewParent(
-		ArrayList parents,
-		LogEntry entry,
-		int depth) {
-		if (depth + 1 > parents.size())
-			parents.add(entry);
-		else
-			parents.set(depth, entry);
-	}
-	
-	public static void reset() {
-		currentSession = null;
-	}
-}

diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/LogSession.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/LogSession.java
deleted file mode 100644
index 90de280..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/LogSession.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.runtime.logview;
-
-import java.text.*;
-import java.util.*;
-
-public class LogSession {
-	private String sessionData;
-	private Date date;
-
-	/**
-	 * Constructor for LogSession.
-	 */
-	public LogSession() {
-	}
-
-	public Date getDate() {
-		return date;
-	}
-	
-	public void setDate(String dateString) {
-		SimpleDateFormat formatter = new SimpleDateFormat("MMM dd, yyyy HH:mm:ss.SS"); //$NON-NLS-1$
-		try {
-			date = formatter.parse(dateString);
-		} catch (ParseException e) {
-		}
-	}
-	
-	public String getSessionData() {
-		return sessionData;
-	}
-
-	void setSessionData(String data) {
-		this.sessionData = data;
-	}
-	
-	public void processLogLine(String line) {
-		StringTokenizer tokenizer = new StringTokenizer(line);
-		if (tokenizer.countTokens() == 6) {
-			tokenizer.nextToken();
-			StringBuffer dateBuffer = new StringBuffer();
-			for (int i = 0; i < 4; i++) {
-				dateBuffer.append(tokenizer.nextToken());
-				dateBuffer.append(" "); //$NON-NLS-1$
-			}
-			setDate(dateBuffer.toString().trim());
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/LogView.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/LogView.java
deleted file mode 100644
index 03c57bb..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/LogView.java
+++ /dev/null

@@ -1,1030 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2005 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-

-package org.eclipse.pde.internal.runtime.logview;

-

-import java.io.*;

-import java.lang.reflect.*;

-import java.text.*;

-import java.util.*;

-

-import org.eclipse.core.runtime.ILogListener;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Path;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.core.runtime.Preferences;

-import org.eclipse.jface.action.*;

-import org.eclipse.jface.dialogs.*;

-import org.eclipse.jface.operation.*;

-import org.eclipse.jface.viewers.*;

-import org.eclipse.osgi.util.NLS;

-import org.eclipse.pde.internal.runtime.*;

-import org.eclipse.swt.*;

-import org.eclipse.swt.custom.*;

-import org.eclipse.swt.dnd.*;

-import org.eclipse.swt.events.*;

-import org.eclipse.swt.graphics.*;

-import org.eclipse.swt.layout.*;

-import org.eclipse.swt.program.*;

-import org.eclipse.swt.widgets.*;

-import org.eclipse.ui.*;

-import org.eclipse.ui.actions.*;

-import org.eclipse.ui.part.*;

-

-public class LogView extends ViewPart implements ILogListener {

-    public static final String P_LOG_WARNING = "warning"; //$NON-NLS-1$

-    public static final String P_LOG_ERROR = "error"; //$NON-NLS-1$

-    public static final String P_LOG_INFO = "info"; //$NON-NLS-1$

-    public static final String P_LOG_LIMIT = "limit"; //$NON-NLS-1$

-    public static final String P_USE_LIMIT = "useLimit"; //$NON-NLS-1$

-    public static final String P_SHOW_ALL_SESSIONS = "allSessions"; //$NON-NLS-1$

-    private static final String P_COLUMN_1 = "column2"; //$NON-NLS-1$

-    private static final String P_COLUMN_2 = "column3"; //$NON-NLS-1$

-    private static final String P_COLUMN_3 = "column4"; //$NON-NLS-1$

-    public static final String P_ACTIVATE = "activate"; //$NON-NLS-1$

-    public static final String P_ORDER_TYPE = "orderType"; //$NON-NLS-1$

-    public static final String P_ORDER_VALUE = "orderValue"; //$NON-NLS-1$

-    

-    private int MESSAGE_ORDER;

-    private int PLUGIN_ORDER;

-    private int DATE_ORDER;

-    

-    public final static byte MESSAGE = 0x0;

-    public final static byte PLUGIN = 0x1;

-    public final static byte DATE = 0x2;

-    public static int ASCENDING = 1;

-    public static int DESCENDING = -1;

-    

-    private ArrayList fLogs;

-

-    private Clipboard fClipboard;

-    

-    private IMemento fMemento;

-    private File fInputFile;

-    private String fDirectory;

-

-    private Comparator comparator;

-    private Collator collator;

-    

-    // hover text

-    private boolean canOpenTextShell;

-    private Text textLabel;

-    private Shell textShell;

-

-    private boolean fFirstEvent = true;

-    

-	private TreeColumn fColumn1;

-	private TreeColumn fColumn2;

-	private TreeColumn fColumn3;

-	

-	private Tree fTree;

-	private TreeViewer fTreeViewer;

-	

-	private Action fPropertiesAction;

-	private Action fDeleteLogAction;

-	private Action fReadLogAction;

-	private Action fCopyAction;

-	private Action fActivateViewAction;

-	private Action fOpenLogAction;

-	private Action fExportAction;

-

-    public LogView() {

-        fLogs = new ArrayList();

-        fInputFile = Platform.getLogFileLocation().toFile();

-    }

-

-    public void createPartControl(Composite parent) {

-        readLogFile();

-        createViewer(parent);

-        createActions();

-        fClipboard = new Clipboard(fTree.getDisplay());

-        fTree.setToolTipText(""); //$NON-NLS-1$

-        getSite().setSelectionProvider(fTreeViewer);

-        initializeViewerSorter();

-        

-        Platform.addLogListener(this);

-		PlatformUI.getWorkbench().getHelpSystem().setHelp(fTree, IHelpContextIds.LOG_VIEW);

-    }

-

-     private void createActions() {

-        IActionBars bars = getViewSite().getActionBars();

-        

-        fCopyAction = createCopyAction();

-        bars.setGlobalActionHandler(ActionFactory.COPY.getId(), fCopyAction);

-        

-        IToolBarManager toolBarManager = bars.getToolBarManager();

-        

-        fExportAction = createExportAction();

-		toolBarManager.add(fExportAction);

-        

-        final Action importLogAction = createImportLogAction();

-        toolBarManager.add(importLogAction);

-        

-        toolBarManager.add(new Separator());

-        

-        final Action clearAction = createClearAction();

-        toolBarManager.add(clearAction);

-        

-        fDeleteLogAction = createDeleteLogAction();

-        toolBarManager.add(fDeleteLogAction);

-        

-        fOpenLogAction = createOpenLogAction();

-        toolBarManager.add(fOpenLogAction);

-        

-        fReadLogAction = createReadLogAction();

-        toolBarManager.add(fReadLogAction);

-        

-        toolBarManager.add(new Separator());

-        

-        IMenuManager mgr = bars.getMenuManager();

-        mgr.add(createFilterAction());

-        mgr.add(new Separator());

-        

-        fActivateViewAction = createActivateViewAction();

-        mgr.add(fActivateViewAction);

-        

-        createPropertiesAction();

-        

-        MenuManager popupMenuManager = new MenuManager("#PopupMenu"); //$NON-NLS-1$

-        IMenuListener listener = new IMenuListener() {

-            public void menuAboutToShow(IMenuManager manager) {

-                manager.add(fCopyAction);

-                manager.add(new Separator());

-                manager.add(clearAction);

-                manager.add(fDeleteLogAction);

-                manager.add(fOpenLogAction);

-                manager.add(fReadLogAction);

-                manager.add(new Separator());

-                manager.add(fExportAction);

-                manager.add(importLogAction);

-                manager.add(new Separator());

-                ((EventDetailsDialogAction) fPropertiesAction).setComparator(comparator);

-                manager.add(fPropertiesAction);

-		manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));

-            }

-        };

-        popupMenuManager.addMenuListener(listener);

-        popupMenuManager.setRemoveAllWhenShown(true);

-        getSite().registerContextMenu(popupMenuManager, getSite().getSelectionProvider());

-        Menu menu = popupMenuManager.createContextMenu(fTree);

-        fTree.setMenu(menu);

-    }

-     

-     private Action createActivateViewAction() {

-        Action action = new Action(PDERuntimeMessages.LogView_activate) { //       	

-            public void run() {

-            	fMemento.putString(P_ACTIVATE, isChecked() ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$

-            }

-        };

-        action.setChecked(fMemento.getString(P_ACTIVATE).equals("true")); //$NON-NLS-1$

-        return action;

-     }

-     

-     private Action createClearAction() {

-        Action action = new Action(PDERuntimeMessages.LogView_clear) { 

-            public void run() {

-                handleClear();

-            }

-        };

-        action.setImageDescriptor(PDERuntimePluginImages.DESC_CLEAR);

-        action.setDisabledImageDescriptor(PDERuntimePluginImages.DESC_CLEAR_DISABLED);

-        action.setToolTipText(PDERuntimeMessages.LogView_clear_tooltip); 

-        action.setText(PDERuntimeMessages.LogView_clear); 

-    	return action;

-    }

-     

-    private Action createCopyAction() {

-        Action action = new Action(PDERuntimeMessages.LogView_copy) { 

-            public void run() {

-                copyToClipboard(fTreeViewer.getSelection());

-            }

-        };

-        action.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages()

-                .getImageDescriptor(ISharedImages.IMG_TOOL_COPY));

-    	return action;

-    }

-    

-    private Action createDeleteLogAction() {

-        Action action = new Action(PDERuntimeMessages.LogView_delete) { 

-            public void run() {

-                doDeleteLog();

-            }

-        };

-        action.setToolTipText(PDERuntimeMessages.LogView_delete_tooltip); 

-        action.setImageDescriptor(PDERuntimePluginImages.DESC_REMOVE_LOG);

-        action.setDisabledImageDescriptor(PDERuntimePluginImages.DESC_REMOVE_LOG_DISABLED);

-        action.setEnabled(fInputFile.exists() && fInputFile.equals(Platform.getLogFileLocation().toFile()));

-        return action;

-    }

-

-    private Action createExportAction() {

-        Action action = new Action(PDERuntimeMessages.LogView_export) { 

-            public void run() {

-                handleExport();

-            }

-        };

-        action.setToolTipText(PDERuntimeMessages.LogView_export_tooltip); 

-        action.setImageDescriptor(PDERuntimePluginImages.DESC_EXPORT);

-        action.setDisabledImageDescriptor(PDERuntimePluginImages.DESC_EXPORT_DISABLED);

-		action.setEnabled(fInputFile.exists());

-    	return action;

-    }

-    

-    private Action createFilterAction() {

-        Action action = new Action(PDERuntimeMessages.LogView_filter) { 

-            public void run() {

-                handleFilter();

-            }

-        };

-        action.setToolTipText(PDERuntimeMessages.LogView_filter); 

-        action.setImageDescriptor(PDERuntimePluginImages.DESC_FILTER);

-        action.setDisabledImageDescriptor(PDERuntimePluginImages.DESC_FILTER_DISABLED);

-    	return action;

-    }

-    

-    private Action createImportLogAction() {

-        Action action = new Action(PDERuntimeMessages.LogView_import) { 

-            public void run() {

-                handleImport();

-            }

-        };

-        action.setToolTipText(PDERuntimeMessages.LogView_import_tooltip); 

-        action.setImageDescriptor(PDERuntimePluginImages.DESC_IMPORT);

-        action.setDisabledImageDescriptor(PDERuntimePluginImages.DESC_IMPORT_DISABLED);

-        return action;

-    }

-    

-    private Action createOpenLogAction() {

-        Action action = new Action(PDERuntimeMessages.LogView_view_currentLog) { 

-            public void run() {

-                if (fInputFile.exists()) {

-                    if (fInputFile.length() > LogReader.MAX_FILE_LENGTH) {

-                        OpenLogDialog openDialog = new OpenLogDialog(getViewSite()

-                                .getShell(), fInputFile);

-                        openDialog.create();

-                        openDialog.open();

-                        return;

-                    } 

-                    if (!Program.launch(fInputFile.getAbsolutePath())) {

-                        Program p = Program.findProgram(".txt"); //$NON-NLS-1$

-                        if (p != null)

-                            p.execute(fInputFile.getAbsolutePath());

-                        else {

-                            OpenLogDialog openDialog = new OpenLogDialog(

-                                    getViewSite().getShell(), fInputFile);

-                            openDialog.create();

-                            openDialog.open();

-                        }                  

-                    }

-                }

-            }

-        };

-        action.setImageDescriptor(PDERuntimePluginImages.DESC_OPEN_LOG);

-        action.setDisabledImageDescriptor(PDERuntimePluginImages.DESC_OPEN_LOG_DISABLED);

-        action.setEnabled(fInputFile.exists());

-        action.setToolTipText(PDERuntimeMessages.LogView_view_currentLog_tooltip); 

-    	return action;

-    }

-    

-    private void createPropertiesAction() {

-        fPropertiesAction = new EventDetailsDialogAction(fTree.getShell(), fTreeViewer);

-        fPropertiesAction.setImageDescriptor(PDERuntimePluginImages.DESC_PROPERTIES);

-        fPropertiesAction

-                .setDisabledImageDescriptor(PDERuntimePluginImages.DESC_PROPERTIES_DISABLED);

-        fPropertiesAction.setToolTipText(PDERuntimeMessages.LogView_properties_tooltip); 

-        fPropertiesAction.setEnabled(false);

-    }

-    

-    private Action createReadLogAction() {

-        Action action = new Action(PDERuntimeMessages.LogView_readLog_restore) { 

-            public void run() {

-                fInputFile = Platform.getLogFileLocation().toFile();

-                reloadLog();

-            }

-        };

-        action.setToolTipText(PDERuntimeMessages.LogView_readLog_restore_tooltip); 

-        action.setImageDescriptor(PDERuntimePluginImages.DESC_READ_LOG);

-        action.setDisabledImageDescriptor(PDERuntimePluginImages.DESC_READ_LOG_DISABLED);

-    	return action;

-    }

-    

-    private void createViewer(Composite parent) {

-        fTreeViewer = new TreeViewer(parent, SWT.FULL_SELECTION);

-        fTree = fTreeViewer.getTree();

-        createColumns(fTree);

-        fTreeViewer.setContentProvider(new LogViewContentProvider(this));

-        fTreeViewer.setLabelProvider(new LogViewLabelProvider());

-        fTreeViewer.addSelectionChangedListener(new ISelectionChangedListener() {

-            public void selectionChanged(SelectionChangedEvent e) {

-                handleSelectionChanged(e.getSelection());

-                if (fPropertiesAction.isEnabled())

-                    ((EventDetailsDialogAction) fPropertiesAction).resetSelection();

-            }

-        });

-        fTreeViewer.addDoubleClickListener(new IDoubleClickListener() {

-            public void doubleClick(DoubleClickEvent event) {

-                ((EventDetailsDialogAction) fPropertiesAction).setComparator(comparator);

-                fPropertiesAction.run();

-            }		

-        });

-        fTreeViewer.setInput(this);

-        addMouseListeners();

-   }

-

-    private void createColumns(Tree tree) {

-        fColumn1 = new TreeColumn(tree, SWT.LEFT);

-        fColumn1.setText(PDERuntimeMessages.LogView_column_message); 

-        fColumn1.setWidth(fMemento.getInteger(P_COLUMN_1).intValue());

-        fColumn1.addSelectionListener(new SelectionAdapter() {

-            public void widgetSelected(SelectionEvent e) {

-                MESSAGE_ORDER *= -1;

-                ViewerSorter sorter = getViewerSorter(MESSAGE);

-                fTreeViewer.setSorter(sorter);

-                collator = sorter.getCollator();

-                boolean isComparatorSet = ((EventDetailsDialogAction) fPropertiesAction)

-                        .resetSelection(MESSAGE, MESSAGE_ORDER);

-                setComparator(MESSAGE);

-                if (!isComparatorSet)

-                    ((EventDetailsDialogAction) fPropertiesAction)

-                            .setComparator(comparator);

-                fMemento.putInteger(P_ORDER_VALUE, MESSAGE_ORDER);

-                fMemento.putInteger(P_ORDER_TYPE, MESSAGE);

-                setColumnSorting(fColumn1, MESSAGE_ORDER);

-            }

-        });

-

-        fColumn2 = new TreeColumn(tree, SWT.LEFT);

-        fColumn2.setText(PDERuntimeMessages.LogView_column_plugin); 

-        fColumn2.setWidth(fMemento.getInteger(P_COLUMN_2).intValue());

-        fColumn2.addSelectionListener(new SelectionAdapter() {

-            public void widgetSelected(SelectionEvent e) {

-                PLUGIN_ORDER *= -1;

-                ViewerSorter sorter = getViewerSorter(PLUGIN);

-                fTreeViewer.setSorter(sorter);

-                collator = sorter.getCollator();

-                boolean isComparatorSet = ((EventDetailsDialogAction) fPropertiesAction)

-                        .resetSelection(PLUGIN, PLUGIN_ORDER);

-                setComparator(PLUGIN);

-                if (!isComparatorSet)

-                    ((EventDetailsDialogAction) fPropertiesAction)

-                            .setComparator(comparator);

-                fMemento.putInteger(P_ORDER_VALUE, PLUGIN_ORDER);

-                fMemento.putInteger(P_ORDER_TYPE, PLUGIN);

-                setColumnSorting(fColumn2, PLUGIN_ORDER);

-            }

-        });

-

-        fColumn3 = new TreeColumn(tree, SWT.LEFT);

-        fColumn3.setText(PDERuntimeMessages.LogView_column_date);

-        fColumn3.setWidth(fMemento.getInteger(P_COLUMN_3).intValue());

-        fColumn3.addSelectionListener(new SelectionAdapter() {

-            public void widgetSelected(SelectionEvent e) {

-                DATE_ORDER *= -1;

-                ViewerSorter sorter = getViewerSorter(DATE);

-                fTreeViewer.setSorter(sorter);

-                collator = sorter.getCollator();

-                setComparator(DATE);

-				((EventDetailsDialogAction) fPropertiesAction).setComparator(comparator);

-                fMemento.putInteger(P_ORDER_VALUE, DATE_ORDER);

-                fMemento.putInteger(P_ORDER_TYPE, DATE);

-                setColumnSorting(fColumn3, DATE_ORDER);

-            }

-        });

-        

-        tree.setHeaderVisible(true);

-    }

-

-	private void initializeViewerSorter() {

-		byte orderType = fMemento.getInteger(P_ORDER_TYPE).byteValue();

-        ViewerSorter sorter = getViewerSorter(orderType);

-        fTreeViewer.setSorter(sorter);

-        if (orderType == MESSAGE )

-        	setColumnSorting(fColumn1, MESSAGE_ORDER);

-        else if (orderType == PLUGIN)

-        	setColumnSorting(fColumn2, PLUGIN_ORDER);

-        else if (orderType == DATE)

-        	setColumnSorting(fColumn3, DATE_ORDER);

-	}

-

-	private void setColumnSorting(TreeColumn column, int order) {

-		fTree.setSortColumn(column);

-        fTree.setSortDirection(order == ASCENDING ? SWT.UP : SWT.DOWN);

-	}

-	

-    public void dispose() {

-        writeSettings();

-        Platform.removeLogListener(this);

-        fClipboard.dispose();

-        LogReader.reset();

-        super.dispose();

-    }

-

-    

-    private void handleImport() {

-        FileDialog dialog = new FileDialog(getViewSite().getShell());

-        dialog.setFilterExtensions(new String[] { "*.log" }); //$NON-NLS-1$

-        if (fDirectory != null)

-            dialog.setFilterPath(fDirectory);

-        handleImportPath(dialog.open());

-    }

-    

-    public void handleImportPath(String path) {

-        if (path != null && new Path(path).toFile().exists()) {

-            fInputFile = new Path(path).toFile();

-            fDirectory = fInputFile.getParent();

-            IRunnableWithProgress op = new IRunnableWithProgress() {

-                public void run(IProgressMonitor monitor)

-                        throws InvocationTargetException, InterruptedException {

-                    monitor.beginTask(PDERuntimeMessages.LogView_operation_importing, IProgressMonitor.UNKNOWN); 

-                    readLogFile();

-                }

-            };

-            ProgressMonitorDialog pmd = new ProgressMonitorDialog(getViewSite().getShell());

-            try {

-                pmd.run(true, true, op);

-            } catch (InvocationTargetException e) {

-            } catch (InterruptedException e) {

-            } finally {

-                fReadLogAction.setText(PDERuntimeMessages.LogView_readLog_reload); 

-                fReadLogAction.setToolTipText(PDERuntimeMessages.LogView_readLog_reload); 

-                asyncRefresh(false);

-                resetDialogButtons();

-            }

-        }

-    }

-

-    private void handleExport() {

-        FileDialog dialog = new FileDialog(getViewSite().getShell(), SWT.SAVE);

-        dialog.setFilterExtensions(new String[] { "*.log" }); //$NON-NLS-1$

-        if (fDirectory != null)

-            dialog.setFilterPath(fDirectory);

-        String path = dialog.open();

-        if (path != null) {

-            if (!path.endsWith(".log")) //$NON-NLS-1$

-                path += ".log"; //$NON-NLS-1$

-            File outputFile = new Path(path).toFile();

-            fDirectory = outputFile.getParent();

-            if (outputFile.exists()) {

-                String message = NLS.bind(PDERuntimeMessages.LogView_confirmOverwrite_message, outputFile.toString());

-                if (!MessageDialog.openQuestion(getViewSite().getShell(), PDERuntimeMessages.LogView_exportLog, message)) 

-                    return;

-            }

-            copy(fInputFile, outputFile);

-        }

-    }

-

-    private void copy(File inputFile, File outputFile) {

-        BufferedReader reader = null;

-        BufferedWriter writer = null;

-        try {

-            reader = new BufferedReader(new InputStreamReader(new FileInputStream(

-                    inputFile), "UTF-8")); //$NON-NLS-1$

-            writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(

-                    outputFile), "UTF-8")); //$NON-NLS-1$

-            while (reader.ready()) {

-                writer.write(reader.readLine());

-                writer.write(System.getProperty("line.separator")); //$NON-NLS-1$

-            }

-        } catch (IOException e) {

-        } finally {

-            try {

-                if (reader != null)

-                    reader.close();

-                if (writer != null)

-                    writer.close();

-            } catch (IOException e1) {

-            }

-        }

-    }

-    

-    private void handleFilter() {

-    	FilterDialog dialog = new FilterDialog(

-    			PDERuntimePlugin.getActiveWorkbenchShell(), fMemento);

-    	dialog.create();

-    	dialog.getShell().setText(

-    			PDERuntimeMessages.LogView_FilterDialog_title); 

-    	if (dialog.open() == FilterDialog.OK)

-    		reloadLog();

-    }

-    

-    private void doDeleteLog() {

-    	String title = PDERuntimeMessages.LogView_confirmDelete_title; 

-    	String message = PDERuntimeMessages.LogView_confirmDelete_message; 

-    	if (!MessageDialog.openConfirm(fTree.getShell(), title,

-    			message))

-    		return;

-    	if (fInputFile.delete() || fLogs.size() > 0) {

-    		fLogs.clear();

-            asyncRefresh(false);

-            resetDialogButtons();

-        }

-    }

-

-    public void fillContextMenu(IMenuManager manager) {

-    }

-

-    public LogEntry[] getLogs() {

-        return (LogEntry[]) fLogs.toArray(new LogEntry[fLogs.size()]);

-    }

-

-    protected void handleClear() {

-        BusyIndicator.showWhile(fTree.getDisplay(),

-                new Runnable() {

-                    public void run() {

-                        fLogs.clear();

-                        asyncRefresh(false);

-                        resetDialogButtons();

-                    }

-                });

-    }

-

-    protected void reloadLog() {

-        IRunnableWithProgress op = new IRunnableWithProgress() {

-            public void run(IProgressMonitor monitor) throws InvocationTargetException,

-                    InterruptedException {

-                monitor.beginTask(PDERuntimeMessages.LogView_operation_reloading, 

-                        IProgressMonitor.UNKNOWN);

-                readLogFile();

-            }

-        };

-        ProgressMonitorDialog pmd = new ProgressMonitorDialog(getViewSite().getShell());

-        try {

-            pmd.run(true, true, op);

-        } catch (InvocationTargetException e) {

-        } catch (InterruptedException e) {

-        } finally {

-            fReadLogAction.setText(PDERuntimeMessages.LogView_readLog_restore); 

-            fReadLogAction.setToolTipText(PDERuntimeMessages.LogView_readLog_restore); 

-            asyncRefresh(false);

-            resetDialogButtons();

-        }

-    }

-

-    private void readLogFile() {

-		fLogs.clear();

-		if (!fInputFile.exists())

-			return;

-		LogReader.parseLogFile(fInputFile, fLogs, fMemento);

-	}

-

-    public void logging(IStatus status, String plugin) {

-        if (!fInputFile.equals(Platform.getLogFileLocation().toFile()))

-            return;

-        if (fFirstEvent) {

-            readLogFile();

-            asyncRefresh();

-            fFirstEvent = false;

-        } else {

-            pushStatus(status);

-        }

-    }

-

-    private void pushStatus(IStatus status) {

-        LogEntry entry = new LogEntry(status);

-        LogReader.addEntry(entry, fLogs, fMemento, true);

-        asyncRefresh();

-    }

-

-    private void asyncRefresh() {

-        asyncRefresh(true);

-    }

-

-    private void asyncRefresh(final boolean activate) {

-        if (fTree.isDisposed())

-            return;

-        Display display = fTree.getDisplay();

-        final ViewPart view = this;

-        if (display != null) {

-            display.asyncExec(new Runnable() {

-                public void run() {

-                    if (!fTree.isDisposed()) {

-                        fTreeViewer.refresh();

-                        fDeleteLogAction.setEnabled(fInputFile.exists()

-                                && fInputFile.equals(Platform.getLogFileLocation()

-                                        .toFile()));

-                        fOpenLogAction.setEnabled(fInputFile.exists());

-						fExportAction.setEnabled(fInputFile.exists());

-                        if (activate && fActivateViewAction.isChecked()) {

-                            IWorkbenchPage page = PDERuntimePlugin.getActivePage();

-                            if (page != null)

-                                page.bringToTop(view);

-                        }

-                    }

-                }

-            });

-        }

-    }

-

-    public void setFocus() {

-        if (fTree != null && !fTree.isDisposed())

-            fTree.setFocus();

-    }

-

-    private void handleSelectionChanged(ISelection selection) {

-        updateStatus(selection);

-        fCopyAction.setEnabled(!selection.isEmpty());

-        fPropertiesAction.setEnabled(!selection.isEmpty());

-    }

-

-    private void updateStatus(ISelection selection) {

-        IStatusLineManager status = getViewSite().getActionBars().getStatusLineManager();

-        if (selection.isEmpty())

-            status.setMessage(null);

-        else {

-            LogEntry entry = (LogEntry) ((IStructuredSelection) selection)

-                    .getFirstElement();

-            status.setMessage(((LogViewLabelProvider) fTreeViewer.getLabelProvider())

-                    .getColumnText(entry, 0));

-        }

-    }

-

-    private void copyToClipboard(ISelection selection) {

-        StringWriter writer = new StringWriter();

-        PrintWriter pwriter = new PrintWriter(writer);

-        if (selection.isEmpty())

-            return;

-        LogEntry entry = (LogEntry) ((IStructuredSelection) selection).getFirstElement();

-        entry.write(pwriter);

-        pwriter.flush();

-        String textVersion = writer.toString();

-        try {

-            pwriter.close();

-            writer.close();

-        } catch (IOException e) {

-        }

-        if (textVersion.trim().length() > 0) {

-	        // set the clipboard contents

-	        fClipboard.setContents(new Object[] { textVersion }, new Transfer[] { TextTransfer

-	                .getInstance() });

-        }

-    }

-

-    public void init(IViewSite site, IMemento memento) throws PartInitException {

-        super.init(site, memento);

-        if (memento == null)

-            this.fMemento = XMLMemento.createWriteRoot("LOGVIEW"); //$NON-NLS-1$

-        else

-            this.fMemento = memento;

-        readSettings();

-        

-        // initialize column ordering 

-        final byte type = this.fMemento.getInteger(P_ORDER_TYPE).byteValue();

-        switch (type){

-        case DATE:

-        	DATE_ORDER = this.fMemento.getInteger(P_ORDER_VALUE).intValue();

-        	MESSAGE_ORDER = DESCENDING;

-        	PLUGIN_ORDER = DESCENDING;

-        	break;

-        case MESSAGE:

-        	MESSAGE_ORDER = this.fMemento.getInteger(P_ORDER_VALUE).intValue();

-        	DATE_ORDER = DESCENDING;

-        	PLUGIN_ORDER = DESCENDING;

-        	break;

-        case PLUGIN:

-        	PLUGIN_ORDER = this.fMemento.getInteger(P_ORDER_VALUE).intValue();

-        	MESSAGE_ORDER = DESCENDING;

-        	DATE_ORDER = DESCENDING;

-        	break;

-		default:

-			DATE_ORDER = DESCENDING;

-			MESSAGE_ORDER = DESCENDING;

-			PLUGIN_ORDER = DESCENDING;

-        }

-		if (collator == null)

-			collator = Collator.getInstance();

-		setComparator(fMemento.getInteger(P_ORDER_TYPE).byteValue());

-    }

-

-    private void initializeMemento() {

-        if (fMemento.getString(P_USE_LIMIT) == null)

-            fMemento.putString(P_USE_LIMIT, "true"); //$NON-NLS-1$

-        if (fMemento.getInteger(P_LOG_LIMIT) == null)

-            fMemento.putInteger(P_LOG_LIMIT, 50);

-        if (fMemento.getString(P_LOG_INFO) == null)

-            fMemento.putString(P_LOG_INFO, "true"); //$NON-NLS-1$

-        if (fMemento.getString(P_LOG_WARNING) == null)

-            fMemento.putString(P_LOG_WARNING, "true"); //$NON-NLS-1$

-        if (fMemento.getString(P_LOG_ERROR) == null)

-            fMemento.putString(P_LOG_ERROR, "true"); //$NON-NLS-1$

-        if (fMemento.getString(P_SHOW_ALL_SESSIONS) == null)

-            fMemento.putString(P_SHOW_ALL_SESSIONS, "true"); //$NON-NLS-1$

-        Integer width = fMemento.getInteger(P_COLUMN_1);

-        if (width == null || width.intValue() == 0)

-            fMemento.putInteger(P_COLUMN_1, 300);

-        width = fMemento.getInteger(P_COLUMN_2);

-        if (width == null || width.intValue() == 0)

-            fMemento.putInteger(P_COLUMN_2, 150);

-        width = fMemento.getInteger(P_COLUMN_3);

-        if (width == null || width.intValue() == 0)

-            fMemento.putInteger(P_COLUMN_3, 150);

-        if (fMemento.getString(P_ACTIVATE) == null)

-            fMemento.putString(P_ACTIVATE, "true"); //$NON-NLS-1$

-        

-       	fMemento.putInteger(P_ORDER_VALUE, DESCENDING);

-        fMemento.putInteger(P_ORDER_TYPE, DATE);

-    }

-

-    public void saveState(IMemento memento) {

-        if (this.fMemento == null || memento == null)

-            return;

-        this.fMemento.putInteger(P_COLUMN_1, fColumn1.getWidth());

-        this.fMemento.putInteger(P_COLUMN_2, fColumn2.getWidth());

-        this.fMemento.putInteger(P_COLUMN_3, fColumn3.getWidth());

-        this.fMemento.putString(P_ACTIVATE,

-                fActivateViewAction.isChecked() ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$

-        memento.putMemento(this.fMemento);

-        writeSettings();

-    }

-

-    private void addMouseListeners() {

-        Listener tableListener = new Listener() {

-            public void handleEvent(Event e) {

-                switch (e.type) {

-                case SWT.MouseMove:

-                    onMouseMove(e);

-                    break;

-                case SWT.MouseHover:

-                    onMouseHover(e);

-                    break;

-                case SWT.MouseDown:

-                    onMouseDown(e);

-                    break;

-                }

-            }

-        };

-        int[] tableEvents = new int[] { SWT.MouseDown, SWT.MouseMove, SWT.MouseHover };

-        for (int i = 0; i < tableEvents.length; i++) {

-            fTree.addListener(tableEvents[i], tableListener);

-        }

-    }

-

-    private void makeHoverShell() {

-        textShell = new Shell(fTree.getShell(), SWT.NO_FOCUS | SWT.ON_TOP);

-        Display display = textShell.getDisplay();

-        textShell.setBackground(display.getSystemColor(SWT.COLOR_INFO_BACKGROUND));

-        GridLayout layout = new GridLayout(1, false);

-        int border = ((fTree.getShell().getStyle() & SWT.NO_TRIM) == 0) ? 0 : 1;

-        layout.marginHeight = border;

-        layout.marginWidth = border;

-        textShell.setLayout(layout);

-        textShell.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));

-        Composite shellComposite = new Composite(textShell, SWT.NONE);

-        layout = new GridLayout();

-        layout.marginHeight = 0;

-        layout.marginWidth = 0;

-        shellComposite.setLayout(layout);

-        shellComposite.setLayoutData(new GridData(GridData.FILL_BOTH

-                | GridData.VERTICAL_ALIGN_BEGINNING));

-        textLabel = new Text(shellComposite, SWT.WRAP | SWT.MULTI);

-        GridData gd = new GridData(GridData.FILL_BOTH);

-        gd.widthHint = 100;

-        gd.grabExcessHorizontalSpace = true;

-        textLabel.setLayoutData(gd);

-        Color c = fTree.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND);

-        textLabel.setBackground(c);

-        c = fTree.getDisplay().getSystemColor(SWT.COLOR_INFO_FOREGROUND);

-        textLabel.setForeground(c);

-        textLabel.setEditable(false);

-        textShell.addDisposeListener(new DisposeListener() {

-            public void widgetDisposed(DisposeEvent e) {

-                onTextShellDispose(e);

-            }

-        });

-    }

-

-    void onTextShellDispose(DisposeEvent e) {

-        canOpenTextShell = true;

-        setFocus();

-    }

-

-    void onMouseDown(Event e) {

-        if (textShell != null && !textShell.isDisposed() && !textShell.isFocusControl()) {

-            textShell.close();

-            canOpenTextShell = true;

-        }

-    }

-

-    void onMouseHover(Event e) {

-        if (!canOpenTextShell)

-            return;

-        canOpenTextShell = false;

-        Point point = new Point(e.x, e.y);

-		TreeItem item = fTree.getItem(point);

-        if (item == null)

-            return;

-        String message = ((LogEntry) item.getData()).getStack();

-        if (message == null)

-            return;

-        makeHoverShell();

-        textLabel.setText(message);

-        int x = point.x + 5;

-        int y = point.y - (fTree.getItemHeight() * 2) - 20;

-        textShell.setLocation(fTree.toDisplay(x, y));

-        textShell.setSize(fTree.getColumn(0).getWidth(), 125);

-        textShell.open();

-        setFocus();

-    }

-

-    void onMouseMove(Event e) {

-        if (textShell != null && !textShell.isDisposed())

-            textShell.close();

-		

-		Point point = new Point(e.x, e.y);

-		TreeItem item = fTree.getItem(point);

-		if (item == null) 

-			return;

-		Image image= item.getImage();

-		LogEntry entry = (LogEntry)item.getData();

-		int parentCount = getNumberOfParents(entry);

-		int startRange = 20 + Math.max(image.getBounds().width + 2, 7 + 2)*parentCount;

-		int endRange = startRange + 16;

-		canOpenTextShell = e.x >= startRange && e.x <= endRange;

-	}

-	

-	private int getNumberOfParents(LogEntry entry){

-		LogEntry parent = (LogEntry)entry.getParent(entry);

-		if (parent ==null)

-			return 0;

-		return 1 + getNumberOfParents(parent);

-	}

-

-    public Comparator getComparator() {

-        return comparator;

-    }

-

-    private void setComparator(byte sortType) {

-        if (sortType == DATE) {

-            comparator = new Comparator() {

-                public int compare(Object e1, Object e2) {

-					try {

-						SimpleDateFormat formatter = new SimpleDateFormat(

-						"yyyy-MM-dd HH:mm:ss.SSS"); //$NON-NLS-1$

-						Date date1 = formatter.parse(((LogEntry) e1).getDate());

-						Date date2 = formatter.parse(((LogEntry) e2).getDate());

-						if (DATE_ORDER == ASCENDING)

-							return date1.before(date2) ? DESCENDING : ASCENDING;

-						return date1.after(date2) ? DESCENDING : ASCENDING;

-					} catch (ParseException e) {

-					}

-					return 0;

-                }

-            };

-        } else if (sortType == PLUGIN) {

-            comparator = new Comparator() {

-                public int compare(Object e1, Object e2) {

-                    LogEntry entry1 = (LogEntry) e1;

-                    LogEntry entry2 = (LogEntry) e2;

-                    return collator.compare(entry1.getPluginId(), entry2.getPluginId())

-                            * PLUGIN_ORDER;

-                }

-            };

-        } else {

-            comparator = new Comparator() {

-                public int compare(Object e1, Object e2) {

-                    LogEntry entry1 = (LogEntry) e1;

-                    LogEntry entry2 = (LogEntry) e2;

-                    return collator.compare(entry1.getMessage(), entry2.getMessage())

-                            * MESSAGE_ORDER;

-                }

-            };

-        }

-    }

-

-    private ViewerSorter getViewerSorter(byte sortType) {

-        if (sortType == PLUGIN) {

-            return new ViewerSorter() {

-                public int compare(Viewer viewer, Object e1, Object e2) {

-                    LogEntry entry1 = (LogEntry) e1;

-                    LogEntry entry2 = (LogEntry) e2;

-                    return super.compare(viewer, entry1.getPluginId(), entry2

-                            .getPluginId())

-                            * PLUGIN_ORDER;

-                }

-            };

-        } else if (sortType == MESSAGE) {

-            return new ViewerSorter() {

-                public int compare(Viewer viewer, Object e1, Object e2) {

-                    LogEntry entry1 = (LogEntry) e1;

-                    LogEntry entry2 = (LogEntry) e2;

-                    return super

-                            .compare(viewer, entry1.getMessage(), entry2.getMessage())

-                            * MESSAGE_ORDER;

-                }

-            };

-        } else {

-            return new ViewerSorter() {

-				public int compare(Viewer viewer, Object e1, Object e2) {

-					try {

-						SimpleDateFormat formatter = new SimpleDateFormat(

-						"yyyy-MM-dd HH:mm:ss.SSS"); //$NON-NLS-1$

-						Date date1 = formatter.parse(((LogEntry) e1).getDate());

-						Date date2 = formatter.parse(((LogEntry) e2).getDate());

-						if (DATE_ORDER == ASCENDING)

-							return date1.before(date2) ? DESCENDING : ASCENDING;

-						return date1.after(date2) ? DESCENDING : ASCENDING;

-					} catch (ParseException e) {

-					}

-					return 0;

-                }

-            };

-        }

-    }

-

-    private void resetDialogButtons() {

-        ((EventDetailsDialogAction) fPropertiesAction).resetDialogButtons();

-    }

-    

-    /**

-     * Returns the filter dialog settings object used to maintain

-     * state between filter dialogs

-     * @return the dialog settings to be used

-     */

-    private IDialogSettings getLogSettings() {

-        IDialogSettings settings= PDERuntimePlugin.getDefault().getDialogSettings();

-        return settings.getSection(getClass().getName());

-    }

-    

-    /**

-     * Returns the plugin preferences used to maintain

-     * state of log view

-     * @return the plugin preferences

-     */

-    private Preferences getLogPreferences(){

-    	return PDERuntimePlugin.getDefault().getPluginPreferences();

-    }

-

-    private void readSettings(){

-        IDialogSettings s = getLogSettings();

-        Preferences p = getLogPreferences();

-        if (s == null || p == null){

-            initializeMemento();

-            return;

-        }

-        try {

-			fMemento.putString(P_USE_LIMIT, s.getBoolean(P_USE_LIMIT) ? "true":"false"); //$NON-NLS-1$ //$NON-NLS-2$

-			fMemento.putInteger(P_LOG_LIMIT, s.getInt(P_LOG_LIMIT));

-			fMemento.putString(P_LOG_INFO, s.getBoolean(P_LOG_INFO) ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$

-			fMemento.putString(P_LOG_WARNING, s.getBoolean(P_LOG_WARNING) ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$

-			fMemento.putString(P_LOG_ERROR, s.getBoolean(P_LOG_ERROR) ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$

-			fMemento.putString(P_SHOW_ALL_SESSIONS, s.getBoolean(P_SHOW_ALL_SESSIONS) ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$

-			fMemento.putInteger(P_COLUMN_1, p.getInt(P_COLUMN_1) > 0 ? p

-					.getInt(P_COLUMN_1) : 300);

-			fMemento.putInteger(P_COLUMN_2, p.getInt(P_COLUMN_2) > 0 ? p

-					.getInt(P_COLUMN_2) : 150);

-			fMemento.putInteger(P_COLUMN_3, p.getInt(P_COLUMN_3) > 0 ? p

-					.getInt(P_COLUMN_3) : 150);

-			fMemento.putString(P_ACTIVATE, p.getBoolean(P_ACTIVATE) ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$

-			int order = p.getInt(P_ORDER_VALUE);

-			fMemento.putInteger(P_ORDER_VALUE, order == 0 ? DESCENDING : order);

-			fMemento.putInteger(P_ORDER_TYPE, p.getInt(P_ORDER_TYPE));

-		} catch (NumberFormatException e) {

-			fMemento.putInteger(P_LOG_LIMIT, 50);

-			fMemento.putInteger(P_COLUMN_1, 300);

-			fMemento.putInteger(P_COLUMN_2, 150);

-			fMemento.putInteger(P_COLUMN_3, 150);

-			fMemento.putInteger(P_ORDER_TYPE, DATE);

-			fMemento.putInteger(P_ORDER_VALUE, DESCENDING);

-		}

-    }

-    

-    private void writeSettings(){

-        writeViewSettings();

-        writeFilterSettings();

-    }

-    

-    private void writeFilterSettings(){

-        IDialogSettings settings = getLogSettings();

-        if (settings == null)

-            settings = PDERuntimePlugin.getDefault().getDialogSettings().addNewSection(getClass().getName());

-        settings.put(P_USE_LIMIT, fMemento.getString(P_USE_LIMIT).equals("true")); //$NON-NLS-1$

-        settings.put(P_LOG_LIMIT, fMemento.getInteger(P_LOG_LIMIT).intValue());

-        settings.put(P_LOG_INFO, fMemento.getString(P_LOG_INFO).equals("true")); //$NON-NLS-1$

-        settings.put(P_LOG_WARNING, fMemento.getString(P_LOG_WARNING).equals("true")); //$NON-NLS-1$

-        settings.put(P_LOG_ERROR, fMemento.getString(P_LOG_ERROR).equals("true")); //$NON-NLS-1$

-        settings.put(P_SHOW_ALL_SESSIONS, fMemento.getString(P_SHOW_ALL_SESSIONS).equals("true")); //$NON-NLS-1$

-    }

-    

-    private void writeViewSettings(){

-        Preferences preferences = getLogPreferences();

-        preferences.setValue(P_COLUMN_1, fMemento.getInteger(P_COLUMN_1).intValue());

-        preferences.setValue(P_COLUMN_2, fMemento.getInteger(P_COLUMN_2).intValue());

-        preferences.setValue(P_COLUMN_3, fMemento.getInteger(P_COLUMN_3).intValue());

-        preferences.setValue(P_ACTIVATE, fMemento.getString(P_ACTIVATE).equals("true")); //$NON-NLS-1$

-        int order = fMemento.getInteger(P_ORDER_VALUE).intValue();

-        preferences.setValue(P_ORDER_VALUE, order == 0 ? DESCENDING : order);

-        preferences.setValue(P_ORDER_TYPE, fMemento.getInteger(P_ORDER_TYPE).intValue());

-    }

-    

-    public void sortByDateDescending() {

-    	setColumnSorting(fColumn3, DESCENDING);

-    }

-}


diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/LogViewContentProvider.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/LogViewContentProvider.java
deleted file mode 100644
index e1c6a1e..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/LogViewContentProvider.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2005 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.pde.internal.runtime.logview;

-

-import org.eclipse.jface.viewers.*;

-

-public class LogViewContentProvider implements ITreeContentProvider {

-	private LogView logView;

-

-	public LogViewContentProvider(LogView logView) {

-		this.logView = logView;

-	}

-	public void dispose() {

-	}

-	public Object[] getChildren(Object element) {

-		return ((LogEntry) element).getChildren(element);

-	}

-	public Object[] getElements(Object element) {

-		return logView.getLogs();

-	}

-	public Object getParent(Object element) {

-		return ((LogEntry) element).getParent(element);

-	}

-	public boolean hasChildren(Object element) {

-		return ((LogEntry) element).hasChildren();

-	}

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-	}

-	public boolean isDeleted(Object element) {

-		return false;

-	}

-}


diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/LogViewLabelProvider.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/LogViewLabelProvider.java
deleted file mode 100644
index 123f90f..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/LogViewLabelProvider.java
+++ /dev/null

@@ -1,71 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2005 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.pde.internal.runtime.logview;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.jface.viewers.*;

-import org.eclipse.pde.internal.runtime.PDERuntimePluginImages;

-import org.eclipse.swt.graphics.Image;

-

-public class LogViewLabelProvider

-	extends LabelProvider

-	implements ITableLabelProvider {

-	private Image infoImage;

-	private Image okImage;

-	private Image errorImage;

-	private Image warningImage;

-	private Image errorWithStackImage;

-

-	public LogViewLabelProvider() {

-		errorImage = PDERuntimePluginImages.DESC_ERROR_ST_OBJ.createImage();

-		warningImage = PDERuntimePluginImages.DESC_WARNING_ST_OBJ.createImage();

-		infoImage = PDERuntimePluginImages.DESC_INFO_ST_OBJ.createImage();

-		okImage = PDERuntimePluginImages.DESC_OK_ST_OBJ.createImage();

-		errorWithStackImage = PDERuntimePluginImages.DESC_ERROR_STACK_OBJ.createImage();

-	}

-	public void dispose() {

-		errorImage.dispose();

-		infoImage.dispose();

-		okImage.dispose();

-		warningImage.dispose();

-		errorWithStackImage.dispose();

-		super.dispose();

-	}

-	public Image getColumnImage(Object element, int columnIndex) {

-		LogEntry entry = (LogEntry) element;

-		if (columnIndex == 0) {

-			switch (entry.getSeverity()) {

-				case IStatus.INFO :

-					return infoImage;

-				case IStatus.OK :

-					return okImage;

-				case IStatus.WARNING :

-					return warningImage;

-				default :

-					return (entry.getStack() == null ? errorImage : errorWithStackImage);

-			}

-		}

-		return null;

-	}

-	

-	public String getColumnText(Object element, int columnIndex) {

-		LogEntry entry = (LogEntry) element;

-		switch (columnIndex) {

-		case 0:

-			return entry.getMessage() != null ? entry.getMessage() : ""; //$NON-NLS-1$

-		case 1:

-			return entry.getPluginId() != null ? entry.getPluginId() : ""; //$NON-NLS-1$

-		case 2:

-			return entry.getDate() != null ? entry.getDate() : ""; //$NON-NLS-1$

-		}

-		return ""; //$NON-NLS-1$

-	}

-}


diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/OpenLogDialog.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/OpenLogDialog.java
deleted file mode 100644
index c48f951..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/OpenLogDialog.java
+++ /dev/null

@@ -1,252 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.runtime.logview;
-
-import java.io.*;
-import java.lang.reflect.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.operation.*;
-import org.eclipse.pde.internal.runtime.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * Displays the error log in non-Win32 platforms - see bug 55314.
- */
-public final class OpenLogDialog extends Dialog {
-    // input log file
-    private File logFile;
-    // location/size configuration
-    private IDialogSettings dialogSettings;
-    private Point dialogLocation;
-    private Point dialogSize;
-    private int DEFAULT_WIDTH = 750;
-    private int DEFAULT_HEIGHT = 800;
-
-    public OpenLogDialog(Shell parentShell, File logFile) {
-        super(parentShell);
-        this.logFile = logFile;
-        setShellStyle(SWT.DIALOG_TRIM | SWT.RESIZE | SWT.MAX | SWT.MIN | SWT.MODELESS);
-
-    }
-
-    /*
-     * (non-Javadoc) Method declared on Window.
-     */
-    protected void configureShell(Shell newShell) {
-        super.configureShell(newShell);
-        newShell.setText(PDERuntimeMessages.OpenLogDialog_title); 
-        readConfiguration();
-    }
-
-    /*
-     * (non-Javadoc) Method declared on Dialog.
-     */
-    protected void createButtonsForButtonBar(Composite parent) {
-        createButton(parent, IDialogConstants.CLOSE_ID, IDialogConstants.CLOSE_LABEL,
-                true);
-    }
-
-    public void create() {
-        super.create();
-        // dialog location
-        if (dialogLocation != null)
-            getShell().setLocation(dialogLocation);
-        // dialog size
-        if (dialogSize != null)
-            getShell().setSize(dialogSize);
-        else
-            getShell().setSize(DEFAULT_WIDTH, DEFAULT_HEIGHT);
-        getButton(IDialogConstants.CLOSE_ID).setFocus();
-    }
-
-    /*
-     * (non-Javadoc) Method declared on Dialog.
-     */
-    protected Control createDialogArea(Composite parent) {
-        Composite outer = (Composite) super.createDialogArea(parent);
-        Text text = new Text(outer, SWT.MULTI | SWT.BORDER | SWT.READ_ONLY | SWT.V_SCROLL
-                | SWT.NO_FOCUS | SWT.H_SCROLL);
-        text.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND));
-        GridData gridData = new GridData(GridData.HORIZONTAL_ALIGN_FILL
-                | GridData.VERTICAL_ALIGN_FILL);
-        gridData.grabExcessVerticalSpace = true;
-        gridData.grabExcessHorizontalSpace = true;
-        text.setLayoutData(gridData);
-        text.setText(getLogSummary());
-        return outer;
-    }
-
-    private String getLogSummary() {
-        StringWriter out = new StringWriter();
-        PrintWriter writer = new PrintWriter(out);
-        if (logFile.length() > LogReader.MAX_FILE_LENGTH) {
-            readLargeFileWithMonitor(writer);
-        } else {
-            readFileWithMonitor(writer);
-        }
-        writer.close();
-        return out.toString();
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.jface.dialogs.Dialog#buttonPressed(int)
-     */
-    protected void buttonPressed(int buttonId) {
-        if (buttonId == IDialogConstants.CLOSE_ID) {
-            storeSettings();
-            close();
-        }
-        super.buttonPressed(buttonId);
-    }
-
-    //--------------- configuration handling --------------
-    /**
-     * Stores the current state in the dialog settings.
-     * 
-     * @since 2.0
-     */
-    private void storeSettings() {
-        writeConfiguration();
-    }
-
-    /**
-     * Returns the dialog settings object used to share state between several
-     * event detail dialogs.
-     * 
-     * @return the dialog settings to be used
-     */
-    private IDialogSettings getDialogSettings() {
-        IDialogSettings settings = PDERuntimePlugin.getDefault().getDialogSettings();
-        dialogSettings = settings.getSection(getClass().getName());
-        if (dialogSettings == null)
-            dialogSettings = settings.addNewSection(getClass().getName());
-        return dialogSettings;
-    }
-
-    /**
-     * Initializes itself from the dialog settings with the same state as at the
-     * previous invocation.
-     */
-    private void readConfiguration() {
-        IDialogSettings s = getDialogSettings();
-        try {
-            int x = s.getInt("x"); //$NON-NLS-1$
-            int y = s.getInt("y"); //$NON-NLS-1$
-            dialogLocation = new Point(x, y);
-            x = s.getInt("width"); //$NON-NLS-1$
-            y = s.getInt("height"); //$NON-NLS-1$
-            dialogSize = new Point(x, y);
-        } catch (NumberFormatException e) {
-            dialogLocation = null;
-            dialogSize = null;
-        }
-    }
-
-    private void writeConfiguration() {
-        IDialogSettings s = getDialogSettings();
-        Point location = getShell().getLocation();
-        s.put("x", location.x); //$NON-NLS-1$
-        s.put("y", location.y); //$NON-NLS-1$
-        Point size = getShell().getSize();
-        s.put("width", size.x); //$NON-NLS-1$
-        s.put("height", size.y); //$NON-NLS-1$
-    }
-
-    // reading file within MAX_FILE_LENGTH size
-    private void readFile(PrintWriter writer) throws FileNotFoundException, IOException {
-        BufferedReader bReader = new BufferedReader(new FileReader(logFile));
-        while (bReader.ready())
-            writer.println(bReader.readLine());
-    }
-
-    // reading large files
-    private void readLargeFile(PrintWriter writer) throws FileNotFoundException,
-            IOException {
-        RandomAccessFile random = null;
-        boolean hasStarted = false;
-        try {
-            random = new RandomAccessFile(logFile, "r"); //$NON-NLS-1$
-            random.seek(logFile.length() - LogReader.MAX_FILE_LENGTH);
-            for (;;) {
-                String line = random.readLine();
-                if (line == null)
-                    break;
-                line = line.trim();
-                if (line.length() == 0)
-                    continue;
-                if (!hasStarted
-                        && (line.startsWith("!ENTRY") || line.startsWith("!SESSION"))) //$NON-NLS-1$ //$NON-NLS-2$
-                    hasStarted = true;
-                if (hasStarted)
-                    writer.println(line);
-                continue;
-            }
-        } finally {
-            try {
-                if (random != null)
-                    random.close();
-            } catch (IOException e1) {
-            }
-        }
-    }
-
-    private void readLargeFileWithMonitor(final PrintWriter writer) {
-        IRunnableWithProgress runnable = new IRunnableWithProgress() {
-            public void run(IProgressMonitor monitor) throws InvocationTargetException,
-                    InterruptedException {
-                monitor
-                        .beginTask(
-                                PDERuntimeMessages.OpenLogDialog_message, IProgressMonitor.UNKNOWN); 
-                try {
-                    readLargeFile(writer);
-                } catch (IOException e) {
-                    writer.println(PDERuntimeMessages.OpenLogDialog_cannotDisplay); 
-                }
-            }
-        };
-        ProgressMonitorDialog dialog = new ProgressMonitorDialog(getParentShell());
-        try {
-            dialog.run(true, true, runnable);
-        } catch (InvocationTargetException e) {
-        } catch (InterruptedException e) {
-        }
-    }
-
-    private void readFileWithMonitor(final PrintWriter writer) {
-        IRunnableWithProgress runnable = new IRunnableWithProgress() {
-            public void run(IProgressMonitor monitor) throws InvocationTargetException,
-                    InterruptedException {
-                monitor
-                        .beginTask(
-                                PDERuntimeMessages.OpenLogDialog_message, IProgressMonitor.UNKNOWN); 
-                try {
-                    readFile(writer);
-                } catch (IOException e) {
-                    writer.println(PDERuntimeMessages.OpenLogDialog_cannotDisplay); 
-                }
-            }
-        };
-        ProgressMonitorDialog dialog = new ProgressMonitorDialog(getParentShell());
-        try {
-            dialog.run(true, true, runnable);
-        } catch (InvocationTargetException e) {
-        } catch (InterruptedException e) {
-        }
-    }
-}

diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/TailInputStream.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/TailInputStream.java
deleted file mode 100644
index 1ab0c33..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/logview/TailInputStream.java
+++ /dev/null

@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.runtime.logview;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.RandomAccessFile;
-
-public class TailInputStream extends InputStream {
-
-	private RandomAccessFile fRaf;
-
-	private long fTail;
-
-	public TailInputStream(File file, long maxLength) throws IOException {
-		super();
-		fTail = maxLength;
-		fRaf = new RandomAccessFile(file, "r"); //$NON-NLS-1$
-		skipHead(file);
-	}
-
-	private void skipHead(File file) throws IOException {
-		if (file.length() > fTail) {
-			fRaf.seek(file.length() - fTail);
-			// skip bytes until a new line to be sure we start from a beginnng of valid UTF-8 character
-			int c= read();
-			while(c!='\n' && c!='r' && c!=-1){
-				c=read();
-			}
-			
-		}
-	}
-
-	public int read() throws IOException {
-		byte[] b = new byte[1];
-		int len = fRaf.read(b, 0, 1);
-		if (len < 0) {
-			return len;
-		}
-		return b[0];
-	}
-
-	public int read(byte[] b) throws IOException {
-		return fRaf.read(b, 0, b.length);
-	}
-
-	public int read(byte[] b, int off, int len) throws IOException {
-		return fRaf.read(b, off, len);
-	}
-
-	public void close() throws IOException {
-		fRaf.close();
-	}
-
-}

diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/pderuntimeresources.properties b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/pderuntimeresources.properties
deleted file mode 100644
index cce980c..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/pderuntimeresources.properties
+++ /dev/null

@@ -1,123 +0,0 @@
-###############################################################################

-# Copyright (c) 2000, 2005 IBM Corporation and others.

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#     IBM Corporation - initial API and implementation

-###############################################################################

-#

-# PDE Runtime resources

-#

-

-LogView_column_severity = !

-LogView_column_message = Message

-LogView_column_plugin = Plug-in

-LogView_column_date = Date

-LogView_clear = C&lear Log Viewer

-LogView_clear_tooltip = Clear Log Viewer

-LogView_copy = &Copy

-LogView_delete = &Delete Log

-LogView_delete_tooltip = Delete Log

-LogView_export = &Export Log...

-LogView_exportLog=Export Log

-LogView_export_tooltip = Export Log

-LogView_import = &Import Log...

-LogView_import_tooltip = Import Log

-LogView_filter = &Filters...

-LogView_readLog_reload = Re&load This Workspace's Log

-LogView_readLog_restore = &Restore Log

-LogView_readLog_restore_tooltip = Restore Log

-LogView_severity_error = Error

-LogView_severity_warning = Warning

-LogView_severity_info = Info

-LogView_severity_ok = OK

-LogView_confirmDelete_title = Confirm Delete

-LogView_confirmDelete_message = Are you sure you want to permanently delete all logged events?

-LogView_confirmOverwrite_message = File " {0}" exists.  Would you like to overwrite it?

-LogView_operation_importing = Importing log...

-LogView_operation_reloading = Reloading...

-LogView_activate = &Activate on new events

-LogView_view_currentLog = &Open Log

-LogView_view_currentLog_tooltip = Open Log

-LogView_properties_tooltip = Event Details

-

-LogView_FilterDialog_title = Log Filters

-LogView_FilterDialog_eventTypes = Event Types

-LogView_FilterDialog_information = &Information

-LogView_FilterDialog_warning = &Warning

-LogView_FilterDialog_error = &Error

-LogView_FilterDialog_limitTo = &Limit visible events to:

-LogView_FilterDialog_eventsLogged = Show events logged during:

-LogView_FilterDialog_allSessions = &All sessions

-LogView_FilterDialog_recentSession = &Most recent session

-

-RegistryView_extensionPointPR_id = Id

-RegistryView_extensionPointPR_name = Name

-

-RegistryView_extensionPR_id = Id

-RegistryView_extensionPR_name = Name

-RegistryView_extensionPR_point = Point

-

-RegistryView_libraryPR_path = Path

-RegistryView_libraryPR_exported = Exported

-RegistryView_libraryPR_fullyExported = Fully Exported

-

-RegistryView_pluginPR_installURL = Install URL

-RegistryView_pluginPR_name = Name

-RegistryView_pluginPR_id = Unique ID

-RegistryView_pluginPR_providerName = Provider Name

-RegistryView_pluginPR_version = Version

-RegistryView_pluginPR_activated = Activated

-

-RegistryView_prerequisitePR_exported = Exported

-RegistryView_prerequisitePR_id = Unique Id

-RegistryView_prerequisitePR_version = Required Version

-RegistryView_prerequisitePR_optional = Optional

-RegistryView_prerequisitePR_match = Match Rule

-RegistryView_prerequisitePR_matchedCompatible = Compatible

-RegistryView_prerequisitePR_matchedExact = Exact

-RegistryView_prerequisitePR_matchedEquivalent = Equivalent

-RegistryView_prerequisitePR_matchedGreaterOrEqual = Greater or Equal

-RegistryView_prerequisitePR_matchedPerfect = Perfect

-

-RegistryView_refresh_label=&Refresh

-RegistryView_refresh_tooltip=Refresh

-RegistryView_collapseAll_label = &Collapse All

-RegistryView_collapseAll_tooltip = Collapse All

-

-RegistryView_folders_imports = Prerequisites

-RegistryView_folders_libraries = Run-time Libraries

-RegistryView_folders_extensionPoints = Extension Points

-RegistryView_folders_extensions = Extensions

-EventDetailsDialog_title= Event Details

-EventDetailsDialog_date=Date:

-EventDetailsDialog_severity=Severity:

-EventDetailsDialog_message=Message:

-EventDetailsDialog_exception=Exception Stack Trace:

-EventDetailsDialog_session=Session Data:

-EventDetailsDialog_noStack = An exception stack trace is not available.

-EventDetailsDialog_previous=View Details Of Previous Event

-EventDetailsDialog_next=View Details Of Next Event

-EventDetailsDialog_copy=Copy Event Details To Clipboard

-

-RegistryView_showRunning_label = &Show Active Plug-ins Only

-

-RegistryView_showPropertiesSheet_label = S&how Registry Only

-RegistryView_showPropertiesSheet_tooltip = Show Plug-in Registry Only

-RegistryView_showPropertiesSheet_desc = Hide registry properties

-

-RegistryView_verticalOrientation_label = &Vertical View Orientation

-RegistryView_verticalOrientation_tooltip = Vertical View Orientation

-RegistryView_verticalOrientation_desc = Tile vertically

-

-RegistryView_horizontalOrientation_label = &Horizontal View Orientation

-RegistryView_horizontalOrientation_tooltip = Horizontal View Orientation

-RegistryView_horizontalOrientation_desc = Tile horizontally

-

-RegistryView_titleSummary = Filter matched {0} of {1} plug-ins.

-OpenLogDialog_title=Error Log

-OpenLogDialog_message=Opening log...

-OpenLogDialog_cannotDisplay=Log file cannot be displayed.


diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/ConfigurationElementAdapter.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/ConfigurationElementAdapter.java
deleted file mode 100644
index 2c4e22d..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/ConfigurationElementAdapter.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 Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.pde.internal.runtime.registry;

-

-import org.eclipse.core.runtime.IConfigurationElement;

-

-public class ConfigurationElementAdapter extends ParentAdapter {

-

-

-public ConfigurationElementAdapter(Object object) {

-	super(object);

-}

-protected Object[] createChildren() {

-	IConfigurationElement config = (IConfigurationElement)getObject();

-	IConfigurationElement [] children = config.getChildren();

-	if (children.length==0) return null;

-	Object[] result = new Object[children.length];

-	for (int i=0; i<children.length; i++) {

-		IConfigurationElement child = children[i];

-		result[i] = new ConfigurationElementAdapter(child);

-	}

-	return result;

-}

-}


diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/ConfigurationElementPropertySource.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/ConfigurationElementPropertySource.java
deleted file mode 100644
index df0a2ab..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/ConfigurationElementPropertySource.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 Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.pde.internal.runtime.registry;

-

-import java.util.Vector;

-

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.ui.views.properties.*;

-

-public class ConfigurationElementPropertySource extends RegistryPropertySource {

-	private IConfigurationElement config;

-

-public ConfigurationElementPropertySource(IConfigurationElement config) {

-	this.config = config;

-}

-public IPropertyDescriptor[] getPropertyDescriptors() {

-	Vector result = new Vector();

-

-	String [] atts = config.getAttributeNames();

-	for (int i=0; i<atts.length; i++) {

-	   result.addElement(new PropertyDescriptor(atts[i], atts[i]));

-	}

-	return toDescriptorArray(result);

-}

-public Object getPropertyValue(Object name) {

-	return config.getAttribute(name.toString());

-}

-}


diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/ExtensionAdapter.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/ExtensionAdapter.java
deleted file mode 100644
index 36f7265..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/ExtensionAdapter.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 Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.pde.internal.runtime.registry;

-

-import org.eclipse.core.runtime.*;

-

-public class ExtensionAdapter extends ParentAdapter {

-

-

-public ExtensionAdapter(Object object) {

-	super(object);

-}

-protected Object[] createChildren() {

-	IExtension extension = (IExtension)getObject();

-

-	IConfigurationElement [] elements = extension.getConfigurationElements();

-	Object [] result = new ConfigurationElementAdapter[elements.length];

-	for (int i=0; i<elements.length; i++) {

-		IConfigurationElement config = elements[i];

-		result[i]=new ConfigurationElementAdapter(config);

-	}

-	return result;

-}

-}


diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/ExtensionPointAdapter.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/ExtensionPointAdapter.java
deleted file mode 100644
index c3e93b1..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/ExtensionPointAdapter.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 Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.pde.internal.runtime.registry;

-

-import org.eclipse.core.runtime.*;

-

-public class ExtensionPointAdapter extends ParentAdapter {

-

-

-public ExtensionPointAdapter(Object object) {

-	super(object);

-}

-protected Object [] createChildren() {

-	IExtensionPoint extensionPoint = (IExtensionPoint)getObject();

-

-	IExtension [] extensions = extensionPoint.getExtensions();

-	Object [] result = new Object[extensions.length];

-	for (int i=0; i<extensions.length; i++) {

-		IExtension extension = extensions[i];

-		result[i] = new ExtensionAdapter(extension);

-	}

-	return result;

-}

-}


diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/ExtensionPointPropertySource.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/ExtensionPointPropertySource.java
deleted file mode 100644
index 9dbf613..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/ExtensionPointPropertySource.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 Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.pde.internal.runtime.registry;

-

-import java.util.Vector;

-

-import org.eclipse.core.runtime.IExtensionPoint;

-import org.eclipse.pde.internal.runtime.PDERuntimeMessages;

-import org.eclipse.ui.views.properties.*;

-

-public class ExtensionPointPropertySource extends RegistryPropertySource {

-	private IExtensionPoint extensionPoint;

-	public static final String P_NAME = "name"; //$NON-NLS-1$

-	public static final String P_ID = "id"; //$NON-NLS-1$

-

-public ExtensionPointPropertySource(IExtensionPoint extensionPoint) {

-	this.extensionPoint = extensionPoint;

-}

-public IPropertyDescriptor[] getPropertyDescriptors() {

-	Vector result = new Vector();

-

-	result.addElement(new PropertyDescriptor(P_NAME, PDERuntimeMessages.RegistryView_extensionPointPR_name));

-	result.addElement(new PropertyDescriptor(P_ID, PDERuntimeMessages.RegistryView_extensionPointPR_id));

-	return toDescriptorArray(result);

-}

-public Object getPropertyValue(Object name) {

-	if (name.equals(P_NAME))

-		return extensionPoint.getLabel();

-	if (name.equals(P_ID))

-		return extensionPoint.getUniqueIdentifier();

-	return null;

-}

-}


diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/ExtensionPropertySource.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/ExtensionPropertySource.java
deleted file mode 100644
index 57c1a64..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/ExtensionPropertySource.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 Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.pde.internal.runtime.registry;

-

-import java.util.Vector;

-

-import org.eclipse.core.runtime.IExtension;

-import org.eclipse.pde.internal.runtime.PDERuntimeMessages;

-import org.eclipse.ui.views.properties.*;

-

-public class ExtensionPropertySource extends RegistryPropertySource {

-	private IExtension extension;

-	public static final String P_NAME = "name"; //$NON-NLS-1$

-	public static final String P_ID = "id"; //$NON-NLS-1$

-	public static final String P_POINT = "point"; //$NON-NLS-1$

-	public ExtensionPropertySource(IExtension extension) {

-	this.extension = extension;

-}

-public IPropertyDescriptor[] getPropertyDescriptors() {

-	Vector result = new Vector();

-

-	result.addElement(new PropertyDescriptor(P_NAME, PDERuntimeMessages.RegistryView_extensionPR_name));

-	result.addElement(new PropertyDescriptor(P_ID, PDERuntimeMessages.RegistryView_extensionPR_id));

-	result.addElement(new PropertyDescriptor(P_POINT, PDERuntimeMessages.RegistryView_extensionPR_point));

-	return toDescriptorArray(result);

-}

-public Object getPropertyValue(Object name) {

-	if (name.equals(P_NAME))

-		return extension.getLabel();

-	if (name.equals(P_ID))

-		return extension.getUniqueIdentifier();

-	if (name.equals(P_POINT))

-		return extension.getExtensionPointUniqueIdentifier();

-	return null;

-}

-}


diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/IPluginFolder.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/IPluginFolder.java
deleted file mode 100644
index 26aa8a6..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/IPluginFolder.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 Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.pde.internal.runtime.registry;

-

-import org.eclipse.core.runtime.*;

-

-

-public interface IPluginFolder extends IAdaptable {

-	public static final int F_EXTENSIONS = 1;

-	public static final int F_EXTENSION_POINTS = 2;

-	public static final int F_IMPORTS = 3;

-	public static final int F_LIBRARIES = 4;

-	public static final int F_FRAGMENTS = 5;

-	public Object[] getChildren();

-	int getFolderId();

-}


diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/LibraryPropertySource.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/LibraryPropertySource.java
deleted file mode 100644
index 6c146fc..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/LibraryPropertySource.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 Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.pde.internal.runtime.registry;

-

-import java.util.Vector;

-

-import org.eclipse.core.runtime.ILibrary;

-import org.eclipse.pde.internal.runtime.PDERuntimeMessages;

-import org.eclipse.ui.views.properties.*;

-

-public class LibraryPropertySource extends RegistryPropertySource {

-	private ILibrary library;

-	public static final String P_PATH = "path"; //$NON-NLS-1$

-	public static final String P_EXPORTED = "exported"; //$NON-NLS-1$

-	public static final String P_FULLY_EXPORTED = "fully_exported"; //$NON-NLS-1$

-

-public LibraryPropertySource(ILibrary library) {

-	this.library = library;

-}

-public IPropertyDescriptor[] getPropertyDescriptors() {

-	Vector result = new Vector();

-

-	result.addElement(new PropertyDescriptor(P_PATH, PDERuntimeMessages.RegistryView_libraryPR_path));

-	result.addElement(new PropertyDescriptor(P_EXPORTED, PDERuntimeMessages.RegistryView_libraryPR_exported));

-	result.addElement(new PropertyDescriptor(P_FULLY_EXPORTED, PDERuntimeMessages.RegistryView_libraryPR_fullyExported));

-	return toDescriptorArray(result);

-}

-public Object getPropertyValue(Object name) {

-	if (name.equals(P_PATH))

-		return library.getPath().toString();

-	if (name.equals(P_EXPORTED))

-		return library.isExported()?"true":"false"; //$NON-NLS-1$ //$NON-NLS-2$

-	if (name.equals(P_FULLY_EXPORTED))

-		return library.isFullyExported()?"true":"false"; //$NON-NLS-1$ //$NON-NLS-2$

-	return null;

-}

-}


diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/ParentAdapter.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/ParentAdapter.java
deleted file mode 100644
index 5f18690..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/ParentAdapter.java
+++ /dev/null

@@ -1,24 +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 Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.pde.internal.runtime.registry;

-

-public abstract class ParentAdapter extends PluginObjectAdapter {

-	Object [] children;

-

-public ParentAdapter(Object object) {

-	super(object);

-}

-protected abstract Object[] createChildren();

-public Object[] getChildren() {

-	if (children==null) children = createChildren();

-	return children;

-}

-}


diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/PluginObjectAdapter.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/PluginObjectAdapter.java
deleted file mode 100644
index 85108bc..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/PluginObjectAdapter.java
+++ /dev/null

@@ -1,24 +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 Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.pde.internal.runtime.registry;

-

-import org.eclipse.core.runtime.PlatformObject;

-

-public class PluginObjectAdapter extends PlatformObject {

-	private Object object;

-

-public PluginObjectAdapter(Object object) {

-	this.object = object;

-}

-public Object getObject() {

-	return object;

-}

-}


diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/PluginPropertySource.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/PluginPropertySource.java
deleted file mode 100644
index f44ead7..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/PluginPropertySource.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 Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.pde.internal.runtime.registry;

-

-import java.util.Vector;

-

-import org.eclipse.core.runtime.IPluginDescriptor;

-import org.eclipse.pde.internal.runtime.PDERuntimeMessages;

-import org.eclipse.ui.views.properties.*;

-

-public class PluginPropertySource extends RegistryPropertySource {

-	private IPluginDescriptor pd;

-	public static final String P_INSTALL_URL="installURL"; //$NON-NLS-1$

-	public static final String P_NAME = "name"; //$NON-NLS-1$

-	public static final String P_ID = "id"; //$NON-NLS-1$

-	public static final String P_PROVIDER = "provider"; //$NON-NLS-1$

-	public static final String P_VERSION = "version"; //$NON-NLS-1$

-	public static final String P_ACTIVATED = "activated"; //$NON-NLS-1$

-	public PluginPropertySource(IPluginDescriptor pd) {

-	this.pd = pd;

-}

-public IPropertyDescriptor[] getPropertyDescriptors() {

-	Vector result = new Vector();

-

-	result.addElement(new PropertyDescriptor(P_INSTALL_URL, PDERuntimeMessages.RegistryView_pluginPR_installURL));

-	result.addElement(new PropertyDescriptor(P_NAME, PDERuntimeMessages.RegistryView_pluginPR_name));

-	result.addElement(new PropertyDescriptor(P_ID, PDERuntimeMessages.RegistryView_pluginPR_id));

-	result.addElement(new PropertyDescriptor(P_PROVIDER, PDERuntimeMessages.RegistryView_pluginPR_providerName));

-	result.addElement(new PropertyDescriptor(P_VERSION, PDERuntimeMessages.RegistryView_pluginPR_version));

-	result.addElement(new PropertyDescriptor(P_ACTIVATED, PDERuntimeMessages.RegistryView_pluginPR_activated));

-	return toDescriptorArray(result);

-}

-public Object getPropertyValue(Object name) {

-	if (name.equals(P_INSTALL_URL))

-		return pd.getInstallURL();

-	if (name.equals(P_NAME))

-		return pd.getLabel();

-	if (name.equals(P_ID))

-		return pd.getUniqueIdentifier();

-	if (name.equals(P_PROVIDER))

-		return pd.getProviderName();

-	if (name.equals(P_VERSION))

-		return pd.getVersionIdentifier();

-	if (name.equals(P_ACTIVATED))

-		return pd.isPluginActivated() ? "true" : "false"; //$NON-NLS-1$ //$NON-NLS-2$

-	return null;

-}

-}


diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/PrerequisitePropertySource.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/PrerequisitePropertySource.java
deleted file mode 100644
index 64bcc90..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/PrerequisitePropertySource.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 Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.pde.internal.runtime.registry;

-

-import java.util.Vector;

-

-import org.eclipse.core.runtime.IPluginPrerequisite;

-import org.eclipse.pde.internal.runtime.PDERuntimeMessages;

-import org.eclipse.ui.views.properties.*;

-

-public class PrerequisitePropertySource extends RegistryPropertySource {

-	private IPluginPrerequisite prereq;

-	public static final String P_ID = "id"; //$NON-NLS-1$

-	public static final String P_VERSION = "version"; //$NON-NLS-1$

-	public static final String P_EXPORTED = "exported"; //$NON-NLS-1$

-	public static final String P_MATCH = "match"; //$NON-NLS-1$

-	public static final String P_OPTIONAL = "optional"; //$NON-NLS-1$

-	public PrerequisitePropertySource(IPluginPrerequisite prereq) {

-		this.prereq = prereq;

-	}

-	public IPropertyDescriptor[] getPropertyDescriptors() {

-		Vector result = new Vector();

-

-		result.addElement(

-			new PropertyDescriptor(

-				P_EXPORTED,

-				PDERuntimeMessages.RegistryView_prerequisitePR_exported));

-		result.addElement(

-			new PropertyDescriptor(

-				P_ID,

-				PDERuntimeMessages.RegistryView_prerequisitePR_id));

-		result.addElement(

-			new PropertyDescriptor(

-				P_VERSION,

-				PDERuntimeMessages.RegistryView_prerequisitePR_version));

-		result.addElement(

-			new PropertyDescriptor(

-				P_MATCH,

-				PDERuntimeMessages.RegistryView_prerequisitePR_match));

-		result.addElement(

-			new PropertyDescriptor(

-				P_OPTIONAL,

-				PDERuntimeMessages.RegistryView_prerequisitePR_optional));

-		return toDescriptorArray(result);

-		

-	}

-

-	public Object getPropertyValue(Object name) {

-		if (name.equals(P_ID))

-			return prereq.getUniqueIdentifier();

-

-		if (name.equals(P_EXPORTED))

-			return prereq.isExported() ? "true" : "false"; //$NON-NLS-1$ //$NON-NLS-2$

-

-		if (name.equals(P_VERSION)) {

-			Object version = prereq.getVersionIdentifier();

-			return version != null ? version.toString() : ""; //$NON-NLS-1$

-		}

-

-		if (name.equals(P_OPTIONAL))

-			return prereq.isOptional() ? "true" : "false"; //$NON-NLS-1$ //$NON-NLS-2$

-

-		if (name.equals(P_MATCH)) {

-			if (prereq.isMatchedAsCompatible())

-				return PDERuntimeMessages.RegistryView_prerequisitePR_matchedCompatible;

-			if (prereq.isMatchedAsEquivalent())

-				return PDERuntimeMessages.RegistryView_prerequisitePR_matchedEquivalent;

-			if (prereq.isMatchedAsExact())

-				return PDERuntimeMessages.RegistryView_prerequisitePR_matchedExact;

-			if (prereq.isMatchedAsGreaterOrEqual())

-				return PDERuntimeMessages.RegistryView_prerequisitePR_matchedGreaterOrEqual;

-			if (prereq.isMatchedAsPerfect())

-				return PDERuntimeMessages.RegistryView_prerequisitePR_matchedPerfect;

-		}

-		return ""; //$NON-NLS-1$

-	}

-}


diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowser.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowser.java
deleted file mode 100644
index 396a957..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowser.java
+++ /dev/null

@@ -1,434 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2004 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.pde.internal.runtime.registry;

-import org.eclipse.core.runtime.*;

-import org.eclipse.jface.action.*;

-import org.eclipse.jface.viewers.*;

-import org.eclipse.pde.internal.runtime.*;

-import org.eclipse.swt.*;

-import org.eclipse.swt.custom.*;

-import org.eclipse.swt.layout.*;

-import org.eclipse.swt.widgets.*;

-import org.eclipse.ui.*;

-import org.eclipse.ui.part.*;

-import org.eclipse.ui.views.properties.*;

-import org.osgi.framework.*;

-public class RegistryBrowser extends ViewPart 

-							 implements BundleListener, IRegistryChangeListener {

-	

-	public static final String SHOW_RUNNING_PLUGINS = "RegistryView.showRunning.label"; //$NON-NLS-1$

-	public static final String REGISTRY_ORIENTATION = "RegistryView.orientation"; //$NON-NLS-1$

-	public static final int VERTICAL_ORIENTATION = 1;

-	public static final int HORIZONTAL_ORIENTATION = 2;

-	public static final int SINGLE_PANE_ORIENTATION = 3;

-	

-	private TreeViewer treeViewer;

-	private IMemento memento;

-	private static int orientation;

-	private int[] horizontalSashWeight;

-	private int[] verticalSashWeight;

-	private static final int[] DEFAULT_SASH_WEIGHTS = {13, 6};

-	

-	// menus and action items

-	private Action refreshAction;

-	private Action showPluginsAction;

-	private Action collapseAllAction;

-	private Action[] toggleViewAction;

-	private DrillDownAdapter drillDownAdapter;

-	

-	//attributes view

-	private SashForm fSashForm;

-	private PropertySheetPage fPropertySheet;

-	

-	// single-pane control

-	private Composite mainView;

-	

-	/*

-	 * customized DrillDownAdapter which modifies enabled state of showing active/inactive

-	 * plug-ins action - see Bug 58467

-	 */

-	class RegistryDrillDownAdapter extends DrillDownAdapter{

-		public RegistryDrillDownAdapter(TreeViewer tree){

-			super(tree);

-		}

-

-		public void goInto() {

-			super.goInto();

-			showPluginsAction.setEnabled(!canGoHome());

-		}

-

-		public void goBack() {

-			super.goBack();

-			showPluginsAction.setEnabled(!canGoHome());

-		}

-

-		public void goHome() {

-			super.goHome();

-			showPluginsAction.setEnabled(!canGoHome());

-		}

-

-		public void goInto(Object newInput) {

-			super.goInto(newInput);

-			showPluginsAction.setEnabled(!canGoHome());

-		}

-	}

-	public RegistryBrowser() {

-		super();

-	}

-	

-	public void init(IViewSite site, IMemento memento) throws PartInitException {

-		super.init(site, memento);

-		if (memento == null)

-			this.memento = XMLMemento.createWriteRoot("REGISTRYVIEW"); //$NON-NLS-1$

-		else

-			this.memento = memento;

-		initializeMemento();

-		orientation = this.memento.getInteger(REGISTRY_ORIENTATION).intValue();

-	}

-	

-	private void initializeMemento() {

-		// show all plug-ins by default (i.e. not just activated ones)

-		if (memento.getString(SHOW_RUNNING_PLUGINS) == null)

-			memento.putString(SHOW_RUNNING_PLUGINS, "false"); //$NON-NLS-1$

-		if (memento.getInteger(REGISTRY_ORIENTATION) == null)

-			memento.putInteger(REGISTRY_ORIENTATION, HORIZONTAL_ORIENTATION);

-	}

-	

-	public void dispose() {

-		Platform.getExtensionRegistry().removeRegistryChangeListener(this);

-		PDERuntimePlugin.getDefault().getBundleContext().removeBundleListener(

-				this);

-		super.dispose();

-	}

-	

-	public void createPartControl(Composite parent) {

-		// create the sash form that will contain the tree viewer & text viewer

-		fSashForm = new SashForm(parent, SWT.HORIZONTAL);

-		fSashForm.setLayout(new GridLayout());

-		fSashForm.setLayoutData(new GridData(GridData.FILL_BOTH));

-		setSashForm(fSashForm);

-		makeActions();

-		createTreeViewer();

-		createAttributesViewer();

-		fillToolBar();

-		treeViewer.refresh();

-		setViewOrientation(orientation);

-		setContentDescription(((RegistryBrowserContentProvider)treeViewer.getContentProvider()).getTitleSummary());

-		

-		Platform.getExtensionRegistry().addRegistryChangeListener(this);

-		PDERuntimePlugin.getDefault().getBundleContext().addBundleListener(this);

-	}

-	private void createTreeViewer() {

-		mainView = new Composite(getSashForm(), SWT.NONE);

-		GridLayout layout = new GridLayout();

-		layout.marginHeight = layout.marginWidth = 0;

-		mainView.setLayout(layout);

-		mainView.setLayoutData(new GridData(GridData.FILL_BOTH));	

-		

-		Tree tree = new Tree(mainView, SWT.FLAT);

-		GridData gd = new GridData(GridData.FILL_BOTH);

-		tree.setLayoutData(gd);

-		treeViewer = new TreeViewer(tree);

-		boolean showRunning = memento.getString(SHOW_RUNNING_PLUGINS).equals("true") ? true : false; //$NON-NLS-1$

-		treeViewer.setContentProvider(new RegistryBrowserContentProvider(treeViewer, showRunning));

-		treeViewer

-		.setLabelProvider(new RegistryBrowserLabelProvider(treeViewer));

-		treeViewer.setUseHashlookup(true);

-		treeViewer.setSorter(new ViewerSorter() {

-		});

-		treeViewer.setInput(new PluginObjectAdapter(Platform.getPluginRegistry()));

-		treeViewer.addSelectionChangedListener(new ISelectionChangedListener() {

-			public void selectionChanged(SelectionChangedEvent event) {

-				Object selection = ((IStructuredSelection) event.getSelection())

-				.getFirstElement();

-				updateAttributesView(selection);

-			}

-		});

-		treeViewer.addDoubleClickListener(new IDoubleClickListener() {

-			public void doubleClick(DoubleClickEvent event) {

-				Object selection = ((IStructuredSelection) event.getSelection())

-				.getFirstElement();

-				updateAttributesView(selection);

-				if (selection != null && treeViewer.isExpandable(selection))

-					treeViewer.setExpandedState(selection, !treeViewer

-							.getExpandedState(selection));

-			}

-		});

-		

-		PlatformUI.getWorkbench().getHelpSystem().setHelp(treeViewer.getControl(),

-				IHelpContextIds.REGISTRY_VIEW);

-		

-		getViewSite().setSelectionProvider(treeViewer);

-		

-		MenuManager popupMenuManager = new MenuManager();

-		IMenuListener listener = new IMenuListener() {

-			public void menuAboutToShow(IMenuManager mng) {

-				fillContextMenu(mng);

-			}

-		};

-		popupMenuManager.setRemoveAllWhenShown(true);

-		popupMenuManager.addMenuListener(listener);

-		Menu menu = popupMenuManager.createContextMenu(tree);

-		tree.setMenu(menu);

-	}

-	/* 

-	 * add attributes viewer 

-	 */

-	protected void createAttributesViewer() {

-		Composite composite = new Composite(getSashForm(), SWT.FLAT);

-		GridLayout layout = new GridLayout();

-		layout.marginWidth = layout.marginHeight = 0;

-		layout.numColumns = 2;

-		layout.makeColumnsEqualWidth = false;

-		composite.setLayout(layout);

-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));

-		

-		createPropertySheet(composite);

-	}	

-	/*

-	 * add property sheet

-	 */

-	protected void createPropertySheet(Composite parent) {

-		Composite composite = new Composite(parent, SWT.NONE);

-		GridLayout layout = new GridLayout();

-		layout.marginWidth = layout.marginHeight = 0;

-		composite.setLayout(layout);

-		GridData gd = new GridData(GridData.FILL_BOTH);

-		gd.horizontalSpan = 2;

-		composite.setLayoutData(gd);

-		fPropertySheet = new PropertySheetPage();

-		fPropertySheet.createControl(composite);

-		gd = new GridData(GridData.FILL_BOTH);

-		fPropertySheet.getControl().setLayoutData(gd);

-		fPropertySheet.makeContributions(new MenuManager(),

-				new ToolBarManager(), null);

-	}

-	private void fillToolBar(){

-		drillDownAdapter = new RegistryDrillDownAdapter(treeViewer);

-		IActionBars bars = getViewSite().getActionBars();

-		IToolBarManager mng = bars.getToolBarManager();

-		drillDownAdapter.addNavigationActions(mng);

-		mng.add(refreshAction);

-		mng.add(new Separator());

-		mng.add(collapseAllAction);

-		IMenuManager mgr = bars.getMenuManager();

-		mgr.add(toggleViewAction[0]);

-		mgr.add(toggleViewAction[1]);

-		mgr.add(toggleViewAction[2]);

-		mgr.add(new Separator());

-		mgr.add(showPluginsAction);

-	}

-	public void fillContextMenu(IMenuManager manager) {

-		manager.add(refreshAction);

-		manager.add(new Separator());

-		drillDownAdapter.addNavigationActions(manager);

-		manager.add(new Separator());

-		manager.add(showPluginsAction);

-	}

-	public TreeViewer getTreeViewer() {

-		return treeViewer;

-	}

-	protected SashForm getSashForm() {

-		return fSashForm;

-	}

-	public void saveState(IMemento memento) {

-		if (memento == null || this.memento == null || treeViewer == null)

-			return;

-		boolean showRunning = ((RegistryBrowserContentProvider) treeViewer

-				.getContentProvider()).isShowRunning();

-		if (showRunning)

-			this.memento.putString(SHOW_RUNNING_PLUGINS, "true"); //$NON-NLS-1$

-		else

-			this.memento.putString(SHOW_RUNNING_PLUGINS, "false"); //$NON-NLS-1$

-		this.memento.putInteger(REGISTRY_ORIENTATION, orientation);

-		memento.putMemento(this.memento);

-	}

-	

-	public void updateAttributesView(Object selection) {

-		if (selection != null)

-			fPropertySheet.selectionChanged(null, new StructuredSelection(

-					selection));

-		else

-			fPropertySheet.selectionChanged(null, new StructuredSelection(

-					new Object()));

-	}

-	

-	private void setSashForm(SashForm sashForm) {

-		fSashForm = sashForm;

-	}

-	public void setFocus() {

-		treeViewer.getTree().setFocus();

-	}

-	

-	/*

-	 * @see org.osgi.framework.BundleListener#bundleChanged(org.osgi.framework.BundleEvent)

-	 */

-	public void bundleChanged(BundleEvent event) {

-		if (treeViewer == null)

-			return;

-		Tree tree = treeViewer.getTree();

-		if (tree.isDisposed())

-			return;

-		

-		final RegistryBrowserContentProvider provider = ((RegistryBrowserContentProvider) treeViewer.getContentProvider());

-		final IPluginDescriptor descriptor = Platform.getPluginRegistry().getPluginDescriptor(event.getBundle().getSymbolicName());

-		if (descriptor == null)

-			return;

-		final PluginObjectAdapter adapter = new PluginObjectAdapter(descriptor);

-		tree.getDisplay().asyncExec(new Runnable() {

-			public void run() {

-				if (treeViewer == null || treeViewer.getTree() == null || treeViewer.getTree().isDisposed())

-					return;

-				TreeItem[] items = treeViewer.getTree().getItems();

-				if (items != null) {

-					for (int i = 0; i < items.length; i++) {

-						PluginObjectAdapter plugin = (PluginObjectAdapter) items[i].getData();

-						if (plugin != null) {

-							Object object = plugin.getObject();

-							if (object instanceof IPluginDescriptor) {

-								IPluginDescriptor desc = (IPluginDescriptor) object;

-								if (desc.equals(descriptor)) {

-									treeViewer.remove(plugin);

-									break;

-								}

-							}

-						}

-					}

-				}

-				if (provider.isShowRunning() && !descriptor.isPluginActivated())

-					return;

-				treeViewer.add(treeViewer.getInput(), adapter);

-				updateTitle();

-			}

-		});

-	}

-	/*

-	 * @see org.eclipse.core.runtime.IRegistryChangeListener#registryChanged(org.eclipse.core.runtime.IRegistryChangeEvent)

-	 */

-	public void registryChanged(IRegistryChangeEvent event) {

-		final IExtensionDelta[] deltas = event.getExtensionDeltas();

-		treeViewer.getTree().getDisplay().syncExec(new Runnable() {

-			public void run() {

-				for (int i = 0; i < deltas.length; i++) {

-					IExtension ext = deltas[i].getExtension();

-					IExtensionPoint extPoint = deltas[i].getExtensionPoint();

-					IPluginDescriptor descriptor = extPoint.getDeclaringPluginDescriptor();

-					PluginObjectAdapter adapter = new PluginObjectAdapter(

-							descriptor);

-					if (deltas[i].getKind() == IExtensionDelta.ADDED) {

-						if (ext != null)

-							treeViewer.add(adapter, ext);

-						if (extPoint != null)

-							treeViewer.add(adapter, extPoint);

-					} else {

-						if (ext != null)

-							treeViewer.remove(ext);

-						if (extPoint != null)

-							treeViewer.remove(extPoint);

-						treeViewer.refresh();

-					}

-				}

-				updateTitle();

-			}

-		});

-	}

-	/*

-	 * toolbar and context menu actions

-	 */

-	public void makeActions() {

-		refreshAction = new Action("refresh") { //$NON-NLS-1$

-			public void run() {

-				BusyIndicator.showWhile(treeViewer.getTree().getDisplay(),

-						new Runnable() {

-					public void run() {

-						treeViewer.refresh();

-					}

-				});

-			}

-		};

-		refreshAction.setText(PDERuntimeMessages.RegistryView_refresh_label);

-		refreshAction.setToolTipText(PDERuntimeMessages.RegistryView_refresh_tooltip);

-		refreshAction.setImageDescriptor(PDERuntimePluginImages.DESC_REFRESH);

-		refreshAction

-		.setDisabledImageDescriptor(PDERuntimePluginImages.DESC_REFRESH_DISABLED);

-		

-		showPluginsAction = new Action(PDERuntimeMessages.RegistryView_showRunning_label){

-			public void run(){

-				((RegistryBrowserContentProvider) treeViewer.getContentProvider())

-			.setShowRunning(showPluginsAction.isChecked());

-				treeViewer.refresh();

-				updateTitle();

-			}

-		};

-		showPluginsAction.setChecked(memento.getString(SHOW_RUNNING_PLUGINS).equals("true")); //$NON-NLS-1$

-		

-		collapseAllAction = new Action("collapseAll"){ //$NON-NLS-1$

-			public void run(){

-				treeViewer.collapseAll();

-			}

-		};

-		collapseAllAction.setText(PDERuntimeMessages.RegistryView_collapseAll_label);

-		collapseAllAction.setImageDescriptor(PDERuntimePluginImages.DESC_COLLAPSE_ALL);

-		collapseAllAction.setToolTipText(PDERuntimeMessages.RegistryView_collapseAll_tooltip);

-		

-		toggleViewAction = new TogglePropertiesAction[3];

-		toggleViewAction[0] = new TogglePropertiesAction(this, VERTICAL_ORIENTATION);

-		toggleViewAction[1] = new TogglePropertiesAction(this, HORIZONTAL_ORIENTATION);

-		toggleViewAction[2] = new TogglePropertiesAction(this, SINGLE_PANE_ORIENTATION);

-		if (orientation == VERTICAL_ORIENTATION)

-			toggleViewAction[0].setChecked(true);

-		else if (orientation == HORIZONTAL_ORIENTATION)

-			toggleViewAction[1].setChecked(true);

-		else

-			toggleViewAction[2].setChecked(true);

-	}

-

-	/*

-	 * orientation and properties display handler

-	 */

-	protected void setLastSashWeights(int[] weights) {

-		if (orientation == HORIZONTAL_ORIENTATION)

-			horizontalSashWeight = weights;

-		else if (orientation == VERTICAL_ORIENTATION)

-			verticalSashWeight = weights;

-	}

-	

-	public void setViewOrientation(int viewOrientation){

-		setLastSashWeights(getSashForm().getWeights());

-		if (viewOrientation == SINGLE_PANE_ORIENTATION){

-			getSashForm().setMaximizedControl(mainView);

-		} else {

-			if (viewOrientation == VERTICAL_ORIENTATION)

-				getSashForm().setOrientation(SWT.VERTICAL);

-			else

-				getSashForm().setOrientation(SWT.HORIZONTAL);

-			getSashForm().setMaximizedControl(null);

-			getSashForm().setWeights(getLastSashWeights(viewOrientation));

-		}

-		orientation = viewOrientation;

-	}

-	protected int[] getLastSashWeights(int viewOrientation) {

-		if (viewOrientation == HORIZONTAL_ORIENTATION){

-			if (horizontalSashWeight == null) 

-				horizontalSashWeight = DEFAULT_SASH_WEIGHTS;

-			return horizontalSashWeight;

-		} 

-		if (verticalSashWeight == null)

-			verticalSashWeight = DEFAULT_SASH_WEIGHTS;

-		return verticalSashWeight;

-	}

-	

-	public void updateTitle(){

-		if (treeViewer == null || treeViewer.getContentProvider() == null)

-			return;

-		setContentDescription(((RegistryBrowserContentProvider)treeViewer.getContentProvider()).getTitleSummary());

-	}

-}


diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowserContentProvider.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowserContentProvider.java
deleted file mode 100644
index b0a707a..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowserContentProvider.java
+++ /dev/null

@@ -1,247 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2004 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.pde.internal.runtime.registry;

-import java.util.*;

-

-import org.eclipse.core.runtime.*;

-import org.eclipse.jface.viewers.*;

-import org.eclipse.osgi.util.*;

-import org.eclipse.pde.internal.runtime.*;

-import org.osgi.framework.*;

-public class RegistryBrowserContentProvider

-		implements

-			org.eclipse.jface.viewers.ITreeContentProvider {

-	private Hashtable pluginMap = new Hashtable();

-	private boolean showRunning;

-	public boolean isInExtensionSet;

-	private TreeViewer viewer;

-	private int numPluginsTotal;

-

-	

-	class PluginFolder implements IPluginFolder {

-		private int id;

-		IPluginDescriptor pd;

-		private Object[] children;

-		public PluginFolder(IPluginDescriptor pd, int id) {

-			this.pd = pd;

-			this.id = id;

-		}

-		public IPluginDescriptor getPluginDescriptor() {

-			return pd;

-		}

-		public Object[] getChildren() {

-			if (children == null)

-				children = getFolderChildren(pd, id);

-			return children;

-		}

-		public int getFolderId() {

-			return id;

-		}

-		public Object getAdapter(Class key) {

-			return null;

-		}

-	}

-	

-	public RegistryBrowserContentProvider(TreeViewer viewer, boolean showRunning){

-		super();

-		this.viewer = viewer;

-		this.showRunning = showRunning;

-		this.numPluginsTotal = 0;

-	}

-	protected PluginObjectAdapter createAdapter(Object object, int id) {

-		if (id == IPluginFolder.F_EXTENSIONS)

-			return new ExtensionAdapter(object);

-		if (id == IPluginFolder.F_EXTENSION_POINTS)

-			return new ExtensionPointAdapter(object);

-		return new PluginObjectAdapter(object);

-	}

-	protected Object[] createPluginFolders(IPluginDescriptor pd) {

-		Object[] array = new Object[4];

-		array[0] = new PluginFolder(pd, IPluginFolder.F_IMPORTS);

-		array[1] = new PluginFolder(pd, IPluginFolder.F_LIBRARIES);

-		array[2] = new PluginFolder(pd, IPluginFolder.F_EXTENSION_POINTS);

-		array[3] = new PluginFolder(pd, IPluginFolder.F_EXTENSIONS);

-		return array;

-	}

-	public void dispose() {

-	}

-	public Object[] getElements(Object element) {

-		return getChildren(element);

-	}

-	public Object[] getChildren(Object element) {

-		if (element == null)

-			return null;

-		

-		if (element instanceof ExtensionAdapter) {

-			return ((ExtensionAdapter) element).getChildren();

-		}

-		isInExtensionSet = false;

-		if (element instanceof ExtensionPointAdapter) {

-			return ((ExtensionPointAdapter) element).getChildren();

-//			return getNonDuplicateLabelChildren(element);

-		}

-		if (element instanceof ConfigurationElementAdapter) {

-			return ((ConfigurationElementAdapter) element).getChildren();

-		}

-		if (element instanceof PluginObjectAdapter)

-			element = ((PluginObjectAdapter) element).getObject();

-		if (element.equals(Platform.getPluginRegistry())) {

-			Object[] plugins = getPlugins(Platform.getPluginRegistry());

-			

-			if (plugins == null){

-				numPluginsTotal = 0;

-				return new Object[0];

-			}

-			numPluginsTotal = plugins.length;

-			

-			if (showRunning){

-				ArrayList resultList = new ArrayList();

-				for (int i = 0; i < plugins.length; i++) {

-					if (plugins[i] instanceof PluginObjectAdapter) {

-						Object object = ((PluginObjectAdapter) plugins[i])

-								.getObject();

-						if (object instanceof IPluginDescriptor && ((IPluginDescriptor) object).isPluginActivated())

-							resultList.add(plugins[i]);

-					}

-				}

-				return resultList.toArray(new Object[resultList.size()]);

-			}

-			return plugins;

-		}

-		if (element instanceof IPluginDescriptor) {

-			IPluginDescriptor desc = (IPluginDescriptor) element;

-			Object[] folders = (Object[]) pluginMap.get(desc

-					.getUniqueIdentifier());

-			if (folders == null) {

-				folders = createPluginFolders(desc);

-				pluginMap.put(desc.getUniqueIdentifier(), folders);

-			} else {

-				ArrayList folderList = new ArrayList();

-				for (int i = 0; i<folders.length; i++){

-					if (folders[i] != null && ((IPluginFolder)folders[i]).getChildren() != null)

-						folderList.add(folders[i]);

-				}

-				folders = folderList.toArray(new Object[folderList.size()]);

-			}

-			return folders;

-		}

-		if (element instanceof IPluginFolder) {

-			IPluginFolder folder = (IPluginFolder) element;

-			isInExtensionSet = folder.getFolderId() == 1;

-			return ((IPluginFolder) element).getChildren();

-//			return getNonDuplicateLabelChildren(folder);

-		}

-		if (element instanceof IConfigurationElement) {

-			return ((IConfigurationElement) element).getChildren();

-		}

-		return null;

-	}

-	public Object[] getNonDuplicateLabelChildren(Object element) {

-		ArrayList extList = new ArrayList();

-		ArrayList labelList = new ArrayList();

-		if (element instanceof IPluginFolder){

-			Object[] children = ((IPluginFolder)element).getChildren();

-			if (children != null && isInExtensionSet){

-				for (int i = 0; i<children.length; i++){

-					IExtension ext = (IExtension)((ExtensionAdapter)children[i]).getObject();

-					String label = ((RegistryBrowserLabelProvider)viewer.getLabelProvider()).getText(ext);

-					if (label == null || label.length() ==0)

-						continue;

-					if (!labelList.contains(label)){

-						labelList.add(label);

-						extList.add(children[i]);

-					}

-				}

-				return extList.toArray(new Object[extList.size()]);

-			}

-			return children;

-		} else if (element instanceof ExtensionPointAdapter){

-			Object[] children = ((ExtensionPointAdapter) element).getChildren();

-			if (children!=null){

-				for (int i =0; i<children.length; i++){

-					String label = ((RegistryBrowserLabelProvider)viewer.getLabelProvider()).getText(children[i]);

-					if (label == null || label.length() ==0)

-						continue;

-					if (!labelList.contains(label)){

-						labelList.add(label);

-						extList.add(children[i]);

-					}

-				}

-				return extList.toArray(new Object[extList.size()]);

-			}

-			return children;

-		}

-		return new Object[0];

-	}

-	public Object[] getPlugins(IPluginRegistry registry) {

-		IPluginDescriptor[] descriptors = registry.getPluginDescriptors();

-		Object[] result = new Object[descriptors.length];

-		for (int i = 0; i < descriptors.length; i++) {

-			result[i] = new PluginObjectAdapter(descriptors[i]);

-		}

-		return result;

-	}

-	private Object[] getFolderChildren(IPluginDescriptor pd, int id) {

-		Object[] array = null;

-		switch (id) {

-			case IPluginFolder.F_EXTENSIONS :

-				array = pd.getExtensions();

-				break;

-			case IPluginFolder.F_EXTENSION_POINTS :

-				array = pd.getExtensionPoints();

-				break;

-			case IPluginFolder.F_IMPORTS :

-				array = pd.getPluginPrerequisites();

-				break;

-			case IPluginFolder.F_LIBRARIES :

-				array = pd.getRuntimeLibraries();

-				try {

-					if (array == null || array.length == 0){

-						Object classpath = Platform.getBundle(pd.getUniqueIdentifier()).getHeaders().get(Constants.BUNDLE_CLASSPATH);

-						return classpath == null ? null : ManifestElement.parseHeader(Constants.BUNDLE_CLASSPATH, classpath.toString());

-					}

-				} catch (BundleException e) {

-				} 

-				break;

-		}

-		Object[] result = null;

-		if (array != null && array.length > 0) {

-			result = new Object[array.length];

-			for (int i = 0; i < array.length; i++) {

-				result[i] = createAdapter(array[i], id);

-			}

-		}

-		return result;

-	}

-	public Object getParent(Object element) {

-		return null;

-	}

-	public boolean hasChildren(Object element) {

-		Object[] children = getChildren(element);

-		return children != null && children.length > 0;

-	}

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-	}

-	public void setShowRunning(boolean showRunning){

-		this.showRunning = showRunning;

-	}

-	public boolean isShowRunning(){

-		return showRunning;

-	}

-	

-	public String getTitleSummary(){

-		if (viewer == null || viewer.getTree() == null)

-			return NLS.bind(PDERuntimeMessages.RegistryView_titleSummary, (new String[] {"0", "0"})); //$NON-NLS-1$ //$NON-NLS-2$

-		

-		return NLS.bind(PDERuntimeMessages.RegistryView_titleSummary, (new String[] {new Integer(viewer.getTree().getItemCount()).toString(), new Integer(numPluginsTotal).toString()}));

-	}

-	

-}


diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowserLabelProvider.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowserLabelProvider.java
deleted file mode 100644
index 0db0cc9..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowserLabelProvider.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 Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.pde.internal.runtime.registry;

-

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.IExtension;

-import org.eclipse.core.runtime.IExtensionPoint;

-import org.eclipse.core.runtime.ILibrary;

-import org.eclipse.core.runtime.IPluginDescriptor;

-import org.eclipse.core.runtime.IPluginPrerequisite;

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.jface.viewers.LabelProvider;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.osgi.util.ManifestElement;

-import org.eclipse.pde.internal.runtime.OverlayIcon;

-import org.eclipse.pde.internal.runtime.PDERuntimeMessages;

-import org.eclipse.pde.internal.runtime.PDERuntimePluginImages;

-import org.eclipse.swt.graphics.Image;

-

-public class RegistryBrowserLabelProvider extends LabelProvider {

-	private Image pluginImage;

-	private Image activePluginImage;

-	private Image libraryImage;

-	private Image runtimeImage;

-	private Image genericTagImage;

-	private Image extensionImage;

-	private Image extensionsImage;

-	private Image extensionPointImage;

-	private Image extensionPointsImage;

-	private Image requiresImage;

-	private Image reqPluginImage;

-	private TreeViewer viewer;

-	

-	public RegistryBrowserLabelProvider(TreeViewer viewer) {

-		this.viewer = viewer;

-		pluginImage = PDERuntimePluginImages.DESC_PLUGIN_OBJ.createImage();

-		reqPluginImage = PDERuntimePluginImages.DESC_REQ_PLUGIN_OBJ.createImage();

-		extensionPointImage = PDERuntimePluginImages.DESC_EXT_POINT_OBJ.createImage();

-		extensionPointsImage = PDERuntimePluginImages.DESC_EXT_POINTS_OBJ.createImage();

-		extensionImage = PDERuntimePluginImages.DESC_EXTENSION_OBJ.createImage();

-		extensionsImage = PDERuntimePluginImages.DESC_EXTENSIONS_OBJ.createImage();

-		requiresImage = PDERuntimePluginImages.DESC_REQ_PLUGINS_OBJ.createImage();

-		libraryImage = PDERuntimePluginImages.DESC_JAVA_LIB_OBJ.createImage();

-		genericTagImage = PDERuntimePluginImages.DESC_GENERIC_XML_OBJ.createImage();

-		runtimeImage = PDERuntimePluginImages.DESC_RUNTIME_OBJ.createImage();

-

-		ImageDescriptor activePluginDesc =

-			new OverlayIcon(

-				PDERuntimePluginImages.DESC_PLUGIN_OBJ,

-				new ImageDescriptor[][] { { PDERuntimePluginImages.DESC_RUN_CO }

-		});

-		activePluginImage = activePluginDesc.createImage();

-	}

-	public void dispose() {

-		pluginImage.dispose();

-		activePluginImage.dispose();

-		reqPluginImage.dispose();

-		extensionPointImage.dispose();

-		extensionPointsImage.dispose();

-		extensionImage.dispose();

-		extensionsImage.dispose();

-		requiresImage.dispose();

-		libraryImage.dispose();

-		genericTagImage.dispose();

-		runtimeImage.dispose();

-	}

-	public Image getImage(Object element) {

-		if (element instanceof PluginObjectAdapter)

-			element = ((PluginObjectAdapter) element).getObject();

-		if (element instanceof IPluginDescriptor) {

-			IPluginDescriptor pd = (IPluginDescriptor) element;

-			boolean active = pd.isPluginActivated();

-			return active ? activePluginImage : pluginImage;

-		}

-		if (element instanceof IPluginFolder) {

-			int id = ((IPluginFolder) element).getFolderId();

-			switch (id) {

-				case IPluginFolder.F_EXTENSIONS :

-					return extensionsImage;

-				case IPluginFolder.F_EXTENSION_POINTS :

-					return extensionPointsImage;

-				case IPluginFolder.F_IMPORTS :

-					return requiresImage;

-				case IPluginFolder.F_LIBRARIES :

-					return runtimeImage;

-			}

-			return null;

-		}

-		if (element instanceof IExtension) {

-			return extensionImage;

-		}

-		if (element instanceof IExtensionPoint) {

-			return extensionPointImage;

-		}

-		if (element instanceof IPluginPrerequisite) {

-			return reqPluginImage;

-		}

-		if (element instanceof ILibrary || element instanceof ManifestElement) {

-			return libraryImage;

-		}

-		if (element instanceof IConfigurationElement) {

-			return genericTagImage;

-		}

-		return null;

-	}

-	public String getText(Object element) {

-		if (element instanceof PluginObjectAdapter)

-			element = ((PluginObjectAdapter) element).getObject();

-		if (element instanceof IPluginDescriptor) {

-			return ((IPluginDescriptor)element).getUniqueIdentifier();

-		}

-		if (element instanceof IPluginFolder) {

-			switch (((IPluginFolder) element).getFolderId()) {

-				case IPluginFolder.F_IMPORTS :

-					return PDERuntimeMessages.RegistryView_folders_imports;

-				case IPluginFolder.F_LIBRARIES :

-					return PDERuntimeMessages.RegistryView_folders_libraries;

-				case IPluginFolder.F_EXTENSION_POINTS :

-					return PDERuntimeMessages.RegistryView_folders_extensionPoints;

-				case IPluginFolder.F_EXTENSIONS :

-					return PDERuntimeMessages.RegistryView_folders_extensions;

-			}

-		}

-		if (element instanceof IExtension) {

-			if (((RegistryBrowserContentProvider)viewer.getContentProvider()).isInExtensionSet)

-				return ((IExtension) element).getExtensionPointUniqueIdentifier();

-

-			IPluginDescriptor desc = ((IExtension) element).getDeclaringPluginDescriptor();

-			return "contributed by: "+ desc.getUniqueIdentifier(); //$NON-NLS-1$

-			

-		}

-		if (element instanceof IExtensionPoint) {

-			String pluginId = ((IExtensionPoint)element).getDeclaringPluginDescriptor().getUniqueIdentifier();//getParentIdentifier();

-			String extPointId = ((IExtensionPoint) element).getUniqueIdentifier();

-			return extPointId.substring(pluginId.length()+1);

-		}

-		if (element instanceof IPluginPrerequisite) {

-			return ((IPluginPrerequisite) element).getUniqueIdentifier();

-		}

-		if (element instanceof ILibrary) {

-			return ((ILibrary) element).getPath().toString();

-		}

-		if (element instanceof ManifestElement) {

-			return ((ManifestElement)element).getValue();

-		}

-		if (element instanceof IConfigurationElement) {

-			String label = ((IConfigurationElement) element).getAttribute("label"); //$NON-NLS-1$

-			if (label == null){

-				label = ((IConfigurationElement) element).getAttribute("name"); //$NON-NLS-1$

-			}

-			if (label == null && ((IConfigurationElement) element).getAttribute("id") != null){ //$NON-NLS-1$

-				String[] labelSplit = ((IConfigurationElement) element).getAttribute("id").split("\\."); //$NON-NLS-1$ //$NON-NLS-2$

-				label = labelSplit.length == 0 ? null: labelSplit[labelSplit.length-1];

-			} 

-			if (label == null){

-				label = ((IConfigurationElement) element).getName();

-			}

-				

-			return label;

-		}

-		return super.getText(element);

-	}

-}


diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryPropertySource.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryPropertySource.java
deleted file mode 100644
index 79ba33b..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryPropertySource.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 Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.pde.internal.runtime.registry;

-

-import java.util.Vector;

-

-import org.eclipse.ui.views.properties.*;

-

-public abstract class RegistryPropertySource implements IPropertySource {

-

-public Object getEditableValue() {

-	return null;

-}

-public IPropertyDescriptor[] getPropertyDescriptors() {

-	return null;

-}

-public boolean isPropertySet(Object id) {

-	return false;

-}

-public void resetPropertyValue(Object id) {}

-public void setPropertyValue(Object id, Object value) {}

-protected IPropertyDescriptor[] toDescriptorArray(Vector result) {

-	IPropertyDescriptor [] array = new IPropertyDescriptor[result.size()];

-	result.copyInto(array);

-	return array;

-}

-}


diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryPropertySourceFactory.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryPropertySourceFactory.java
deleted file mode 100644
index 338f83c..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryPropertySourceFactory.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 Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.pde.internal.runtime.registry;

-

-import org.eclipse.core.runtime.*;

-import org.eclipse.ui.views.properties.IPropertySource;

-

-public class RegistryPropertySourceFactory implements IAdapterFactory {

-

-public Object getAdapter(Object adaptableObject, Class adapterType) {

-	if (adapterType.equals(IPropertySource.class)) return getPropertySource(adaptableObject);

-	return null;

-}

-public java.lang.Class[] getAdapterList() {

-	return new Class[] { IPropertySource.class };

-}

-protected IPropertySource getPropertySource(Object sourceObject) {

-	if (sourceObject instanceof PluginObjectAdapter)

-		sourceObject = ((PluginObjectAdapter) sourceObject).getObject();

-	if (sourceObject instanceof IPluginDescriptor) {

-		return new PluginPropertySource((IPluginDescriptor) sourceObject);

-	}

-	if (sourceObject instanceof IExtension) {

-		return new ExtensionPropertySource((IExtension) sourceObject);

-	}

-	if (sourceObject instanceof IExtensionPoint) {

-		return new ExtensionPointPropertySource((IExtensionPoint) sourceObject);

-	}

-	if (sourceObject instanceof ILibrary) {

-		return new LibraryPropertySource((ILibrary) sourceObject);

-	}

-	if (sourceObject instanceof IConfigurationElement) {

-		return new ConfigurationElementPropertySource((IConfigurationElement) sourceObject);

-	}

-	if (sourceObject instanceof IPluginPrerequisite) {

-		return new PrerequisitePropertySource((IPluginPrerequisite) sourceObject);

-	}

-	return null;

-}

-}


diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/TogglePropertiesAction.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/TogglePropertiesAction.java
deleted file mode 100644
index 01f30ae..0000000
--- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/TogglePropertiesAction.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.runtime.registry;
-
-import org.eclipse.jface.action.*;
-import org.eclipse.pde.internal.runtime.*;
-
-
-/**
- * Action that controls the appearance of the details pane in debug views such
- * as the VariablesView and the ExpressionsView.  Instances of this class can be
- * created to show the detail pane underneath the main tree, to the right of the
- * main tree, or not shown at all.
- * 
- * @since 3.0
- */
-public class TogglePropertiesAction extends Action {
-	private RegistryBrowser fViewer;
-	private int fOrientation;
-
-	public TogglePropertiesAction(RegistryBrowser view, int orientation) {
-		super("", AS_RADIO_BUTTON); //$NON-NLS-1$
-		setRegistryBrowser(view);
-		setOrientation(orientation);
-				
-		if (orientation == RegistryBrowser.VERTICAL_ORIENTATION) {
-			setText(PDERuntimeMessages.RegistryView_verticalOrientation_label);  
-			setToolTipText(PDERuntimeMessages.RegistryView_verticalOrientation_tooltip);  
-			setDescription(PDERuntimeMessages.RegistryView_verticalOrientation_desc);  
-			setImageDescriptor(PDERuntimePluginImages.DESC_VERTICAL_VIEW);
-			setDisabledImageDescriptor(PDERuntimePluginImages.DESC_VERTICAL_VIEW_DISABLED);
-		} else if (orientation == RegistryBrowser.HORIZONTAL_ORIENTATION) {
-			setText(PDERuntimeMessages.RegistryView_horizontalOrientation_label);  
-			setToolTipText(PDERuntimeMessages.RegistryView_horizontalOrientation_tooltip);  
-			setDescription(PDERuntimeMessages.RegistryView_horizontalOrientation_desc);  
-			setImageDescriptor(PDERuntimePluginImages.DESC_HORIZONTAL_VIEW);
-			setDisabledImageDescriptor(PDERuntimePluginImages.DESC_HORIZONTAL_VIEW_DISABLED);
-		} else {
-			setText(PDERuntimeMessages.RegistryView_showPropertiesSheet_label);
-			setToolTipText(PDERuntimeMessages.RegistryView_showPropertiesSheet_tooltip);  
-			setDescription(PDERuntimeMessages.RegistryView_showPropertiesSheet_desc);  
-			setImageDescriptor(PDERuntimePluginImages.DESC_HIDE_PANE);
-		} 		
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() { // called when menu pressed
-		getRegistryBrowser().setViewOrientation(getOrientation()); 
-	}
-	
-	private RegistryBrowser getRegistryBrowser() {
-		return fViewer;
-	}
-
-	private void setRegistryBrowser(RegistryBrowser view) {
-		fViewer = view;
-	}
-
-	private void setOrientation(int orientation) {
-		fOrientation = orientation;
-	}
-
-	public int getOrientation() {
-		return fOrientation;
-	}
-}
-

diff --git a/ui/org.eclipse.pde.ui.tests/.classpath b/ui/org.eclipse.pde.ui.tests/.classpath
deleted file mode 100644
index d6f0551..0000000
--- a/ui/org.eclipse.pde.ui.tests/.classpath
+++ /dev/null

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="Macro Manager"/>
-	<classpathentry kind="src" path="Macro UI"/>
-	<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/ui/org.eclipse.pde.ui.tests/.cvsignore b/ui/org.eclipse.pde.ui.tests/.cvsignore
deleted file mode 100644
index 64a560c..0000000
--- a/ui/org.eclipse.pde.ui.tests/.cvsignore
+++ /dev/null

@@ -1,6 +0,0 @@
-bin
-build.xml
-tests.jar
-tests.jar.bin.log
-org.eclipse.pde.ui.tests_*
-temp.folder

diff --git a/ui/org.eclipse.pde.ui.tests/.project b/ui/org.eclipse.pde.ui.tests/.project
deleted file mode 100644
index 2d576be..0000000
--- a/ui/org.eclipse.pde.ui.tests/.project
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.pde.ui.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/ui/org.eclipse.pde.ui.tests/.settings/org.eclipse.jdt.core.prefs b/ui/org.eclipse.pde.ui.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 3f7af20..0000000
--- a/ui/org.eclipse.pde.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,39 +0,0 @@
-#Tue Sep 20 17:53:35 EDT 2005
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning

diff --git a/ui/org.eclipse.pde.ui.tests/.settings/org.eclipse.pde.prefs b/ui/org.eclipse.pde.ui.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index ff8433b..0000000
--- a/ui/org.eclipse.pde.ui.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null

@@ -1,14 +0,0 @@
-#Mon Nov 29 02:10:16 EST 2004

-compilers.p.unused-element-or-attribute=1

-compilers.p.unresolved-ex-points=0

-compilers.p.deprecated=2

-compilers.p.unknown-element=1

-compilers.p.unknown-resource=2

-compilers.p.unknown-class=1

-compilers.p.unknown-attribute=1

-compilers.p.no-required-att=0

-eclipse.preferences.version=1

-compilers.p.unresolved-import=0

-compilers.p.not-externalized-att=2

-compilers.p.illegal-att-value=1

-compilers.use-project=true


diff --git a/ui/org.eclipse.pde.ui.tests/META-INF/MANIFEST.MF b/ui/org.eclipse.pde.ui.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 1bc4b78..0000000
--- a/ui/org.eclipse.pde.ui.tests/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: PDE JUnit Tests
-Bundle-SymbolicName: org.eclipse.pde.ui.tests; singleton:=true
-Bundle-Version: 3.1.0
-Bundle-ClassPath: tests.jar
-Bundle-Activator: org.eclipse.pde.internal.ui.tests.macro.MacroPlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Require-Bundle: org.junit,
- org.eclipse.pde.ui,
- org.eclipse.ui,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.jdt.core,
- org.eclipse.test.performance,
- org.eclipse.ui.ide,
- org.eclipse.pde,
- org.eclipse.team.core,
- org.eclipse.jdt.ui,
- org.eclipse.jdt.launching
-Eclipse-LazyStart: true

diff --git a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/AbstractStructuredCommand.java b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/AbstractStructuredCommand.java
deleted file mode 100644
index 333fa4f..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/AbstractStructuredCommand.java
+++ /dev/null

@@ -1,225 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Hashtable;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.pde.internal.ui.tests.macro.MacroPlugin;
-import org.eclipse.swt.custom.*;
-import org.eclipse.swt.widgets.*;
-import org.w3c.dom.*;
-
-public abstract class AbstractStructuredCommand extends MacroCommand {
-	protected ArrayList items;
-	
-	public AbstractStructuredCommand(WidgetIdentifier wid) {
-		super(wid);
-		items = new ArrayList();
-	}
-
-	public boolean mergeEvent(Event e) {
-		items.clear();
-		processEvent(e);
-		return true;
-	}
-	
-	protected Widget [] getItemsForEvent(Event e) {
-		Widget item = null;
-		if (e.item!=null)
-			item = (Widget)e.item;
-		else if (e.widget instanceof Item)
-			item = e.widget;
-		if (item!=null)
-			return new Widget[] {item};
-		return null;
-	}
-	
-	public void processEvent(Event event) {
-		Widget [] eventItems=getItemsForEvent(event);
-
-		if (eventItems!=null) {
-			for (int i=0; i<eventItems.length; i++) {
-				String id = getItemId(eventItems[i]);
-				if (id!=null)
-					items.add(id);
-			}
-		}
-	}
-	
-	protected String getItemId(Widget item) {
-		MacroManager recorder = MacroPlugin.getDefault().getMacroManager();
-		String id = recorder.resolveWidget(item);
-		if (id!=null)
-			return id;
-		Object data = item.getData();
-		if (data!=null)
-			return data.getClass().getName();
-		return null;
-	}
-
-	protected void load(Node node, Hashtable lineTable) {
-		super.load(node, lineTable);
-		NodeList children = node.getChildNodes();
-		for (int i=0; i<children.getLength(); i++) {
-			Node child = children.item(i);
-			if (child.getNodeType()==Node.ELEMENT_NODE &&
-					child.getNodeName().equals("item")) {
-				String path = MacroUtil.getAttribute(child, "path");
-				if (path!=null)
-					items.add(path);
-			}
-		}
-	}
-	
-	protected void writeAdditionalAttributes(PrintWriter writer) {
-	}
-
-	public void write(String indent, PrintWriter writer) {
-		writer.print(indent);
-		writer.print("<command type=\"");
-		writer.print(getType());
-		writer.print("\" contextId=\"");
-		writer.print(getWidgetId().getContextId());
-		writer.print("\" widgetId=\"");
-		writer.print(getWidgetId().getWidgetId());
-		writer.print("\"");
-		writeAdditionalAttributes(writer);
-		writer.println(">");
-		String cindent = indent + "   ";
-		for (int i=0; i<items.size(); i++) {
-			writer.print(cindent);
-			writer.print("<item path=\"");
-			writer.print((String)items.get(i));
-			writer.println("\"/>");
-		}
-		writer.println(indent+"</command>");
-	}
-	
-	protected abstract void playTreeCommand(Tree tree, TreeItem[] matches);
-	protected abstract void playTableCommand(Table table, TableItem[] matches);
-	protected abstract void playTableTreeCommand(TableTree tableTree, TableTreeItem[] matches);	
-
-	public final boolean playback(Display display, Composite parent, IProgressMonitor monitor) throws CoreException {
-		CommandTarget target = MacroUtil.locateCommandTarget(parent, getWidgetId(), getStartLine());
-
-		if (target==null) return false;
-		target.setFocus();
-		MacroUtil.processDisplayEvents(display);
-
-		Widget widget = target.getWidget();
-		
-		if (widget==null || widget.isDisposed())
-			return false;
-		
-		if (widget instanceof Tree) {
-			TreeItem[] matches = findMatches((Tree)widget);
-			playTreeCommand((Tree)widget, matches);
-		}
-		else if (widget instanceof Table) {
-			TableItem [] matches = findMatches((Table)widget);
-			playTableCommand((Table)widget, matches);
-		}
-		else if (widget instanceof TableTree) {
-			TableTreeItem [] matches = findMatches((TableTree)widget);
-			playTableTreeCommand((TableTree)widget, matches);
-		}
-		return true;
-	}
-
-	private TreeItem[] findMatches(Tree tree) {
-		TreeItem [] children = tree.getItems();
-		ArrayList matches = new ArrayList();
-		for (int i=0; i<items.size(); i++) {
-			String itemId = (String)items.get(i);
-			TreeItem item = findTreeItem(children, itemId);
-			if (item!=null)
-				matches.add(item);
-		}
-		return (TreeItem[])matches.toArray(new TreeItem[matches.size()]);
-	}
-	private TableItem[] findMatches(Table table) {
-		TableItem [] elements = table.getItems();
-		ArrayList matches = new ArrayList();
-
-		for (int i=0; i<items.size(); i++) {
-			String itemId = (String)items.get(i);
-			TableItem item = findTableItem(elements, itemId);
-			if (item!=null)
-				matches.add(item);
-		}
-		return (TableItem[])matches.toArray(new TableItem[matches.size()]);
-	}
-	
-	private TableTreeItem [] findMatches(TableTree tableTree) {
-		TableTreeItem [] children = tableTree.getItems();
-		ArrayList matches = new ArrayList();
-
-		for (int i=0; i<items.size(); i++) {
-			String itemId = (String)items.get(i);
-			TableTreeItem item = findTableTreeItem(children, itemId);
-			if (item!=null)
-				matches.add(item);
-		}
-		return (TableTreeItem[])matches.toArray(new TableTreeItem[matches.size()]);
-	}
-
-	private TreeItem findTreeItem(TreeItem [] children, String itemId) {
-		for (int i=0; i<children.length; i++) {
-			TreeItem item = children[i];
-			String id = getItemId(item);
-			//Test the item itself
-			if (id!=null && id.equals(itemId))
-				return item;
-			int ccount = item.getItemCount();
-			if (ccount>0) {
-				//Test the item's children
-				TreeItem citem = findTreeItem(item.getItems(), itemId);
-				if (citem!=null)
-					return citem;
-			}
-		}
-		return null;
-	}
-
-	private TableItem findTableItem(TableItem [] children, String itemId) {
-		for (int i=0; i<children.length; i++) {
-			TableItem item = children[i];
-			String id = getItemId(item);
-
-			if (id!=null && id.equals(itemId))
-				return item;
-		}
-		return null;
-	}
-	
-	private TableTreeItem findTableTreeItem(TableTreeItem [] children, String itemId) {
-		for (int i=0; i<children.length; i++) {
-			TableTreeItem item = children[i];
-			String id = getItemId(item);
-			//Test the item itself
-			if (id!=null && id.equals(itemId))
-				return item;
-			int ccount = item.getItemCount();
-			if (ccount>0) {
-				//Test the item's children
-				TableTreeItem citem = findTableTreeItem(item.getItems(), itemId);
-				if (citem!=null)
-					return citem;
-			}
-		}
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/BooleanSelectionCommand.java b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/BooleanSelectionCommand.java
deleted file mode 100644
index 57ff4dd..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/BooleanSelectionCommand.java
+++ /dev/null

@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Hashtable;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.*;
-import org.w3c.dom.*;
-
-public class BooleanSelectionCommand extends MacroCommand {
-	public static final String TYPE="select";
-	private Boolean selection;
-	private ArrayList path;
-	
-	public BooleanSelectionCommand(WidgetIdentifier wid) {
-		super(wid);
-	}
-
-	public String getType() {
-		return TYPE;
-	}
-
-	public void processEvent(Event e) {
-		selection = getSelection(e.widget);
-		if (e.widget instanceof MenuItem) {
-			//System.out.println("Item="+e.widget+" data = "+e.widget.getData());
-			path = getPath((MenuItem)e.widget);
-		}
-	}
-	
-	private Boolean getSelection(Widget widget) {
-		if ((widget.getStyle() & (SWT.CHECK | SWT.RADIO)) == 0) 
-			return null;
-		if (widget instanceof Button)
-			return new Boolean(((Button)widget).getSelection());
-		if (widget instanceof ToolItem)
-			return new Boolean(((ToolItem)widget).getSelection());
-		if (widget instanceof MenuItem)
-			return new Boolean(((MenuItem)widget).getSelection());
-		return null;
-	}
-	
-	private ArrayList getPath(MenuItem item) {
-		ArrayList segments = new ArrayList();
-		Object data = item.getData();
-		
-		if (data instanceof ContributionItem) {
-			ContributionItem aitem = (ContributionItem)data;
-			MenuManager manager = (MenuManager)aitem.getParent();
-			while (manager!=null) {
-				String id = manager.getId();
-				if (id==null) 
-					break;
-				segments.add(0, id);				
-				manager = (MenuManager)manager.getParent();
-			}
-		}
-		return segments.size()>0?segments:null;
-	}
-	
-	protected void load(Node node, Hashtable lineTable) {
-		super.load(node, lineTable);
-		String sel = MacroUtil.getAttribute(node, "selection");
-		if (sel!=null) {
-			selection = sel.equals("true")?Boolean.TRUE:Boolean.FALSE;
-		}
-		NodeList children = node.getChildNodes();
-		for (int i=0; i<children.getLength(); i++) {
-			Node child = children.item(i);
-			if (child.getNodeType()==Node.ELEMENT_NODE &&
-					child.getNodeName().equals("parent")) {
-				if (path==null)
-					path = new ArrayList();
-				path.add(MacroUtil.getAttribute(child, "widgetId"));
-			}
-		}
-	}
-	
-	public void write(String indent, PrintWriter writer) {
-		writer.print(indent);
-		writer.print("<command type=\"");
-		writer.print(getType());
-		writer.print("\" contextId=\"");
-		writer.print(getWidgetId().getContextId());
-		writer.print("\" widgetId=\"");
-		writer.print(getWidgetId().getWidgetId());
-		writer.print("\"");
-		if (selection!=null) {
-			writer.print(" selection=\"");
-			writer.print(selection.equals(Boolean.TRUE)?"true":"false");
-			writer.print("\"");
-		}
-		if (path!=null) {
-			writer.println(">");
-			String pindent = indent + "   ";
-			for (int i=0; i<path.size(); i++) {
-				writer.print(pindent);
-				writer.print("<parent widgetId=\"");
-				writer.print((String)path.get(i));
-				writer.println("\"/>");
-			}
-			writer.print(indent);
-			writer.println("</command>");
-		}
-		else 
-			writer.println("/>");
-	}
-
-	public boolean playback(Display display, Composite parent, IProgressMonitor monitor) throws CoreException {
-		CommandTarget target = MacroUtil.locateCommandTarget(parent, getWidgetId(), path, getStartLine());
-		if (target==null) return false;
-		target.setFocus();
-		Widget widget = target.getWidget();
-
-		if ((widget.getStyle() & (SWT.CHECK | SWT.RADIO)) == 0) {
-			doClick(widget);
-		}
-		else if (selection!=null)
-			doSelect(widget);
-		return true;
-	}
-	private void doClick(Widget widget) throws CoreException {
-		Event e = new Event();
-		e.type = SWT.Selection;
-		e.widget = widget;
-		widget.notifyListeners(e.type, e);
-	}
-
-	protected Event createMouseEvent(Widget widget, int type) {
-		Event e = new Event();
-		e.type = type;
-		e.button = 1;
-		e.widget = widget;
-		return e;
-	}
-	
-	private void doSelect(Widget widget) throws CoreException {
-		if (widget instanceof Button)
-			((Button)widget).setSelection(selection.booleanValue());
-		else if (widget instanceof ToolItem)
-			((ToolItem)widget).setSelection(selection.booleanValue());
-		else if (widget instanceof MenuItem)
-			((MenuItem)widget).setSelection(selection.booleanValue());		
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/CheckCommand.java b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/CheckCommand.java
deleted file mode 100644
index 0f40ff5..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/CheckCommand.java
+++ /dev/null

@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-import org.eclipse.swt.custom.*;
-import org.eclipse.swt.widgets.*;
-
-public class CheckCommand extends ToggleStructuredCommand {
-	public static final String TYPE = "item-check";
-	/**
-	 * @param wid
-	 */
-	public CheckCommand(WidgetIdentifier wid) {
-		super(wid);
-	}
-	
-	public String getType() {
-		return TYPE;
-	}
-	
-	public void processEvent(Event event) {
-		super.processEvent(event);
-		Widget item = event.item;
-		if (item instanceof TreeItem)
-			value = ((TreeItem)item).getChecked();
-		else if (item instanceof TableItem)
-			value = ((TableItem)item).getChecked();
-		else if (item instanceof TableTreeItem)
-			value = ((TableTreeItem)item).getChecked();
-	}
-
-	protected void playTreeCommand(Tree tree, TreeItem[] matches) {
-		for (int i=0; i<matches.length; i++) {
-			matches[i].setChecked(getValue());
-		}
-	}
-	
-	protected void playTableCommand(Table table, TableItem[] matches) {
-		for (int i=0; i<matches.length; i++) {
-			matches[i].setChecked(getValue());
-		}
-	}
-	
-	protected void playTableTreeCommand(TableTree tableTree, TableTreeItem [] matches) {
-		for (int i=0; i<matches.length; i++) {
-			matches[i].setChecked(getValue());
-		}
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/ChoiceSelectionCommand.java b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/ChoiceSelectionCommand.java
deleted file mode 100644
index 3f8035c..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/ChoiceSelectionCommand.java
+++ /dev/null

@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-import java.io.*;
-import java.util.Hashtable;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.swt.custom.*;
-import org.eclipse.swt.widgets.*;
-import org.w3c.dom.*;
-
-public class ChoiceSelectionCommand extends MacroCommand {
-	public static final String TYPE = "choice-select";
-
-	private String choiceId;
-
-	public ChoiceSelectionCommand(WidgetIdentifier wid) {
-		super(wid);
-	}
-
-	public String getType() {
-		return TYPE;
-	}
-
-	public void processEvent(Event e) {
-		choiceId = computeChoiceId(e.widget, e.item);
-	}
-
-	private String computeChoiceId(Widget widget, Widget item) {
-		int index = -1;
-
-		if (widget instanceof Combo) {
-			Combo combo = (Combo) widget;
-			index = combo.getSelectionIndex();
-		} else if (widget instanceof CCombo) {
-			CCombo combo = (CCombo) widget;
-			index = combo.getSelectionIndex();
-		} else {
-			String id = MacroPlugin.getDefault().getMacroManager()
-					.resolveWidget(item);
-			if (id != null)
-				return id;
-			if (widget instanceof TabFolder) {
-				TabFolder tabFolder = (TabFolder) widget;
-				TabItem tabItem = (TabItem) item;
-				index = tabFolder.indexOf(tabItem);
-			} else if (widget instanceof CTabFolder) {
-				CTabFolder tabFolder = (CTabFolder) widget;
-				CTabItem tabItem = (CTabItem) item;
-				index = tabFolder.indexOf(tabItem);
-			}
-		}
-		if (index != -1)
-			return getPositionId(index);
-		else
-			return null;
-	}
-
-	private String getPositionId(int index) {
-		return "item#" + index;
-	}
-
-	protected void load(Node node, Hashtable lineTable) {
-		super.load(node, lineTable);
-		choiceId = MacroUtil.getAttribute(node, "choiceId");
-	}
-
-	public void write(String indent, PrintWriter writer) {
-		writer.print(indent);
-		writer.print("<command type=\"");
-		writer.print(getType());
-		writer.print("\" contextId=\"");
-		writer.print(getWidgetId().getContextId());
-		writer.print("\" widgetId=\"");
-		writer.print(getWidgetId().getWidgetId());
-		writer.print("\"");
-		if (choiceId != null) {
-			writer.print(" choiceId=\"");
-			writer.print(choiceId);
-			writer.print("\"");
-		}
-		writer.println("/>");
-	}
-
-	public boolean playback(Display display, Composite parent, IProgressMonitor monitor)
-			throws CoreException {
-		CommandTarget target = MacroUtil.locateCommandTarget(parent,
-				getWidgetId(), getStartLine());
-		if (target == null)
-			return false;
-		target.setFocus();
-		Widget widget = target.getWidget();
-		if (widget instanceof TabFolder)
-			doSelect((TabFolder) widget);
-		else if (widget instanceof CTabFolder)
-			doSelect((CTabFolder) widget);
-		else if (widget instanceof Combo)
-			doSelect((Combo) widget);
-		else if (widget instanceof CCombo)
-			doSelect((CCombo) widget);
-		return true;
-	}
-
-	private void doSelect(TabFolder tabFolder) {
-		TabItem[] items = tabFolder.getItems();
-		for (int i = 0; i < items.length; i++) {
-			TabItem item = items[i];
-			String id = computeChoiceId(tabFolder, item);
-			if (id != null && id.equals(choiceId)) {
-				tabFolder.setSelection(i);
-				break;
-			}
-		}
-	}
-
-	private void doSelect(CTabFolder tabFolder) {
-		CTabItem[] items = tabFolder.getItems();
-		for (int i = 0; i < items.length; i++) {
-			CTabItem item = items[i];
-			String id = computeChoiceId(tabFolder, item);
-			if (id != null && id.equals(choiceId)) {
-				tabFolder.setSelection(i);
-				break;
-			}
-		}
-	}
-
-	private void doSelect(Combo combo) {
-		int index = getIndexFromChoice();
-		if (index != -1)
-			combo.select(index);
-	}
-
-	private void doSelect(CCombo combo) {
-		int index = getIndexFromChoice();
-		if (index != -1)
-			combo.select(index);
-	}
-
-	private int getIndexFromChoice() {
-		int loc = choiceId.indexOf('#');
-		if (loc == -1)
-			return -1;
-		try {
-			return new Integer(choiceId.substring(loc + 1)).intValue();
-		} catch (NumberFormatException e) {
-			return -1;
-		}
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/CommandTarget.java b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/CommandTarget.java
deleted file mode 100644
index ded5b78..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/CommandTarget.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.widgets.Widget;
-
-public class CommandTarget {
-	private Widget widget;
-	private Object context;
-	
-	public CommandTarget(Widget widget, Object context) {
-		this.widget = widget;
-		this.context = context;
-	}
-
-	public void ensureVisible() {
-	}
-	
-	public Widget getWidget() {
-		return widget;
-	}
-	public Object getContext() {
-		return context;
-	}
-	public void setFocus() {
-		ensureVisible();
-		Display display = widget.getDisplay();
-		if (widget instanceof Control) {
-			Control c = (Control)widget;
-			if (!c.equals(display.getFocusControl()))
-				c.setFocus();
-		}
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/EditorCommandTarget.java b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/EditorCommandTarget.java
deleted file mode 100644
index 4197a13..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/EditorCommandTarget.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-import org.eclipse.swt.widgets.Widget;
-import org.eclipse.ui.*;
-import org.eclipse.ui.IEditorPart;
-
-public class EditorCommandTarget extends CommandTarget {
-	/**
-	 * @param widget
-	 * @param context
-	 */
-	public EditorCommandTarget(Widget widget, IEditorPart editor) {
-		super(widget, editor);
-	}
-	
-	public IEditorPart getEditor() {
-		return (IEditorPart)getContext();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.macro.CommandTarget#ensureVisible()
-	 */
-	public void ensureVisible() {
-		IEditorPart editor = getEditor();
-		IWorkbenchPage page = editor.getEditorSite().getPage();
-		page.activate(editor);
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/ExpansionCommand.java b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/ExpansionCommand.java
deleted file mode 100644
index e3e7f7e..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/ExpansionCommand.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.*;
-import org.eclipse.swt.widgets.*;
-
-public class ExpansionCommand extends ToggleStructuredCommand {
-	public static final String TYPE = "item-expand";
-	/**
-	 * @param wid
-	 */
-	public ExpansionCommand(WidgetIdentifier wid) {
-		super(wid);
-	}
-	
-	public void processEvent(Event event) {
-		super.processEvent(event);
-		Widget item = event.item;
-
-		if (item instanceof TreeItem)
-			value = !((TreeItem)item).getExpanded();
-		else if (item instanceof TableTreeItem)
-			value = !((TableTreeItem)item).getExpanded();
-	}
-
-	protected void playTreeCommand(Tree tree, TreeItem[] matches) {
-		for (int i=0; i<matches.length; i++) {
-			matches[i].setExpanded(getValue());
-			fireEvent(tree, matches[i]);
-		}
-	}
-	
-	private void fireEvent(Widget widget, Widget item) {
-		Event event = new Event();
-		event.type = getValue()?SWT.Expand:SWT.Collapse;
-		event.widget = widget;
-		event.item= item;
-		widget.notifyListeners(event.type, event);
-	}
-
-	protected void playTableCommand(Table table, TableItem[] matches) {
-	}
-	
-	protected void playTableTreeCommand(TableTree tableTree, TableTreeItem [] matches) {
-		for (int i=0; i<matches.length; i++) {
-			matches[i].setExpanded(getValue());
-			fireEvent(tableTree, matches[i]);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.macro.SelectionCommand#getKind()
-	 */
-	public String getType() {
-		return TYPE;
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/FocusCommand.java b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/FocusCommand.java
deleted file mode 100644
index 6b17c5f..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/FocusCommand.java
+++ /dev/null

@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-import java.io.PrintWriter;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.swt.widgets.*;
-
-public class FocusCommand extends MacroCommand {
-	public static final String TYPE = "focus";
-	
-	public FocusCommand(WidgetIdentifier wid) {
-		super(wid);
-	}
-	
-	public boolean mergeEvent(Event e) {
-		// we can directly merge repeated focus requests
-		// on the same widget
-		return true;
-	}	
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.macro.MacroCommand#getType()
-	 */
-	public String getType() {
-		return TYPE;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.macro.MacroCommand#processEvent(org.eclipse.swt.widgets.Event)
-	 */
-	public void processEvent(Event e) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.macro.IWritable#write(java.lang.String, java.io.PrintWriter)
-	 */
-	public void write(String indent, PrintWriter writer) {
-		writer.print(indent);
-		writer.print("<command type=\"");
-		writer.print(getType());
-		writer.print("\" contextId=\"");
-		writer.print(getWidgetId().getContextId());
-		writer.print("\" widgetId=\"");
-		writer.print(getWidgetId().getWidgetId());
-		writer.print("\"");
-		writer.println("/>");
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.macro.IPlayable#playback(org.eclipse.swt.widgets.Composite)
-	 */
-	public boolean playback(Display display, Composite parent, IProgressMonitor monitor) throws CoreException {
-		if (parent.isDisposed()) return false;
-		CommandTarget target = MacroUtil.locateCommandTarget(parent, getWidgetId(), getStartLine());
-		if (target!=null)
-			target.setFocus();
-		return true;
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/IIndexHandler.java b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/IIndexHandler.java
deleted file mode 100644
index 560b092..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/IIndexHandler.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Classes that implement this interface are registered with
- * the macro manager to handle cases where the user interrupted
- * the recording process to insert a named index. Upon playback,
- * index handler will be called to handle the named index
- * when reached in the script.
- *
- * @since 3.1
- */
-
-public interface IIndexHandler {
-/**
- * Evaluates the state of the platform at the provided script
- * index. Error status returned from the method will cause
- * the script manager to stop the script execution and
- * throw a <code>CoreException</code>.
- * 
- * @param shell the active shell when the index was reached
- * @param indexId the unique identifier of the index
- * inserted in the script
- * @return <code>Status.OK_STATUS</code> if the script can proceed, or 
- * an error status otherwise.
- */
-	IStatus processIndex(Shell shell, String indexId);
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/IPlayable.java b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/IPlayable.java
deleted file mode 100644
index a69dbae..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/IPlayable.java
+++ /dev/null

@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.widgets.Composite;
-
-public interface IPlayable {
-	boolean playback(Display display, Composite parent, IProgressMonitor monitor) throws CoreException;
-}

diff --git a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/IRecorderListener.java b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/IRecorderListener.java
deleted file mode 100644
index c6e8ea5..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/IRecorderListener.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-public interface IRecorderListener {
-	int STOP = 1;
-	int INDEX = 2;
-	void recordingStarted();
-	void recordingStopped();
-/**
- * Called when the user pressed Ctrl+Shift+F10 (index)
- * or Ctrl+Shift+F11 (stop) to interrupt
- * the recording process. Clients may use this event
- * to insert named indexes, stop the recording etc.
- * @param type <code>STOP</code> or <code>INDEX</code>
- */
-	void recordingInterrupted(int type);
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/IWidgetResolver.java b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/IWidgetResolver.java
deleted file mode 100644
index 7296d9b..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/IWidgetResolver.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-import org.eclipse.swt.widgets.Widget;
-
-/**
- * This interface is registered using extension point 
- * <code>org.eclipse.ui.macro</code> return unique identifier
- * from a provided widget. The identifier must be reproducable
- * between sessions so that it can be used to locate the
- * widget on playback.
- * 
- * @since 3.1
- */
-public interface IWidgetResolver {
-/**
- * Returns a unique identifier for the provided widget.
- * @param widget the widget to identify
- * @return unique identifier that can be used to locate the
- * widget or <code>null</code> if none can be found.
- */
-	String getUniqueId(Widget widget);
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/IWritable.java b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/IWritable.java
deleted file mode 100644
index 6615269..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/IWritable.java
+++ /dev/null

@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-import java.io.PrintWriter;
-
-public interface IWritable {
-	void write(String indent, PrintWriter writer);
-
-}

diff --git a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/KeyCommand.java b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/KeyCommand.java
deleted file mode 100644
index b09a493..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/KeyCommand.java
+++ /dev/null

@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-import java.io.PrintWriter;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.commands.*;
-import org.eclipse.ui.commands.IWorkbenchCommandSupport;
-
-public class KeyCommand extends MacroCommand {
-	public static final String TYPE="key-binding";
-	private String commandId;
-
-	/**
-	 * @param widgetId
-	 */
-	public KeyCommand(WidgetIdentifier widgetId, String commandId) {
-		super(widgetId);
-		this.commandId = commandId;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.internal.macro.MacroCommand#getType()
-	 */
-	public String getType() {
-		return TYPE;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.internal.macro.MacroCommand#processEvent(org.eclipse.swt.widgets.Event)
-	 */
-	public void processEvent(Event e) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.internal.macro.IWritable#write(java.lang.String, java.io.PrintWriter)
-	 */
-	public void write(String indent, PrintWriter writer) {
-		writer.print(indent);
-		writer.print("<command type=\"");
-		writer.print(getType());
-		writer.print("\" contextId=\"");
-		writer.print(getWidgetId().getContextId());
-		writer.print("\" widgetId=\"");
-		writer.print(getWidgetId().getWidgetId());
-		writer.print("\" commandId=\"");
-		writer.print(commandId);
-		writer.println("\"/>");
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.internal.macro.IPlayable#playback(org.eclipse.swt.widgets.Display, org.eclipse.swt.widgets.Composite, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public boolean playback(Display display, Composite parent,
-			IProgressMonitor monitor) throws CoreException {
-		CommandTarget target = MacroUtil.locateCommandTarget(parent, getWidgetId(), getStartLine());
-		if (target==null) return false;
-		IWorkbenchCommandSupport csupport = PlatformUI.getWorkbench().getCommandSupport();
-		ICommand command = csupport.getCommandManager().getCommand(commandId);
-		if (command!=null) {
-			try {
-				command.execute(null);
-				return true;
-			}
-			catch (ExecutionException e) {
-				MacroPlugin.logException(e);
-			}
-			catch (NotHandledException e) {
-				MacroPlugin.logException(e);
-			}
-		}
-		return false;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/Macro.java b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/Macro.java
deleted file mode 100644
index 8479183..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/Macro.java
+++ /dev/null

@@ -1,237 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Stack;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.w3c.dom.Node;
-
-public class Macro implements IWritable, IPlayable {
-	private static final String SYNTAX_VERSION="0.1";
-	private transient IIndexHandler indexHandler;
-	ArrayList shells;
-	private String name;
-	private Stack shellStack;
-	
-	public Macro() {
-		shells = new ArrayList();
-	}
-	
-	public Macro(String name) {
-		this();
-		this.name = name;
-	}
-	
-	void addShell(Node node, Hashtable lineTable) {
-		String sid = MacroUtil.getAttribute(node, "id");
-		MacroCommandShell shell = new MacroCommandShell(null, sid);
-		shell.load(node, lineTable);
-		shells.add(shell);
-	}
-	
-	public void initializeForRecording(Display display) {
-		shellStack = new Stack();
-		shells.clear();
-		Shell currentShell = display.getActiveShell();
-		MacroCommandShell commandShell = createCommandShell(currentShell);
-		shellStack.push(commandShell);
-		shells.add(commandShell);
-	}
-	
-	private MacroCommandShell createCommandShell(Shell shell) {
-		WidgetIdentifier wi = MacroUtil.getWidgetIdentifier(shell);
-		if (wi==null) return null;
-		return new MacroCommandShell(shell, wi.getWidgetId());		
-	}
-	
-	private boolean isCurrent(Shell shell) {
-		if (shellStack.isEmpty()) return false;
-		MacroCommandShell cshell = (MacroCommandShell)shellStack.peek();
-		return cshell.tracks(shell);
-	}
-	
-	public void stopRecording() {
-		reset();
-	}
-	
-	public boolean addEvent(Event event) throws Exception {
-		if (isIgnorableEvent(event))
-			return false;
-		try {
-			if (event.widget instanceof Shell) {
-				switch (event.type) {
-					case SWT.Activate:
-						activateShell((Shell)event.widget);
-						break;
-					case SWT.Close:
-						boolean stop = closeShell((Shell)event.widget);
-						if (stop)
-							return true;
-						break;
-				}
-			}
-			else if (getTopShell()!=null) {
-				getTopShell().addEvent(event);
-			}
-		}
-		catch (Exception e) {
-			throw e;
-		}
-		return false;
-	}
-	
-	private boolean isIgnorableEvent(Event e) {
-		Shell shell = e.display.getActiveShell();
-		if (shell!=null) {
-			Boolean ivalue = (Boolean)shell.getData(MacroManager.IGNORE);
-			if (ivalue!=null && ivalue.equals(Boolean.TRUE))
-				return true;
-		}
-		return false;
-	}
-	
-	public void addPause() {
-		getTopShell().addPause();
-	}
-	
-	public void addIndex(String id) {
-		getTopShell().addIndex(id);
-	}
-	public MacroCommandShell getTopShell() {
-		if (shellStack.isEmpty())
-			return null;
-		return (MacroCommandShell)shellStack.peek();		
-	}
-	private void activateShell(Shell shell) {
-		Object data = shell.getData();
-		if (data instanceof Dialog) {
-			if (!isCurrent(shell)) {
-				MacroCommandShell commandShell = createCommandShell(shell);
-				getTopShell().addCommandShell(commandShell);
-				shellStack.push(commandShell);
-			}
-		}
-		else if (data instanceof Window) {
-			updateStack();
-			if (!isCurrent(shell)) {
-				// pop the current
-				popStack();		
-				MacroCommandShell commandShell = createCommandShell(shell);				
-				shellStack.push(commandShell);
-				shells.add(commandShell);
-			}
-		}
-	}
-
-	private void popStack() {
-		if (shellStack.isEmpty()) return;
-		MacroCommandShell top = (MacroCommandShell)shellStack.pop();
-		top.extractExpectedReturnCode();
-	}
-
-	private boolean closeShell(Shell shell) {
-		if (shellStack.isEmpty()) return false;
-		MacroCommandShell top = (MacroCommandShell)shellStack.peek();
-		if (top.tracks(shell))
-			popStack();
-		return shellStack.isEmpty();
-	}
-	
-	private void updateStack() {
-		while (shellStack.size()>0) {
-			MacroCommandShell top = getTopShell();
-			if (top.isDisposed())
-				popStack();
-			else
-				break;
-		}
-	}
-	
-	private void closeSecondaryShells() {
-	}
-	
-	public String [] getExistingIndices() {
-		ArrayList list = new ArrayList();
-		for (int i=0; i<shells.size(); i++) {
-			MacroCommandShell shell = (MacroCommandShell)shells.get(i);
-			shell.addExistingIndices(list);
-		}
-		return (String[])list.toArray(new String[list.size()]);
-	}
-	
-	public boolean playback(Display display, Composite parent, IProgressMonitor monitor) throws CoreException {
-		reset();
-		String mname = name!=null?name:"macro";
-		monitor.beginTask("Executing "+mname+" ...", shells.size());
-		for (int i=0; i<shells.size(); i++) {
-			MacroCommandShell shell = (MacroCommandShell)shells.get(i);
-			shell.setIndexHandler(getIndexHandler());
-			final Shell [] sh = new Shell[1];
-			display.syncExec(new Runnable() {
-				public void run() {
-					sh[0] = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-				}
-			});
-			try {
-				boolean result = shell.playback(display, sh[0], new SubProgressMonitor(monitor, 1));
-				if (!result)
-					return false;
-			}
-			catch (CoreException e) {
-				closeSecondaryShells();
-				throw e;
-			}
-		}
-		return true;
-	}
-	private void reset() {
-		shellStack = null;
-	}
-	public void write(String indent, PrintWriter writer) {
-		writer.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-		writer.print("<macro version=\"");
-		writer.print(SYNTAX_VERSION);
-		writer.println("\">");
-		String cindent = "   ";
-		for (int i=0; i<shells.size(); i++) {
-			MacroCommandShell cshell = (MacroCommandShell)shells.get(i);
-			cshell.write(cindent, writer);
-		}
-		writer.println("</macro>");
-	}
-
-	public IIndexHandler getIndexHandler() {
-		return indexHandler;
-	}
-	
-
-	public void setIndexHandler(IIndexHandler indexHandler) {
-		this.indexHandler = indexHandler;
-	}
-
-	public String getName() {
-		return name;
-	}
-	
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/MacroCommand.java b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/MacroCommand.java
deleted file mode 100644
index 1b54951..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/MacroCommand.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-import java.util.Hashtable;
-import java.util.Map;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.swt.widgets.Event;
-import org.w3c.dom.Node;
-
-public abstract class MacroCommand implements IWritable, IPlayable {
-	private WidgetIdentifier widgetId;
-    private int [] range;
-
-	public MacroCommand (WidgetIdentifier widgetId) {
-		this.widgetId = widgetId;
-	}
-	
-	public abstract String getType();
-	public abstract void processEvent(Event e);
-	
-	protected void load(Node node, Hashtable lineTable) {
-		String cid = MacroUtil.getAttribute(node, "contextId");		
-		String wid = MacroUtil.getAttribute(node, "widgetId");
-		if (wid!=null && cid!=null)
-			widgetId = new WidgetIdentifier(new Path(cid), new Path(wid));
-        bindSourceLocation(node, lineTable);
-	}
-    
-    
-    void bindSourceLocation(Node node, Map lineTable) {
-        Integer[] lines = (Integer[]) lineTable.get(node);
-        if (lines != null) {
-            range = new int[2];
-            range[0] = lines[0].intValue();
-            range[1] = lines[1].intValue();
-        }
-    }
-
-    public int getStartLine() {
-        if (range == null)
-            return -1;
-        return range[0];
-    }
-    public int getStopLine() {
-        if (range == null)
-            return -1;
-        return range[1];
-    }
-	
-	public boolean mergeEvent(Event e) {
-		return false;
-	}
-	public WidgetIdentifier getWidgetId() {
-		return widgetId;
-	}
-	public String toString() {
-		return "MacroCommand ["+getType()+", line "+getStartLine()+"]";
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/MacroCommandShell.java b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/MacroCommandShell.java
deleted file mode 100644
index 0228b56..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/MacroCommandShell.java
+++ /dev/null

@@ -1,575 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Hashtable;
-
-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.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.SWTError;
-import org.eclipse.swt.SWTException;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.CTabFolder;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.custom.TableTree;
-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.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.Widget;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.commands.IWorkbenchCommandSupport;
-import org.eclipse.ui.keys.KeySequence;
-import org.eclipse.ui.keys.KeyStroke;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class MacroCommandShell extends MacroInstruction {
-	private ArrayList commands;
-
-	private int expectedReturnCode;
-
-	private transient Event lastEvent;
-
-	private transient Display display;
-
-	private transient Shell shell;
-
-	private transient IIndexHandler indexHandler;
-
-	private transient Window window;
-
-	private static class NestedShell implements Listener, Runnable {
-		private MacroCommandShell cshell;
-
-		private Display display;
-
-		private Shell nshell;
-
-		private boolean released;
-
-		private CoreException exception;
-
-		private IProgressMonitor monitor;
-
-		public NestedShell(Display display, MacroCommandShell cshell,
-				IProgressMonitor monitor) {
-			this.display = display;
-			this.cshell = cshell;
-			this.monitor = monitor;
-		}
-
-		public void handleEvent(Event e) {
-			if (e.widget instanceof Shell) {
-				// shell activated
-				Shell shell = (Shell) e.widget;
-				IPath path = MacroUtil.getShellId(shell);
-				String sid = path.toString();
-				if (sid.equals(cshell.getId())) {
-					shell.getDisplay().removeFilter(SWT.Activate, this);
-					released = true;
-					this.nshell = shell;
-					shell.getDisplay().asyncExec(this);
-				}
-			}
-		}
-
-		public boolean getResult() {
-			return cshell.matchesReturnCode();
-		}
-
-		public boolean isReleased() {
-			return released;
-		}
-
-		public void run() {
-			try {
-				cshell.playback(display, nshell, monitor);
-			} catch (CoreException e) {
-				this.exception = e;
-				if (nshell != null && !nshell.isDisposed())
-					nshell.close();
-			}
-		}
-
-		public CoreException getException() {
-			return exception;
-		}
-	}
-
-	public MacroCommandShell() {
-		this(null, null);
-	}
-
-	public MacroCommandShell(Shell shell, String path) {
-		super(path);
-		commands = new ArrayList();
-		this.shell = shell;
-		hookWindow(false);
-	}
-
-	private void hookWindow(boolean playback) {
-		if (shell != null) {
-			if (!playback)
-				doHookWindow();
-			else
-				display.syncExec(new Runnable() {
-					public void run() {
-						doHookWindow();
-					}
-				});
-		}
-	}
-
-	private void doHookWindow() {
-		Object data = shell.getData();
-		if (data != null && data instanceof Window)
-			this.window = (Window) data;
-	}
-
-	public void load(Node node, Hashtable lineTable) {
-		super.load(node, lineTable);
-
-		String codeId = MacroUtil.getAttribute(node, "return-code");
-		if (codeId != null) {
-			try {
-				expectedReturnCode = new Integer(codeId).intValue();
-			} catch (NumberFormatException e) {
-			}
-		}
-		NodeList children = node.getChildNodes();
-		for (int i = 0; i < children.getLength(); i++) {
-			Node child = children.item(i);
-			if (child.getNodeType() == Node.ELEMENT_NODE) {
-				String name = child.getNodeName();
-				if (name.equals("command"))
-					processCommand(child, lineTable);
-				else if (name.equals("shell"))
-					processShell(child, lineTable);
-				else if (name.equals("index"))
-					processIndex(child, lineTable);
-			}
-		}
-	}
-
-	private void processCommand(Node node, Hashtable lineTable) {
-		String wid = MacroUtil.getAttribute(node, "widgetId");
-		String cid = MacroUtil.getAttribute(node, "contextId");
-		String type = MacroUtil.getAttribute(node, "type");
-		if (type == null)
-			return;
-		MacroCommand command = null;
-		WidgetIdentifier wi = (wid != null && cid != null) ? new WidgetIdentifier(
-				new Path(wid), new Path(cid))
-				: null;
-		if (type.equals(ModifyCommand.TYPE))
-			command = new ModifyCommand(wi);
-		else if (type.equals(BooleanSelectionCommand.TYPE))
-			command = new BooleanSelectionCommand(wi);
-		else if (type.equals(StructuredSelectionCommand.ITEM_SELECT)
-				|| type.equals(StructuredSelectionCommand.DEFAULT_SELECT))
-			command = new StructuredSelectionCommand(wi, type);
-		else if (type.equals(ExpansionCommand.TYPE))
-			command = new ExpansionCommand(wi);
-		else if (type.equals(CheckCommand.TYPE))
-			command = new CheckCommand(wi);
-		else if (type.equals(FocusCommand.TYPE))
-			command = new FocusCommand(wi);
-		else if (type.equals(ChoiceSelectionCommand.TYPE))
-			command = new ChoiceSelectionCommand(wi);
-		else if (type.equals(WaitCommand.TYPE))
-			command = new WaitCommand();
-		if (command != null) {
-			command.load(node, lineTable);
-			commands.add(command);
-		}
-	}
-
-	private void processShell(Node node, Hashtable lineTable) {
-		MacroCommandShell shell = new MacroCommandShell();
-		shell.load(node, lineTable);
-		commands.add(shell);
-	}
-
-	private void processIndex(Node node, Hashtable lineTable) {
-		MacroIndex index = new MacroIndex();
-		index.load(node, lineTable);
-		commands.add(index);
-	}
-
-	public void addCommandShell(MacroCommandShell cshell) {
-		commands.add(cshell);
-	}
-
-	public void write(String indent, PrintWriter writer) {
-		writer.print(indent);
-		writer.print("<shell id=\"");
-		writer.print(getId());
-		writer.print("\" return-code=\"");
-		writer.print(expectedReturnCode + "");
-		writer.println("\">");
-		String cindent = indent + "   ";
-		for (int i = 0; i < commands.size(); i++) {
-			IWritable writable = (IWritable) commands.get(i);
-			if (i < commands.size() - 1 || !(writable instanceof WaitCommand))
-				writable.write(cindent, writer);
-		}
-		writer.print(indent);
-		writer.println("</shell>");
-	}
-
-	public void addEvent(Event event) {
-		if (event.widget instanceof Control) {
-			if (((Control) event.widget).isVisible() == false)
-				return;
-		}
-		MacroCommand command = createCommand(event);
-		if (command != null) {
-			command.processEvent(event);
-			MacroCommand lastCommand = getLastCommand();
-			if (lastCommand != null
-					&& lastCommand.getWidgetId().equals(command.getWidgetId())
-					&& lastCommand.getType().equals(FocusCommand.TYPE)
-					&& isFocusCommand(command.getType())) {
-				// focus followed by select or modify - focus implied
-				commands.remove(lastCommand);
-			}
-			commands.add(command);
-			lastEvent = event;
-		}
-	}
-
-	public void addPause() {
-		WaitCommand command = new WaitCommand();
-		MacroCommand lastCommand = getLastCommand();
-		if (lastCommand != null && lastCommand.getType() != WaitCommand.TYPE)
-			commands.add(command);
-	}
-
-	public void addIndex(String id) {
-		commands.add(new MacroIndex(id));
-	}
-
-	public void extractExpectedReturnCode() {
-		if (window != null)
-			expectedReturnCode = window.getReturnCode();
-	}
-
-	public boolean matchesReturnCode() {
-		if (window != null) {
-			return window.getReturnCode() == expectedReturnCode;
-		}
-		return true;
-	}
-
-	private boolean isFocusCommand(String type) {
-		return type.equals(BooleanSelectionCommand.TYPE)
-				|| type.equals(StructuredSelectionCommand.ITEM_SELECT)
-				|| type.equals(StructuredSelectionCommand.DEFAULT_SELECT)
-				|| type.equals(ExpansionCommand.TYPE)
-				|| type.equals(CheckCommand.TYPE)
-				|| type.equals(ModifyCommand.TYPE);
-	}
-
-	protected MacroCommand createCommand(Event event) {
-		MacroCommand lastCommand = getLastCommand();
-		if (lastEvent != null && lastEvent.widget.equals(event.widget)) {
-			if (lastEvent.type == event.type
-					|| (lastEvent.type == SWT.Selection && event.type == SWT.DefaultSelection)) {
-				if (lastCommand != null && lastCommand.mergeEvent(event))
-					return null;
-			}
-		}
-		MacroCommand command = null;
-		WidgetIdentifier wi = MacroUtil.getWidgetIdentifier(event.widget);
-		if (wi == null)
-			return null;
-
-		switch (event.type) {
-		case SWT.Modify:
-			if (!isEditable(event.widget))
-				return null;
-			command = new ModifyCommand(wi);
-			break;
-		case SWT.Selection:
-		case SWT.DefaultSelection:
-			command = createSelectionCommand(wi, event);
-			break;
-		case SWT.FocusIn:
-			command = new FocusCommand(wi);
-			break;
-		case SWT.Expand:
-		case SWT.Collapse:
-			command = new ExpansionCommand(wi);
-			break;
-		/*
-		 * case SWT.KeyUp: command = findKeyBinding(wi, event); break;
-		 */
-		}
-		return command;
-	}
-
-	private boolean isEditable(Widget widget) {
-		if (widget instanceof Control) {
-			Control control = (Control) widget;
-			if (!control.isEnabled())
-				return false;
-			if (control instanceof Text)
-				return ((Text) control).getEditable();
-			if (control instanceof Combo || control instanceof CCombo)
-				return ((control.getStyle() & SWT.READ_ONLY) == 0);
-			if (control instanceof StyledText)
-				return ((StyledText) control).getEditable();
-		}
-		return true;
-	}
-
-	private MacroCommand createSelectionCommand(WidgetIdentifier wid,
-			Event event) {
-		if (event.widget instanceof MenuItem
-				|| event.widget instanceof ToolItem
-				|| event.widget instanceof Button) {
-			String wId = wid.getWidgetId();
-			if (wId.endsWith("org.eclipse.pde.ui.tests.StopAction"))
-				return null;
-			if (wId.endsWith("org.eclipse.pde.ui.tests.IndexAction"))
-				return null;
-			return new BooleanSelectionCommand(wid);
-		}
-		if (event.widget instanceof Tree || event.widget instanceof Table
-				|| event.widget instanceof TableTree) {
-			if (event.detail == SWT.CHECK)
-				return new CheckCommand(wid);
-			String type = event.type == SWT.DefaultSelection ? StructuredSelectionCommand.DEFAULT_SELECT
-						: StructuredSelectionCommand.ITEM_SELECT;
-			return new StructuredSelectionCommand(wid, type);
-		}
-		if (event.widget instanceof TabFolder
-				|| event.widget instanceof CTabFolder)
-			return new ChoiceSelectionCommand(wid);
-		if (event.widget instanceof Combo || event.widget instanceof CCombo)
-			return new ChoiceSelectionCommand(wid);
-		return null;
-	}
-
-	protected MacroCommand findKeyBinding(WidgetIdentifier wid, Event e) {
-		System.out.println("mask=" + e.stateMask + ", char=" + e.character);
-		java.util.List keyStrokes = MacroUtil.generatePossibleKeyStrokes(e);
-		if (keyStrokes.size() == 0)
-			return null;
-		for (int i = 0; i < keyStrokes.size(); i++) {
-			if (!((KeyStroke) keyStrokes.get(i)).isComplete())
-				return null;
-		}
-		System.out.println("keyStrokes=" + keyStrokes);
-		IWorkbenchCommandSupport csupport = PlatformUI.getWorkbench()
-				.getCommandSupport();
-		KeySequence keySequence = KeySequence.getInstance(keyStrokes);
-		System.out.println("keySequence=" + keySequence);
-		String commandId = csupport.getCommandManager().getPerfectMatch(
-				keySequence);
-		System.out.println("Command id=" + commandId);
-		if (commandId == null)
-			return null;
-		return new KeyCommand(wid, commandId);
-	}
-
-	private MacroCommand getLastCommand() {
-		if (commands.size() > 0) {
-			Object item = commands.get(commands.size() - 1);
-			if (item instanceof MacroCommand)
-				return (MacroCommand) item;
-		}
-		return null;
-	}
-
-	public boolean isDisposed() {
-		return this.shell != null && this.shell.isDisposed();
-	}
-	
-	public void close() {
-		if (this.shell!=null && !this.shell.isDisposed())
-			this.shell.close();
-	}
-
-	public boolean tracks(Shell shell) {
-		if (this.shell != null && this.shell.equals(shell))
-			return true;
-		return false;
-	}
-
-	public boolean playback(final Display display, Composite parent,
-			IProgressMonitor monitor) throws CoreException {
-		if (parent instanceof Shell) {
-			this.shell = (Shell) parent;
-			this.display = display;
-			hookWindow(true);
-		}
-
-		NestedShell nestedShell = null;
-
-		monitor.beginTask("", commands.size());
-
-		for (int i = 0; i < commands.size(); i++) {
-			Object c = commands.get(i);
-			if (c instanceof MacroIndex) {
-				String id = ((MacroIndex) c).getId();
-				if (id != null && indexHandler != null) {
-					IStatus status = indexHandler.processIndex(shell, id);
-					if (status.getSeverity() == IStatus.OK)
-						continue;
-					throw new CoreException(status);
-				}
-				// ignore the index
-				continue;
-			}
-			IPlayable playable = (IPlayable) c;
-			if (i < commands.size() - 1) {
-				// check the next command
-				IPlayable next = (IPlayable) commands.get(i + 1);
-				if (next instanceof MacroCommandShell) {
-					// this command will open a new shell
-					// add a listener before it is too late
-					MacroCommandShell nestedCommand = (MacroCommandShell) next;
-					nestedShell = new NestedShell(display, nestedCommand,
-							new SubProgressMonitor(monitor, 1));
-					final NestedShell fnestedShell = nestedShell;
-					display.syncExec(new Runnable() {
-						public void run() {
-							display.addFilter(SWT.Activate, fnestedShell);
-						}
-					});
-				}
-			}
-			if (playable instanceof MacroCommand) {
-				boolean last = i == commands.size() - 1;
-				playInGUIThread(display, playable, last, monitor);
-				monitor.worked(1);
-			} else if (nestedShell != null) {
-				CoreException e = null;
-				if (nestedShell.isReleased() == false) {
-					final NestedShell fnestedShell = nestedShell;
-					display.syncExec(new Runnable() {
-						public void run() {
-							display.removeFilter(SWT.Activate, fnestedShell);
-						}
-					});
-				}
-				e = nestedShell.getException();
-				boolean result = nestedShell.getResult();
-				nestedShell = null;
-				if (e != null)
-					throw e;
-				if (!result)
-					return false;
-			}
-		}
-		shell = null;
-		return true;
-	}
-
-	void addExistingIndices(ArrayList list) {
-		for (int i = 0; i < commands.size(); i++) {
-			Object c = commands.get(i);
-			if (c instanceof MacroIndex) {
-				list.add(((MacroIndex) c).getId());
-			} else if (c instanceof MacroCommandShell) {
-				((MacroCommandShell) c).addExistingIndices(list);
-			}
-		}
-	}
-
-	private void playInGUIThread(final Display display,
-			final IPlayable playable, boolean last,
-			final IProgressMonitor monitor) throws CoreException {
-		final CoreException[] ex = new CoreException[1];
-
-		Runnable runnable = new Runnable() {
-			public void run() {
-				try {
-					//System.out.println("Executing: "+playable.toString());
-					playable.playback(display, MacroCommandShell.this.shell,
-							monitor);
-					MacroUtil.processDisplayEvents(display);
-				} catch (ClassCastException e) {
-					ex[0] = createPlaybackException(playable, e);
-				} catch (CoreException e) {
-					ex[0] = e;
-				} catch (SWTException e) {
-					ex[0] = createPlaybackException(playable, e);
-				} catch (SWTError error) {
-					ex[0] = createPlaybackException(playable, error);
-				}
-			}
-		};
-		// if (last)
-		// shell.getDisplay().asyncExec(runnable);
-		// else
-		// display.syncExec(runnable);
-		if (playable instanceof WaitCommand) {
-			playable.playback(display, this.shell, monitor);
-		} else
-			display.syncExec(runnable);
-
-		try {
-			Thread.sleep(100);
-		} catch (InterruptedException e) {
-		}
-
-		// for (;;) {
-		// if (display.isDisposed() || !display.readAndDispatch())
-		// break;
-		// }
-
-		if (ex[0] != null)
-			throw ex[0];
-	}
-
-	public IIndexHandler getIndexHandler() {
-		return indexHandler;
-	}
-
-	public void setIndexHandler(IIndexHandler indexHandler) {
-		this.indexHandler = indexHandler;
-		for (int i = 0; i < commands.size(); i++) {
-			Object c = commands.get(i);
-			if (c instanceof MacroCommandShell) {
-				MacroCommandShell child = (MacroCommandShell) c;
-				child.setIndexHandler(indexHandler);
-			}
-		}
-	}
-	
-	private CoreException createPlaybackException(IPlayable playable, Throwable th) {
-		IStatus status = new Status(IStatus.ERROR, "org.eclipse.pde.ui.tests", IStatus.OK,
-				"Error while executing a macro command: "+playable.toString(), th);
-		return new CoreException(status);		
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/MacroIndex.java b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/MacroIndex.java
deleted file mode 100644
index 052a167..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/MacroIndex.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-import java.io.PrintWriter;
-
-public class MacroIndex extends MacroInstruction {
-    
-    public MacroIndex() {
-        super(null);
-    }
-
-	public MacroIndex(String id) {
-		super(id);
-	}
-
-	public void write(String indent, PrintWriter writer) {
-		writer.print(indent);
-		writer.print("<index id=\"");
-		writer.print(getId());
-		writer.println("\"/>");
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/MacroInstruction.java b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/MacroInstruction.java
deleted file mode 100644
index 582cbf0..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/MacroInstruction.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-import java.util.Hashtable;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.w3c.dom.Node;
-
-public abstract class MacroInstruction implements IWritable, IPlayable {
-    private int [] range;
-    private String id;
-
-	public MacroInstruction (String id) {
-        this.id = id;
-	}
-    
-    public String getId() {
-        return id;
-    }
-	
-	protected void load(Node node, Hashtable lineTable) {
-        this.id = MacroUtil.getAttribute(node, "id");
-        bindSourceLocation(node, lineTable);
-	}
-    
-    void bindSourceLocation(Node node, Map lineTable) {
-        Integer[] lines = (Integer[]) lineTable.get(node);
-        if (lines != null) {
-            range = new int[2];
-            range[0] = lines[0].intValue();
-            range[1] = lines[1].intValue();
-        }
-    }
-
-    public int getStartLine() {
-        if (range == null)
-            return -1;
-        return range[0];
-    }
-    public int getStopLine() {
-        if (range == null)
-            return -1;
-        return range[1];
-    }
-    
-
-    public boolean playback(Display display, Composite parent, IProgressMonitor monitor) throws CoreException {
-        return false;
-    }
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/MacroManager.java b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/MacroManager.java
deleted file mode 100644
index d5c15ad..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/MacroManager.java
+++ /dev/null

@@ -1,350 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Vector;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.IJobManager;
-import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.swt.SWT;
-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.Widget;
-import org.eclipse.ui.PlatformUI;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-public class MacroManager {
-	public static final String IGNORE = "__macro_ignore__";
-	public static final int IDLE = 0;
-
-	public static final int RUNNING = 1;
-
-	public static final int DONE = 2;
-
-	private Macro currentMacro;
-	
-	private IIndexHandler indexHandler;
-
-	class DisplayListener implements Listener {
-		public void handleEvent(Event event) {
-			onEvent(event);
-		}
-	}
-
-	class JobListener extends JobChangeAdapter {
-		private int state = IDLE;
-
-		public void running(IJobChangeEvent event) {
-			if (!event.getJob().isSystem() && state == IDLE)
-				state = RUNNING;
-		}
-
-		public void done(IJobChangeEvent event) {
-			if (!event.getJob().isSystem() && state == RUNNING)
-				state = DONE;
-		}
-
-		public void reset() {
-			state = IDLE;
-		}
-
-		public int getState() {
-			return state;
-		}
-	}
-
-	private DisplayListener listener;
-
-	private JobListener jobListener;
-
-	private Vector listeners;
-
-	private ArrayList widgetResolvers;
-	private SAXParser parser;
-
-	public MacroManager() {
-		listener = new DisplayListener();
-		jobListener = new JobListener();
-		listeners = new Vector();
-	}
-
-	public void addRecorderListener(IRecorderListener listener) {
-		if (!listeners.contains(listener))
-			listeners.add(listener);
-	}
-	
-	public void addIndex(String indexId) {
-		if (currentMacro!=null) {
-			currentMacro.addIndex(indexId);
-		}
-	}
-
-	public void removeRecorderListener(IRecorderListener listener) {
-		if (listeners.contains(listener))
-			listeners.remove(listener);
-	}
-
-	public boolean isRecording() {
-		return currentMacro != null;
-	}
-
-	public void startRecording() {
-		Display display = PlatformUI.getWorkbench().getDisplay();
-		hookListeners(display);
-		currentMacro = new Macro();
-		currentMacro.initializeForRecording(display);
-		IRecorderListener[] array = (IRecorderListener[]) listeners
-				.toArray(new IRecorderListener[listeners.size()]);
-		for (int i = 0; i < array.length; i++) {
-			array[i].recordingStarted();
-		}
-	}
-	
-	public String [] getExistingIndices() {
-		if (currentMacro!=null) {
-			return currentMacro.getExistingIndices();
-		}
-		return new String [0];
-	}
-
-	public Macro stopRecording() {
-		Display display = PlatformUI.getWorkbench().getDisplay();
-		unhookListeners(display);
-		currentMacro.stopRecording();
-		Macro newMacro = currentMacro;
-		currentMacro = null;
-		IRecorderListener[] array = (IRecorderListener[]) listeners
-				.toArray(new IRecorderListener[listeners.size()]);
-		for (int i = 0; i < array.length; i++) {
-			array[i].recordingStopped();
-		}
-		return newMacro;
-	}
-
-	public void hookListeners(Display display) {
-		display.addFilter(SWT.KeyDown, listener);
-		display.addFilter(SWT.Selection, listener);
-		display.addFilter(SWT.DefaultSelection, listener);
-		display.addFilter(SWT.Expand, listener);
-		display.addFilter(SWT.Collapse, listener);
-		display.addFilter(SWT.Modify, listener);
-		display.addFilter(SWT.Activate, listener);
-		display.addFilter(SWT.Close, listener);
-		display.addFilter(SWT.FocusIn, listener);
-		IJobManager jobManager = Platform.getJobManager();
-		jobManager.addJobChangeListener(jobListener);
-	}
-
-	public void unhookListeners(Display display) {
-		display.removeFilter(SWT.KeyDown, listener);
-		display.removeFilter(SWT.Selection, listener);
-		display.removeFilter(SWT.DefaultSelection, listener);
-		display.removeFilter(SWT.Expand, listener);
-		display.removeFilter(SWT.Collapse, listener);
-		display.removeFilter(SWT.Modify, listener);
-		display.removeFilter(SWT.Activate, listener);
-		display.removeFilter(SWT.Close, listener);
-		display.removeFilter(SWT.FocusIn, listener);
-		IJobManager jobManager = Platform.getJobManager();
-		jobManager.removeJobChangeListener(jobListener);
-	}
-
-	public void shutdown() {
-		if (currentMacro != null) {
-			Display display = PlatformUI.getWorkbench().getDisplay();
-			unhookListeners(display);
-			currentMacro.stopRecording();
-			currentMacro = null;
-		}
-	}
-
-	/**
-	 * Plays a provided macro stream. The method will close the input stream
-	 * upon parsing.
-	 * 
-	 * @param is
-	 * @throws CoreException
-	 */
-	public boolean play(final Display display, IRunnableContext context,
-			String scriptName, InputStream is) throws CoreException {
-		XMLDefaultHandler handler = createMacroDocument(is);
-		Node root = handler.getDocumentElement();
-		NodeList children = root.getChildNodes();
-
-		final Macro macro = new Macro(scriptName);
-		for (int i = 0; i < children.getLength(); i++) {
-			Node child = children.item(i);
-			if (child.getNodeName().equals("shell")) {
-				macro.addShell(child, handler.getLineTable());
-			}
-		}
-		// discard the DOM
-		handler = null;
-		
-		macro.setIndexHandler(getIndexHandler());
-
-		final boolean[] result = new boolean[1];
-
-		IRunnableWithProgress op = new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor)
-					throws InvocationTargetException {
-				try {
-					//System.out.println("Start macro: "+macro.getName());
-					result[0] = macro.playback(display, null, monitor);
-				} catch (CoreException e) {
-					throw new InvocationTargetException(e);
-				} catch (ClassCastException e) {
-					throw new InvocationTargetException(e);
-				} finally {
-					monitor.done();
-					//System.out.println("Stop macro: "+macro.getName());
-				}
-			}
-		};
-		try {
-			context.run(true, true, op);
-		} catch (InterruptedException e) {
-		} catch (InvocationTargetException e) {
-			MacroPlugin.logException(e);
-			return false;
-		}
-		return result[0];
-	}
-
-	private XMLDefaultHandler createMacroDocument(InputStream is) throws CoreException {
-        XMLDefaultHandler handler=null;
-		try {
-			SAXParser parser = getParser();
-            handler = new XMLDefaultHandler();
-            parser.parse(is, handler);            
-		} catch (SAXException e) {
-			MacroUtil.throwCoreException("Error parsing the macro file", 0, e);
-		} catch (IOException e) {
-			MacroUtil.throwCoreException("Error parsing the macro file", 0, e);
-		} finally {
-			try {
-				is.close();
-			} catch (IOException e) {
-			}
-		}
-		return handler;
-	}
-	
-	private SAXParser getParser() throws CoreException {
-		if (parser==null) {
-			try {
-                return SAXParserFactory.newInstance().newSAXParser();
-			} catch (ParserConfigurationException e) {
-				MacroUtil.throwCoreException("Error parsing the macro file", 0, e);
-			} catch (SAXException e) {
-                MacroUtil.throwCoreException("Error parsing the macro file", 0, e);                
-            }
-		}
-		return parser;
-	}
-
-	private void onEvent(Event event) {
-		try {
-			if (event.type==SWT.KeyDown) {
-				if ((event.stateMask & SWT.SHIFT)!=0 &&
-						(event.stateMask & SWT.CTRL)!=0) {	
-					int key = event.keyCode & SWT.KEY_MASK;
-					if (key==SWT.F11)
-						notifyInterrupt(IRecorderListener.STOP);
-					else if (key==SWT.F10)
-						notifyInterrupt(IRecorderListener.INDEX);
-				}
-				return;
-			}
-			if ((event.type == SWT.Close || event.type == SWT.Activate)
-					&& !(event.widget instanceof Shell))
-				return;
-			if (jobListener.getState() == RUNNING
-					|| jobListener.getState() == DONE)
-				currentMacro.addPause();
-			jobListener.reset();
-			boolean stop = currentMacro.addEvent(event);
-			if (stop) {
-				notifyInterrupt(IRecorderListener.STOP);
-			}
-		} catch (Exception e) {
-			MacroPlugin.logException(e);
-			stopRecording();
-		}
-	}
-	
-	private void notifyInterrupt(int type) {
-		IRecorderListener[] array = (IRecorderListener[]) listeners
-		.toArray(new IRecorderListener[listeners.size()]);
-			for (int i = 0; i < array.length; i++) {
-				array[i].recordingInterrupted(type);
-			}
-	}
-
-	public String resolveWidget(Widget widget) {
-		if (widgetResolvers == null)
-			loadWidgetResolvers();
-		for (int i = 0; i < widgetResolvers.size(); i++) {
-			IWidgetResolver resolver = (IWidgetResolver) widgetResolvers.get(i);
-			String id = resolver.getUniqueId(widget);
-			if (id != null)
-				return id;
-		}
-		return null;
-	}
-
-	private void loadWidgetResolvers() {
-		widgetResolvers = new ArrayList();
-		IConfigurationElement[] elements = Platform.getExtensionRegistry()
-				.getConfigurationElementsFor(
-						"org.eclipse.pde.ui.tests.macroSupport");
-		for (int i = 0; i < elements.length; i++) {
-			if (elements[i].getName().equals("widgetResolver")) {
-				try {
-					Object obj = elements[i].createExecutableExtension("class");
-					if (obj instanceof IWidgetResolver)
-						widgetResolvers.add(obj);
-				} catch (CoreException e) {
-					System.out.println(e);
-				}
-			}
-		}
-	}
-
-	public IIndexHandler getIndexHandler() {
-		return indexHandler;
-	}
-	
-
-	public void setIndexHandler(IIndexHandler indexHandler) {
-		this.indexHandler = indexHandler;
-	}
-	
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/MacroPlugin.java b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/MacroPlugin.java
deleted file mode 100644
index b930f8a..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/MacroPlugin.java
+++ /dev/null

@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-import java.lang.reflect.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.plugin.*;
-import org.osgi.framework.*;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class MacroPlugin extends AbstractUIPlugin {
-	//The shared instance.
-	private static MacroPlugin plugin;
-	
-	private MacroManager recorder;
-	/**
-	 * The constructor.
-	 */
-	public MacroPlugin() {
-		super();
-		plugin = this;
-		recorder = new MacroManager();
-	}
-	public MacroManager getMacroManager() {
-		return recorder;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		recorder.shutdown();
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static MacroPlugin getDefault() {
-		return plugin;
-	}
-
-	public static void logException(Throwable e) {
-		logException(e, null, null);
-	}
-	public static void logException(
-			Throwable e,
-			final String title,
-			String message) {
-			if (e instanceof InvocationTargetException) {
-				e = ((InvocationTargetException) e).getTargetException();
-			}
-			IStatus status = null;
-			if (e instanceof CoreException)
-				status = ((CoreException) e).getStatus();
-			else {
-				if (message == null)
-					message = e.getMessage();
-				if (message == null)
-					message = e.toString();
-				status = new Status(IStatus.ERROR, "org.eclipse.pde.ui.tests", IStatus.OK, message, e);
-			}
-			ResourcesPlugin.getPlugin().getLog().log(status);
-			Display display = Display.getCurrent();
-			if (display==null)
-				display = Display.getDefault();
-			final IStatus fstatus = status;
-			display.asyncExec(new Runnable() {
-				public void run() {
-					ErrorDialog.openError(null, title, null, fstatus);
-				}
-			});
-		}
-}

diff --git a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/MacroUtil.java b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/MacroUtil.java
deleted file mode 100644
index 7cf9baa..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/MacroUtil.java
+++ /dev/null

@@ -1,955 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.CoolBarManager;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.ICoolBarManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.ToolBarContributionItem;
-import org.eclipse.jface.action.ToolBarManager;
-import org.eclipse.jface.window.ApplicationWindow;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.CoolBar;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.swt.widgets.Widget;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.IPluginContribution;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchPartSite;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.internal.EditorSite;
-import org.eclipse.ui.internal.PartPane;
-import org.eclipse.ui.internal.PartSite;
-import org.eclipse.ui.keys.SWTKeySupport;
-import org.w3c.dom.Node;
-
-public class MacroUtil {
-	private static final String EMPTY_STRING = ""; //$NON-NLS-1$
-
-	/**
-	 * Returns the path where counters of the given event are stored, or null if
-	 * we are not keeping records of the given event.
-	 * 
-	 * @param event
-	 * @return
-	 */
-	public static WidgetIdentifier getWidgetIdentifier(Widget widget) {
-		if (widget instanceof MenuItem) {
-
-			MenuItem menuItem = (MenuItem) widget;
-
-			if (onMenubar(menuItem)) {
-				return new WidgetIdentifier(new Path("menus"), new Path(getActionId(menuItem))); //$NON-NLS-1$
-			}
-			Control c = widget.getDisplay().getFocusControl();
-			WidgetIdentifier ci = getControlIdentifier(c);
-			if (ci==null)
-				return null;
-			return new WidgetIdentifier(new Path("popup").append(ci.getFullyQualifiedPath()), new Path(getActionId(menuItem))); //$NON-NLS-1$
-		} else if (widget instanceof ToolItem) {
-			ToolItem toolItem = (ToolItem) widget;
-			
-			if (onToolbar(toolItem))
-				return new WidgetIdentifier(new Path("toolbar"), new Path(getActionId(toolItem))); //$NON-NLS-1$
-			// local toolbar somewhere - locate the parent
-			// first
-			ToolBar toolBar = toolItem.getParent();
-			WidgetIdentifier controlId = getControlIdentifier(toolBar);
-			IPath localPath = controlId.getFullyQualifiedPath();
-			return new WidgetIdentifier(new Path("local-toolbar").append(localPath), 
-										new Path(getActionId(toolItem)));
-		} else if (widget instanceof Shell) {
-			return new WidgetIdentifier(new Path("shell"), getShellId((Shell)widget));
-		} else if (widget instanceof Control) {
-			return getControlIdentifier((Control)widget);
-		} else if (widget instanceof Menu) {
-			return new WidgetIdentifier(new Path("menu"), new Path(getActionId((Menu)widget)));
-		}
-		return null;
-	}
-	
-	public static IPath getShellId(Shell shell) {
-		Object data = shell.getData();
-		String id = "";
-		if (data instanceof WizardDialog) {
-			id = data.getClass().getName().toString();
-		}
-		else if (data instanceof Window) {
-			id = data.getClass().getName().toString();
-		}
-		return new Path(id);
-	}
-
-	public static WidgetIdentifier getControlIdentifier(Control control) {
-		Shell shell = control.getShell();
-		Object data = shell.getData();
-		if (data instanceof WizardDialog) {
-			// in wizard
-			WizardDialog wd = (WizardDialog)data;
-			IWizardPage page = wd.getCurrentPage();
-			if (page==null) return null;
-			Control pageControl = page.getControl();
-			String relativePath = computeRelativePath((Composite)pageControl, null, control);
-			if (relativePath!=null) {
-				IPath path = new Path("wizard-page").append(page.getName());
-				return new WidgetIdentifier(path, new Path(relativePath));
-			}
-			// check for wizard buttons
-			if (control instanceof Button) {
-				relativePath = computeRelativePath(shell, (Composite)pageControl, control);
-				return new WidgetIdentifier(new Path("wizard"), new Path(relativePath));
-			}
-			return null;
-		}
-		else if (data instanceof IWorkbenchWindow) {
-			IWorkbenchWindow window = (IWorkbenchWindow)data;
-			IWorkbenchPage page = window.getActivePage();
-			IWorkbenchPart part = page.getActivePart();
-			IWorkbenchPartSite site = part.getSite();
-			IPath path;
-			if (part instanceof IViewPart)
-				path = new Path("view").append(site.getId());
-			else if (part instanceof IEditorPart) {
-				String inputName = ((IEditorPart)part).getEditorInput().getName();
-				path = new Path("editor").append(site.getId()).append(inputName);
-			}
-			else
-				return null;
-			PartSite partSite = (PartSite)site;
-			PartPane pane = partSite.getPane();
-			Composite paneComposite = (Composite)pane.getControl();
-			// If the control we are looking for is a local tool bar,
-			// go up one level
-			if (part instanceof IViewPart && control instanceof ToolBar)
-				paneComposite = paneComposite.getParent();
-			String relativePath = computeRelativePath(paneComposite, null, control);
-			if (relativePath!=null) {
-				return new WidgetIdentifier(path, new Path(relativePath));
-			}
-		}
-		else {
-			// unknown shell - fetch controls starting from the shell
-			String relativePath = computeRelativePath(shell, null, control);
-			return new WidgetIdentifier(new Path("shell"), new Path(relativePath));
-		}
-		return null;
-	}
-
-	private static String computeRelativePath(Composite parent, Composite skip, Control control) {
-		int [] counter = new int[1];
-		counter[0] = 0;
-		boolean result = computeControlToken(parent, skip, control, counter);
-		if (!result && skip==null) return null;
-		int index = result?counter[0]:0;
-		return getControlId(control, index);
-	}
-	
-	private static String getControlId(Control control, int index) {
-		MacroManager recorder = MacroPlugin.getDefault().getMacroManager();
-		String controlId = recorder.resolveWidget(control);
-		if (controlId==null)
-			controlId = index+"";
-		return control.getClass().getName()+"#"+controlId;
-	}
-	
-	private static boolean computeControlToken(Composite parent, Composite skip, Control control, int [] counter) {
-		Control [] children = parent.getChildren();
-		for (int i=0; i<children.length; i++) {
-			Control child = children[i];
-			
-			if (!child.isVisible()) continue;			
-
-			if (child.getClass().equals(control.getClass())) {
-				// same type - increment counter
-				counter[0]++;
-				if (control.equals(child)) {
-					// bingo
-					return true;
-				}
-			}
-			else if (child instanceof Composite) {
-				if (skip!=null && child.equals(skip)) continue;
-				boolean status = computeControlToken((Composite)child, skip, control, counter);
-				if (status)
-					return true;
-			}
-		}
-		return false;
-	}
-	
-	public static boolean isInputControl(Control control) {
-		return true;
-	}
-
-	/**
-	 * @param menuItem
-	 * @return
-	 */
-	private static boolean onMenubar(MenuItem menuItem) {
-		Menu parent = menuItem.getParent();
-		MenuItem parentItem = parent.getParentItem();
-
-		if (parentItem != null) {
-			return onMenubar(parentItem);
-		}
-
-		Shell theShell = parent.getShell();
-
-		return parent == theShell.getMenuBar();
-	}
-	
-	private static boolean onToolbar(ToolItem toolItem) {
-		ToolBar toolBar = toolItem.getParent();
-		Shell shell = toolBar.getShell();
-		Object data = shell.getData();
-		if (data instanceof ApplicationWindow) {
-			ApplicationWindow window = (ApplicationWindow)data;
-			ToolBarManager mng = window.getToolBarManager();
-			if (mng!=null) {
-				if (mng.getControl()!=null && mng.getControl()==toolBar)
-					return true;
-			}
-			CoolBarManager cmng = window.getCoolBarManager();
-			if (cmng!=null) {
-				CoolBar cbar = cmng.getControl();
-				Composite parent = toolBar.getParent();
-				while (parent!=null) {
-					if (parent == cbar) return true;
-					parent = parent.getParent();
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @param toolItem
-	 * @return
-	 */
-	private static String getActionId(ToolItem toolItem) {
-		Object data = toolItem.getData();
-		if (data != null && (data instanceof IContributionItem)) {
-			String result = getActionId((IContributionItem) data);
-			if (!result.equals(EMPTY_STRING)) {
-				return result;
-			}
-		}
-
-		return "readablename/" + getDisplayName(toolItem); //$NON-NLS-1$
-	}
-
-	/**
-	 * @param toolItem
-	 * @return
-	 */
-	private static String getDisplayName(ToolItem toolItem) {
-		String name = toolItem.getText();
-
-		if (name != null && !name.equals(EMPTY_STRING)) {
-			return name;
-		}
-
-		name = toolItem.getToolTipText();
-
-		if (name != null) {
-			return name;
-		}
-
-		return "unknown"; //$NON-NLS-1$
-	}
-
-	/**
-	 * Returns an identifier for the given MenuItem, based on its user-readable
-	 * strings
-	 * 
-	 * @param menuItem
-	 * @return
-	 */
-	private static String getDisplayName(MenuItem menuItem) {
-
-		if (menuItem.getParent() == null
-				|| menuItem.getParent().getParentItem() == null) {
-			return removeChar(menuItem.getText(), '&');
-		}
-
-		return getDisplayName(menuItem.getParent()) + "/" //$NON-NLS-1$
-				+ removeChar(menuItem.getText(), '&');
-	}
-
-	/**
-	 * Returns an identifier for the given Menu, based on its user-readable
-	 * strings
-	 * 
-	 * @param menu
-	 * @return
-	 */
-	private static String getDisplayName(Menu menu) {
-
-		MenuItem parentItem = menu.getParentItem();
-
-		if (parentItem == null) {
-			return EMPTY_STRING;
-		}
-
-		return getDisplayName(parentItem);
-	}
-
-	protected String getContribId(MenuItem menuItem) {
-		Object data = menuItem.getData();
-		if (data != null && (data instanceof IContributionItem)) {
-			String result = ((IContributionItem) data).getId();
-
-			if (result != null) {
-				return result;
-			}
-		}
-
-		return EMPTY_STRING;
-	}
-
-	/**
-	 * @param menuItem
-	 * @return
-	 */
-	private static String getActionId(MenuItem menuItem) {
-		Object data = menuItem.getData();
-		if (data != null && (data instanceof IContributionItem)) {
-			String result = getActionId((IContributionItem) data);
-			if (!result.equals(EMPTY_STRING)) {
-				return result;
-			}
-		}
-
-		// return EMPTY_STRING;
-
-		return "readablename/" + getDisplayName(menuItem); //$NON-NLS-1$
-	}
-	
-	private static String getActionId(Menu menu) {
-		Object data = menu.getData();
-		if (data != null && (data instanceof IContributionItem)) {
-			String result = getActionId((IContributionItem) data);
-			if (!result.equals(EMPTY_STRING)) {
-				return result;
-			}
-		}
-
-		// return EMPTY_STRING;
-
-		return "readablename/" + getDisplayName(menu); //$NON-NLS-1$
-	}
-
-	private static String getActionId(IContributionItem contrib) {
-		String id = null;
-		
-		if (contrib instanceof IPluginContribution) {
-			id = ((IPluginContribution)contrib).getLocalId();
-		}
-		if (id==null)
-			id = contrib.getId();
-
-		if (id != null) {
-			return "contribid/" + id; //$NON-NLS-1$
-		}
-
-		if (contrib instanceof ActionContributionItem) {
-			ActionContributionItem actionItem = (ActionContributionItem) contrib;
-
-			id = actionItem.getId();
-
-			if (id != null) {
-				return "actionid/" + id; //$NON-NLS-1$
-			}
-
-			IAction action = actionItem.getAction();
-
-			id = action.getActionDefinitionId();
-
-			if (id != null) {
-				return "defid/" + id; //$NON-NLS-1$
-			}
-
-			return "actionclass/" + action.getClass().getName(); //$NON-NLS-1$
-		}
-		return "contribclass/" + contrib.getClass().getName(); //$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.instrumentation.IDataProvider#getDefaultValue(org.eclipse.core.runtime.IPath)
-	 */
-	public Object getDefaultValue(IPath node) throws CoreException {
-		return null;
-	}
-
-	private MenuItem getMenuItem(Menu menu, IPath menuPath) {
-		if (menuPath.isEmpty()) {
-			return null;
-		}
-
-		String toFind = menuPath.segment(0);
-		MenuItem[] items = menu.getItems();
-
-		for (int idx = 0; idx < items.length; idx++) {
-			MenuItem item = items[idx];
-
-			String itemName = removeChar(item.getText(), '&');
-
-			if (itemName.equals(toFind)) {
-				return getMenuItem(item, menuPath.removeFirstSegments(1));
-			}
-		}
-
-		return null;
-	}
-
-	private MenuItem getMenuItem(MenuItem menu, IPath menuPath) {
-		if (menuPath.isEmpty()) {
-			return menu;
-		}
-
-		Menu subMenu = menu.getMenu();
-		if (subMenu == null) {
-			return null;
-		}
-
-		return getMenuItem(subMenu, menuPath);
-
-	}
-	public static String removeChar(String input, char toRemove) {
-		StringBuffer buf = new StringBuffer(input.length());
-		
-		int last = 0;
-		for (int pos = input.indexOf(toRemove); pos != -1; pos = input.indexOf(toRemove, last)) {
-			buf.append(input.substring(last, pos));
-			last = pos + 1;
-		}
-		
-		buf.append(input.substring(last, input.length()));
-		
-		return buf.toString();
-	}
-	
-	public static String getAttribute(Node node, String name) {
-		Node value = node.getAttributes().getNamedItem(name);
-		if (value!=null)
-			return value.getNodeValue();
-		return null;
-	}	
-	
-	public static String getNormalizedText(String source) {
-		if (source==null) return "";
-		//String result = source.replace('\t', ' ');
-		String result = source;
-		result = result.trim();
-		return result;
-	}
-	
-	public static String getWritableText(String input) {
-		String result = input.trim();
-		StringBuffer buf = new StringBuffer();
-		for (int i = 0; i < result.length(); i++) {
-			char c = result.charAt(i);
-			switch (c) {
-				case '<' :
-					buf.append("&lt;"); //$NON-NLS-1$
-					break;
-				case '>' :
-					buf.append("&gt;"); //$NON-NLS-1$
-					break;
-				case '&' :
-					buf.append("&amp;"); //$NON-NLS-1$
-					break;
-				case '\'' :
-					buf.append("&apos;"); //$NON-NLS-1$
-					break;
-				case '\"' :
-					buf.append("&quot;"); //$NON-NLS-1$
-					break;
-				default :
-					buf.append(c);
-			}
-		}
-		return buf.toString();
-	}
-	
-	public static CommandTarget locateCommandTarget(Composite parent, WidgetIdentifier wid, int line) throws CoreException {
-		return locateCommandTarget(parent, wid, null, line);
-	}
-
-	public static CommandTarget locateCommandTarget(Composite parent, WidgetIdentifier wid, ArrayList parents, int line) throws CoreException {
-		Shell shell = (Shell)parent;
-
-		String firstToken = wid.contextPath.segment(0);
-		IPath wpath = wid.widgetPath;
-		Iterator iter = parents!=null?parents.iterator():null;
-		if (firstToken.equals("menus"))
-			return locateMenuBarItem(shell, wpath, iter, line);
-		if (firstToken.equals("popup"))
-			return locatePopupMenuItem(shell, wid, iter, line);
-		if (firstToken.equals("toolbar"))
-			return locateToolItem(shell, wpath, line);
-		if (firstToken.equals("local-toolbar"))
-			return locateLocalToolItem(shell, wid, line);
-		if (firstToken.equals("wizard"))
-			return locateWizardControl(shell, wpath, line);
-		if (firstToken.equals("shell"))
-			return locateShellControl(shell, wpath, line);
-
-		String id = wid.contextPath.segment(1);
-		if (firstToken.equals("wizard-page"))
-			return locateWizardPageControl(shell, id, wpath, line);
-		if (firstToken.equals("view"))
-			return locateViewControl(shell, id, wpath, line);
-		if (firstToken.equals("editor")) {
-			String inputName = wid.contextPath.segment(2);
-			return locateEditorControl(shell, id, inputName, wpath, line);
-		}
-		return null;
-	}
-	
-	private static CommandTarget locateMenuBarItem(Shell shell, IPath path, Iterator parents, int line) throws CoreException {
-		MenuItem item = null;
-		Object data = shell.getData();
-		Menu menuBar = shell.getMenuBar();
-		
-		if (data instanceof ApplicationWindow && parents!=null) {
-			ApplicationWindow window = (ApplicationWindow)data;
-			MenuManager manager = window.getMenuBarManager();
-			item = locateMenuItem(manager, path.toString(), parents, line);
-		}
-		else {
-			item = locateMenuItem(menuBar, path.toString(), line);
-		}
-		if (item!=null) return new CommandTarget(item, menuBar);
-		throwCoreException("Cannot locate menu item: "+path.toString(), line);
-		return null;
-	}
-
-	private static MenuItem locateMenuItem(Menu menu, String id, int line) {
-		MenuItem [] items = menu.getItems();
-		
-		for (int i=0; i<items.length; i++) {
-			MenuItem item = items[i];
-		
-			Menu submenu = item.getMenu();
-			if (submenu!=null) {
-				MenuItem hit = locateMenuItem(submenu, id, line);
-				if (hit!=null)
-					return hit;
-			}
-			else {
-				String itemId = getActionId(item);
-				if (itemId!=null && id.equals(itemId))
-					return item;
-			}
-		}
-		return null;
-	}
-	
-	private static MenuItem locateMenuItem(MenuManager mng, String id, Iterator parents, int line) {
-		IContributionItem [] items = mng.getItems();
-		
-		String parentId = null;
-		if (parents.hasNext())
-			parentId = (String)parents.next();
-		
-		for (int i=0; i<items.length; i++) {
-			IContributionItem citem = items[i];
-			
-			if (citem instanceof MenuManager) {
-				MenuManager submenu = (MenuManager)citem;
-				String subId = submenu.getId();
-				
-				if (subId.equals(parentId)) {
-					// show this menu to force dynamic items
-					// to show
-					Menu menu = submenu.getMenu();
-					forceMenuOpen(null, menu);
-					
-					MenuItem hit = locateMenuItem(submenu, id, parents, line);
-					forceMenuClosed(menu);
-					if (hit!=null)
-						return hit;
-				}
-			}
-			else {
-				String itemId = getActionId(citem);
-				if (itemId!=null && id.equals(itemId)) {
-					MenuItem hit = locateMenuItem(mng.getMenu(), id, line);
-					if (hit!=null)
-						return hit;
-				}
-			}
-		}
-		return null;
-	}
-	
-	private static void forceMenuOpen(Control c, Menu menu) {
-		Event e = new Event();
-		e.type = SWT.Show;
-		e.widget = menu;
-		/*
-		if (c!=null) {
-			Point midpoint = c.getSize();
-			midpoint.x /= 2;
-			midpoint.y /= 2;
-			midpoint = c.toDisplay(midpoint);
-			menu.setLocation(midpoint);
-		}
-		*/
-		//menu.setVisible(true);
-		menu.notifyListeners(e.type, e);
-		processDisplayEvents(menu.getDisplay());
-	}
-	
-	private static void forceMenuClosed(Menu menu) {
-		Event e = new Event();
-		e.type = SWT.Hide;
-		//menu.setVisible(false);
-		e.widget = menu;
-		menu.notifyListeners(e.type, e);
-		processDisplayEvents(menu.getDisplay());
-	}
-	
-	public static void processDisplayEvents(Display display) {
-		for (;;) {
-			if (!display.readAndDispatch ()) 
-				break;
-		}
-	}
-
-	private static CommandTarget locatePopupMenuItem(Shell shell, WidgetIdentifier wid, Iterator parents, int line) throws CoreException {
-		IPath contextPath = wid.contextPath.removeFirstSegments(1);
-		IPath wpath = new Path(contextPath.lastSegment());
-		contextPath = contextPath.removeLastSegments(1);
-		CommandTarget target = locateCommandTarget(shell, new WidgetIdentifier(contextPath, wpath), line);
-		if (target!=null) {
-			Control control = (Control)target.getWidget();
-			Menu popupMenu = control.getMenu();
-			if (popupMenu!=null) {
-				forceMenuOpen(control, popupMenu);
-				MenuItem menuItem = locateMenuItem(popupMenu, wid.getWidgetId(), line);
-				forceMenuClosed(popupMenu);
-				if (menuItem!=null) {
-					return new CommandTarget(menuItem, control);
-				}
-			}
-		}
-		throwCoreException("Cannot locate pop-up menu item: "+wid.getWidgetId(), line);
-		return null;
-	}
-
-	private static CommandTarget locateToolItem(Shell shell, IPath path, int line) throws CoreException {
-		Object data = shell.getData();
-		CommandTarget target = null;
-		if (data instanceof ApplicationWindow) {
-			ApplicationWindow window = (ApplicationWindow)data;
-			CoolBarManager coolMng = window.getCoolBarManager();
-			if (coolMng!=null) {
-				target = locateToolItem(coolMng, path.toString(), line);
-			}
-			ToolBarManager toolMng = window.getToolBarManager();
-			if (toolMng!=null) {
-				target = locateToolItem(toolMng, path.toString(), line);
-			}
-		}
-		if (target==null)
-			throwCoreException("Cannot locate pop-up menu item: "+path.toString(), line);
-		return target;
-	}
-	
-	private static CommandTarget locateToolItem(ICoolBarManager coolMng, String id, int line) {
-		IContributionItem [] items = coolMng.getItems();
-		for (int i=0; i<items.length; i++) {
-			if (items[i] instanceof ToolBarContributionItem) {
-				ToolBarContributionItem item = (ToolBarContributionItem)items[i];
-				IToolBarManager toolMng = item.getToolBarManager();
-				CommandTarget target = locateToolItem((ToolBarManager)toolMng, id, line);
-				if (target!=null)
-					return target;
-			}
-		}
-		return null;
-	}
-
-	private static CommandTarget locateToolItem(ToolBarManager toolMng, String id, int line) {
-		return locateToolItem(toolMng.getControl(), id, line);
-	}
-	
-	private static CommandTarget locateToolItem(ToolBar toolBar, String id, int line) {
-		ToolItem [] items = toolBar.getItems();
-		for (int i=0; i<items.length; i++) {
-			ToolItem item = items[i];
-			String itemId = getActionId(item);
-			if (itemId!=null && itemId.equals(id))
-				return new CommandTarget(item, toolBar);
-		}
-		return null;
-	}
-	
-	private static CommandTarget locateLocalToolItem(Shell shell, WidgetIdentifier wid, int line) throws CoreException {
-		IPath wpath = wid.contextPath.removeFirstSegments(1);
-		String firstToken = wpath.segment(0);
-		
-		if (firstToken.equals("view")) {
-			String id = wpath.segment(1);
-			IViewPart view = locateView(shell, id, line);
-			if (view!=null) {
-				PartPane pane = getPartPane(view);
-				processDisplayEvents(shell.getDisplay());
-				Composite parent = pane.getControl().getParent();
-				Control c = locateVisibleChild((Composite)parent, null, wpath.removeFirstSegments(2));
-				if (c!=null) {	
-					//TODO bad cast
-					ToolBarManager mng = (ToolBarManager)view.getViewSite().getActionBars().getToolBarManager();
-					CommandTarget target = locateToolItem(mng, wid.getWidgetId(), line);
-					if (target!=null)
-						return target;
-				}
-			}
-		}
-		throwCoreException("Cannot locate local tool bar item: "+wid.getFullyQualifiedId().toString(), line);
-		return null;
-	}
-
-	private static WizardCommandTarget locateWizardControl(Shell shell, IPath wpath, int line) throws CoreException {
-		WizardDialog wdialog = (WizardDialog)shell.getData();
-		IWizardPage page = wdialog.getCurrentPage();
-		Composite pparent = (Composite)page.getControl();
-		Control control=locateVisibleChild(shell, pparent, wpath);
-		if (control==null)
-			throwCoreException("Cannot locate wizard control: "+wpath.toString(), line);
-		if (control.isDisposed())
-			throwCoreException("Wizard control is disposed: "+wpath.toString(), line);
-		return new WizardCommandTarget(control, wdialog);
-	}
-	
-	private static WindowCommandTarget locateShellControl(Shell shell, IPath wpath, int line) throws CoreException {
-		Window window = (Window)shell.getData();
-		Control control=locateVisibleChild(shell, null, wpath);
-		if (control==null)
-			throwCoreException("Cannot locate shell control: "+wpath.toString(), line);
-		if (control.isDisposed())
-			throwCoreException("Shell control is disposed: "+wpath.toString(), line);
-		return new WindowCommandTarget(control, window);
-	}
-
-	private static WizardCommandTarget locateWizardPageControl(Shell shell, String id, IPath wpath, int line) throws CoreException {
-		Control control=null;
-		Object data = shell.getData();
-		if (data instanceof WizardDialog) {
-			WizardDialog wdialog = (WizardDialog)data;
-			IWizardPage page = wdialog.getCurrentPage();
-			String pname = page.getName();
-			// assert page
-			if (pname.equals(id)==false)
-				throwCoreException("Unexpected wizard page: "+pname+", expected "+id, line);
-			Composite pparent = (Composite)page.getControl();
-			control = locateVisibleChild(pparent, null, wpath);
-			if (control!=null)
-				return new WizardCommandTarget(control, wdialog);
-		}
-		if (control==null)
-			throwCoreException("Cannot locate wizard page control: "+wpath.toString(), line);
-		return null;
-	}
-	
-	private static IViewPart locateView(Shell shell, String id, int line) throws CoreException {
-		Object data = shell.getData();
-		
-		if (data instanceof IWorkbenchWindow) {
-			IWorkbenchWindow window = (IWorkbenchWindow)data;
-			IWorkbenchPage page = window.getActivePage();
-			if (page!=null) {
-				IViewPart view = page.showView(id);
-				return view;
-			}
-		}
-		throwCoreException("Cannot locate view: "+id, line);
-		return null;		
-	}
-	
-	private static PartPane getPartPane(IViewPart part) {
-		IWorkbenchPartSite site = part.getSite();
-		PartPane pane = ((PartSite)site).getPane();
-		return pane;
-	}
-	
-	private static ViewCommandTarget locateViewControl(Shell shell, String id, IPath wpath, int line) throws CoreException {
-		Control control=null;
-		
-		IViewPart view = locateView(shell, id, line);
-		if (view!=null) {
-			PartPane pane = getPartPane(view);
-			Control c = pane.getControl();
-			control = locateVisibleChild((Composite)c, null, wpath);
-			if (control!=null) {
-				return new ViewCommandTarget(control, view);
-			}
-		}
-		throwCoreException("Cannot locate view control: "+wpath.toString(), line);
-		return null;
-	}
-	private static EditorCommandTarget locateEditorControl(Shell shell, String id, String inputName, IPath wpath, int line) throws CoreException {
-		Control control=null;
-		
-		Object data = shell.getData();
-		
-		if (data instanceof IWorkbenchWindow) {
-			IWorkbenchWindow window = (IWorkbenchWindow)data;
-			IWorkbenchPage page = window.getActivePage();
-			if (page!=null) {
-				IEditorReference [] erefs = page.getEditorReferences();
-				IEditorPart editor=null;
-				for (int i=0; i<erefs.length; i++) {
-					IEditorReference eref = erefs[i];
-					if (eref.getId().equals(id)) {
-						// check the input
-						IEditorPart part = eref.getEditor(true);
-						if (part.getEditorInput().getName().equals(inputName)) {
-						   editor = part;
-						   break;
-						}
-					}
-				}
-				if (editor!=null) {
-					IEditorSite site = editor.getEditorSite();
-					PartPane pane = ((EditorSite)site).getPane();
-					Control c = pane.getControl();
-					control = locateVisibleChild((Composite)c, null, wpath);
-					if (control!=null) {
-						return new EditorCommandTarget(control, editor);
-					}
-				}
-			}
-		}
-		if (control==null)
-			throwCoreException("Cannot locate editor control: "+wpath.toString(), line);
-		return null;
-	}
-	
-	private static Control locateVisibleChild(Composite parent, Composite skip, IPath wpath) {
-		int [] counter = new int[1];
-		counter[0] = 0;
-		String wid = wpath.toString();
-		int sloc = wid.lastIndexOf('#');
-		if (sloc== -1) return null;
-		String wclassName = wid.substring(0, sloc);
-		return locateVisibleChild(parent, skip, wid, wclassName, counter);
-	}
-	
-	private static Control locateVisibleChild(Composite parent, Composite skip, String id, String wclassName, int [] counter) {
-		Control [] children = parent.getChildren();
-		for (int i=0; i<children.length; i++) {
-			Control child = children[i];
-
-			if (child.getClass().getName().equals(wclassName)) {
-				// same type - increment counter
-				if (child.isVisible()==false) continue;
-				counter[0]++;
-				String cid = getControlId(child, counter[0]);
-				if (cid.equals(id)) {
-					// bingo
-					return child;
-				}
-			}
-			else if (child instanceof Composite) {
-				if (skip!=null && child.equals(skip)) continue;
-				if (!child.isVisible()) continue;
-				Control c = locateVisibleChild((Composite)child, skip, id, wclassName, counter);
-				if (c!=null)
-					return c;
-			}
-		}
-		return null;
-	}
-
-	public static void throwCoreException(String message, int line) throws CoreException {
-		throwCoreException(message, line, null);
-	}
-	public static void throwCoreException(String message, int line, Throwable t) throws CoreException {
-        if (line >0) 
-            message = "Line "+line+": "+message;
-		Status s = new Status(IStatus.ERROR, "org.eclipse.ui.macro", IStatus.OK, message, t);
-		throw new CoreException(s);
-	}
-	
-    public static java.util.List generatePossibleKeyStrokes(Event event) {
-        final java.util.List keyStrokes = new ArrayList(3);
-
-        /*
-         * If this is not a keyboard event, then there are no key strokes. This
-         * can happen if we are listening to focus traversal events.
-         */
-        if ((event.stateMask == 0) && (event.keyCode == 0)
-                && (event.character == 0)) {
-            return keyStrokes;
-        }
-
-        // Add each unique key stroke to the list for consideration.
-        final int firstAccelerator = SWTKeySupport
-                .convertEventToUnmodifiedAccelerator(event);
-        keyStrokes.add(SWTKeySupport
-                .convertAcceleratorToKeyStroke(firstAccelerator));
-
-        // We shouldn't allow delete to undergo shift resolution.
-        if (event.character == SWT.DEL) {
-            return keyStrokes;
-        }
-
-        final int secondAccelerator = SWTKeySupport
-                .convertEventToUnshiftedModifiedAccelerator(event);
-        if (secondAccelerator != firstAccelerator) {
-            keyStrokes.add(SWTKeySupport
-                    .convertAcceleratorToKeyStroke(secondAccelerator));
-        }
-
-        final int thirdAccelerator = SWTKeySupport
-                .convertEventToModifiedAccelerator(event);
-        if ((thirdAccelerator != secondAccelerator)
-                && (thirdAccelerator != firstAccelerator)) {
-            keyStrokes.add(SWTKeySupport
-                    .convertAcceleratorToKeyStroke(thirdAccelerator));
-        }
-
-        return keyStrokes;
-    }
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/ModifyCommand.java b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/ModifyCommand.java
deleted file mode 100644
index a45dcb5..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/ModifyCommand.java
+++ /dev/null

@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-import java.io.PrintWriter;
-import java.util.Hashtable;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.swt.custom.*;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.widgets.*;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Node;
-
-public class ModifyCommand extends MacroCommand {
-	public static final String TYPE = "modify";
-
-	private String text;
-
-	public ModifyCommand(WidgetIdentifier wid) {
-		super(wid);
-	}
-
-	public String getType() {
-		return TYPE;
-	}
-
-	public boolean mergeEvent(Event e) {
-		return doProcessEvent(e);
-	}
-
-	public void processEvent(Event e) {
-		doProcessEvent(e);
-	}
-
-	protected void load(Node node, Hashtable lineTable) {
-		super.load(node, lineTable);
-
-		NodeList children = node.getChildNodes();
-		for (int i=0; i<children.getLength(); i++) {
-			Node child = children.item(i);
-			if (child.getNodeType()==Node.TEXT_NODE) {
-				text = MacroUtil.getNormalizedText(child.getNodeValue());
-				break;
-			}
-		}
-	}
-
-	private boolean doProcessEvent(Event e) {
-		String text = extractText(e.widget);
-		if (text != null) {
-			this.text = text;
-			return true;
-		}
-		return false;
-	}
-
-	private String extractText(Widget widget) {
-		if (widget instanceof Text)
-			return ((Text) widget).getText();
-		if (widget instanceof Combo)
-			return ((Combo) widget).getText();
-		if (widget instanceof CCombo)
-			return ((CCombo) widget).getText();
-		if (widget instanceof StyledText)
-			return MacroUtil.getWritableText(((StyledText) widget).getText());
-		return null;
-	}
-
-	public void write(String indent, PrintWriter writer) {
-		writer.print(indent);
-		writer.print("<command type=\"");
-		writer.print(getType());
-		writer.print("\" contextId=\"");
-		writer.print(getWidgetId().getContextId());
-		writer.print("\" widgetId=\"");
-		writer.print(getWidgetId().getWidgetId());
-		writer.println("\">");
-		if (text != null) {
-			writer.print(indent);
-			writer.print(text);
-			writer.println();
-		}
-		writer.print(indent);
-		writer.println("</command>");
-	}
-
-	public boolean playback(Display display, Composite parent, IProgressMonitor monitor) throws CoreException {
-		if (parent.isDisposed()) return false;
-		CommandTarget target = MacroUtil.locateCommandTarget(parent,
-				getWidgetId(), getStartLine());
-		if (target != null) {
-			target.setFocus();
-			Widget widget = target.getWidget();
-			if (widget instanceof Text)
-				((Text) widget).setText(text);
-			else if (widget instanceof Combo)
-				((Combo) widget).setText(text);
-			else if (widget instanceof CCombo)
-				((CCombo) widget).setText(text);
-			else if (widget instanceof StyledText)
-				((StyledText)widget).setText(text);
-		}
-		return true;
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/StructuredSelectionCommand.java b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/StructuredSelectionCommand.java
deleted file mode 100644
index e9431fb..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/StructuredSelectionCommand.java
+++ /dev/null

@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-
-import java.util.ArrayList;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.*;
-import org.eclipse.swt.widgets.*;
-
-public class StructuredSelectionCommand extends AbstractStructuredCommand {
-	private String type;
-	public static final String DEFAULT_SELECT="default-select";
-	public static final String ITEM_SELECT="item-select";
-	
-	public StructuredSelectionCommand(WidgetIdentifier wid, String type) {
-		super(wid);
-		items = new ArrayList();
-		this.type = type;
-	}
-
-	public boolean mergeEvent(Event e) {
-		if (e.type==SWT.DefaultSelection) {
-			this.type = DEFAULT_SELECT;
-		}
-		return super.mergeEvent(e);
-	}
-	
-	public String getType() {
-		return type;
-	}
-
-	protected Widget[] getItemsForEvent(Event event) {
-		if (event.widget instanceof Tree) {
-			return ((Tree)event.widget).getSelection();
-		}
-		else if (event.widget instanceof Table) {
-			return ((Table)event.widget).getSelection();
-		}
-		else if (event.widget instanceof TableTree) {
-			return ((TableTree)event.widget).getSelection();
-		}
-		return super.getItemsForEvent(event);
-	}
-
-	protected void playTreeCommand(Tree tree, TreeItem[] matches) {
-		tree.setSelection(matches);
-		fireEvent(tree, matches);
-	}
-	
-	private void fireEvent(Widget widget, Widget [] items) {
-		Event e = new Event();
-		e.widget = widget;
-		e.type = type.equals(ITEM_SELECT)?SWT.Selection:SWT.DefaultSelection;
-		e.item = items.length>0?items[0]:null;
-		widget.notifyListeners(e.type, e);
-	}
-
-	protected void playTableCommand(Table table, TableItem[] matches) {
-		table.setSelection(matches);
-		fireEvent(table, matches);
-	}
-	
-	protected void playTableTreeCommand(TableTree tableTree, TableTreeItem [] matches) {
-		tableTree.setSelection(matches);
-		fireEvent(tableTree, matches);
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/ToggleStructuredCommand.java b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/ToggleStructuredCommand.java
deleted file mode 100644
index 6ac1bc1..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/ToggleStructuredCommand.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-import java.io.PrintWriter;
-import java.util.Hashtable;
-
-import org.eclipse.swt.widgets.Event;
-import org.w3c.dom.Node;
-
-public abstract class ToggleStructuredCommand extends AbstractStructuredCommand {
-	protected boolean value;
-
-	/**
-	 * @param wid
-	 */
-	public ToggleStructuredCommand(WidgetIdentifier wid) {
-		super(wid);
-	}
-	
-	public boolean mergeEvent(Event e) {
-		return false;
-	}
-	
-	protected void load(Node node, Hashtable lineTable) {
-		super.load(node, lineTable);
-		String att = MacroUtil.getAttribute(node, "value");
-		this.value = att!=null && att.equals("true");
-	}
-	
-	protected void writeAdditionalAttributes(PrintWriter writer) {
-		writer.print(" value=\"");
-		writer.print(value?"true":"false");
-		writer.print("\"");
-	}
-	
-	public boolean getValue() {
-		return value;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/ViewCommandTarget.java b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/ViewCommandTarget.java
deleted file mode 100644
index 579fcb8..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/ViewCommandTarget.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-import org.eclipse.swt.widgets.Widget;
-import org.eclipse.ui.*;
-import org.eclipse.ui.IViewPart;
-
-public class ViewCommandTarget extends CommandTarget {
-	public ViewCommandTarget(Widget widget, IViewPart view) {
-		super(widget, view);
-	}
-	
-	public IViewPart getView() {
-		return (IViewPart)getContext();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.macro.CommandTarget#ensureVisible()
-	 */
-	public void ensureVisible() {
-		IViewPart view = getView();
-		IWorkbenchPage page = view.getViewSite().getPage();
-		page.activate(view);
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/WaitCommand.java b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/WaitCommand.java
deleted file mode 100644
index 1d09569..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/WaitCommand.java
+++ /dev/null

@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-import java.io.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.jobs.*;
-import org.eclipse.swt.widgets.*;
-
-public class WaitCommand extends MacroCommand {
-	public static final String TYPE = "wait";
-	private static final WidgetIdentifier nullIdentifier = new WidgetIdentifier(new Path(""), new Path(""));
-	
-	private static class JobListener extends JobChangeAdapter {
-		private int counter=0;
-		private IProgressMonitor monitor;
-		private Thread t;
-		
-		public JobListener(IProgressMonitor monitor, Thread t, int number) {
-			this.counter = number;
-			this.monitor = monitor;
-			this.t = t;
-		}
-		private synchronized void change(int increment) {
-			this.counter += increment;
-			if (counter==0) { 
-				monitor.subTask("");
-				synchronized (t) {
-					t.interrupt();
-				}
-			}
-		}
-		public void running(IJobChangeEvent event) {
-			Job job = event.getJob();
-			if (!job.isSystem()) 
-				change(1);
-		}
-		public void done(IJobChangeEvent event) {
-			Job job = event.getJob();
-			if (!job.isSystem()) 
-				change(-1);
-		}
-	}
-
-	public WaitCommand() {
-		super(nullIdentifier);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.macro.MacroCommand#getType()
-	 */
-	public String getType() {
-		return TYPE;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.macro.MacroCommand#processEvent(org.eclipse.swt.widgets.Event)
-	 */
-	public void processEvent(Event e) {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.macro.IWritable#write(java.lang.String,
-	 *      java.io.PrintWriter)
-	 */
-	public void write(String indent, PrintWriter writer) {
-		writer.print(indent);
-		writer.print("<command type=\"");
-		writer.print(getType());
-		writer.print("\"");
-		writer.println("/>");
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.macro.IPlayable#playback(org.eclipse.swt.widgets.Composite)
-	 */
-	public boolean playback(Display display, Composite parent, IProgressMonitor monitor) throws CoreException {
-		if (parent.isDisposed())
-			return false;
-		IJobManager jobManager = Platform.getJobManager();
-		int nrunning = getNumberOfRunningJobs(jobManager);
-		if (nrunning==0) return true;
-		String message = "Waiting for the background jobs...";
-		JobListener listener = new JobListener(monitor, Thread.currentThread(), nrunning);
-		jobManager.addJobChangeListener(listener);
-		monitor.subTask(message);
-		try {
-			Thread.sleep(30000);
-		}
-		catch (InterruptedException e) {
-		}
-		jobManager.removeJobChangeListener(listener);
-		return true;
-	}
-	private int getNumberOfRunningJobs(IJobManager manager) {
-		int count = 0;
-		Job[] jobs = manager.find(null);
-		for (int i=0; i<jobs.length; i++) {
-			if (!jobs[i].isSystem() && jobs[i].getState()==Job.RUNNING)
-				count++;
-		}
-		return count;
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/WidgetIdentifier.java b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/WidgetIdentifier.java
deleted file mode 100644
index 00a43bb..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/WidgetIdentifier.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-import org.eclipse.core.runtime.IPath;
-
-public class WidgetIdentifier {
-	public IPath contextPath;
-	public IPath widgetPath;
-	
-	public WidgetIdentifier(IPath contextPath, IPath widgetPath) {
-		this.contextPath = contextPath;
-		this.widgetPath = widgetPath;
-	}
-	
-	public String getContextId() {
-		return contextPath.toString();
-	}
-	public String getWidgetId() {
-		return widgetPath.toString();
-	}
-	public IPath getFullyQualifiedPath() {
-		return contextPath.append(widgetPath);
-	}
-	public String getFullyQualifiedId() {
-		return getFullyQualifiedPath().toString();
-	}
-	public boolean equals(Object obj) {
-		if (obj==null) return false;
-		if (obj==this) return true;
-		if (obj instanceof WidgetIdentifier) {
-			WidgetIdentifier wid = (WidgetIdentifier)obj;
-			return wid.contextPath.equals(contextPath) && wid.widgetPath.equals(widgetPath);
-		}
-		return false;
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/WindowCommandTarget.java b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/WindowCommandTarget.java
deleted file mode 100644
index 901fc78..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/WindowCommandTarget.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Widget;
-
-public class WindowCommandTarget extends CommandTarget {
-	/**
-	 * @param widget
-	 * @param context
-	 */
-	public WindowCommandTarget(Widget widget, Window window) {
-		super(widget, window);
-	}
-	
-	Window getWindow() {
-		return (Window)getContext();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.macro.CommandTarget#ensureVisible()
-	 */
-	public void ensureVisible() {
-		Window window = getWindow();
-		window.getShell().setActive();
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/WizardCommandTarget.java b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/WizardCommandTarget.java
deleted file mode 100644
index 3da23df..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/WizardCommandTarget.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.widgets.Widget;
-
-public class WizardCommandTarget extends WindowCommandTarget {
-	/**
-	 * @param widget
-	 * @param window
-	 */
-	public WizardCommandTarget(Widget widget, Window window) {
-		super(widget, window);
-	}
-
-	public WizardDialog getWizardDialog() {
-		return (WizardDialog)getWindow();
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/XMLDefaultHandler.java b/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/XMLDefaultHandler.java
deleted file mode 100644
index 395e887..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro Manager/org/eclipse/pde/internal/ui/tests/macro/XMLDefaultHandler.java
+++ /dev/null

@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-import java.util.*;
-
-import javax.xml.parsers.*;
-
-import org.w3c.dom.*;
-import org.xml.sax.*;
-import org.xml.sax.helpers.*;
-
-public class XMLDefaultHandler extends DefaultHandler {
-
-    private org.w3c.dom.Document fDocument;
-
-    private Locator fLocator;
-
-    private Hashtable fLineTable;
-
-    private Element fRootElement;
-
-    private Stack fElementStack = new Stack();
-
-    public XMLDefaultHandler() {
-        fLineTable = new Hashtable();
-    }
-
-    public void startElement(String uri, String localName, String qName,
-            Attributes attributes) throws SAXException {
-        Element element = fDocument.createElement(qName);
-        for (int i = 0; i < attributes.getLength(); i++) {
-            element
-                    .setAttribute(attributes.getQName(i), attributes
-                            .getValue(i));
-        }
-
-        Integer lineNumber = new Integer(fLocator.getLineNumber());
-        Integer[] range = new Integer[] { lineNumber, new Integer(-1) };
-        fLineTable.put(element, range);
-        if (fRootElement == null)
-            fRootElement = element;
-        else
-            ((Element) fElementStack.peek()).appendChild(element);
-        fElementStack.push(element);
-    }
-
-    public void endElement(String uri, String localName, String qName)
-            throws SAXException {
-        Integer[] range = (Integer[]) fLineTable.get(fElementStack.pop());
-        range[1] = new Integer(fLocator.getLineNumber());
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.xml.sax.helpers.DefaultHandler#setDocumentLocator(org.xml.sax.Locator)
-     */
-    public void setDocumentLocator(Locator locator) {
-        fLocator = locator;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.xml.sax.helpers.DefaultHandler#startDocument()
-     */
-    public void startDocument() throws SAXException {
-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-        try {
-            fDocument = factory.newDocumentBuilder().newDocument();
-        } catch (ParserConfigurationException e) {
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.xml.sax.helpers.DefaultHandler#endDocument()
-     */
-    public void endDocument() throws SAXException {
-        fDocument.appendChild(fRootElement);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.xml.sax.helpers.DefaultHandler#processingInstruction(java.lang.String,
-     *      java.lang.String)
-     */
-    public void processingInstruction(String target, String data)
-            throws SAXException {
-        fDocument.appendChild(fDocument.createProcessingInstruction(target,
-                data));
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.xml.sax.helpers.DefaultHandler#characters(char[], int, int)
-     */
-    public void characters(char[] characters, int start, int length)
-            throws SAXException {
-        StringBuffer buff = new StringBuffer();
-        for (int i = 0; i < length; i++) {
-            buff.append(characters[start + i]);
-        }
-        Text text = fDocument.createTextNode(buff.toString());
-        if (fRootElement == null)
-            fDocument.appendChild(text);
-        else
-            ((Element) fElementStack.peek()).appendChild(text);
-    }
-
-    public Node getDocumentElement() {
-        fDocument.getDocumentElement().normalize();
-        return fDocument.getDocumentElement();
-    }
-
-    public org.w3c.dom.Document getDocument() {
-        fDocument.getDocumentElement().normalize();
-        return fDocument;
-    }
-
-    public Hashtable getLineTable() {
-        return fLineTable;
-    }
-}

diff --git a/ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/DefaultIndexHandler.java b/ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/DefaultIndexHandler.java
deleted file mode 100644
index 212a8e3..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/DefaultIndexHandler.java
+++ /dev/null

@@ -1,26 +0,0 @@
-package org.eclipse.pde.internal.ui.tests.macro;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Shell;
-
-public class DefaultIndexHandler implements IIndexHandler {
-
-	public DefaultIndexHandler() {
-	}
-
-	public IStatus processIndex(final Shell shell, String indexId) {
-		final String message = "Index reached: "+indexId;
-		
-		final IStatus [] result = new IStatus[1];
-		
-		shell.getDisplay().syncExec(new Runnable() {
-			public void run() {
-				MessageDialog.openInformation(shell, "Macro Playback", message);
-				result[0] = Status.OK_STATUS;
-			}
-		});
-		return result[0];
-	}
-}

diff --git a/ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/DefaultWidgetResolver.java b/ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/DefaultWidgetResolver.java
deleted file mode 100644
index f3190ec..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/DefaultWidgetResolver.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.pde.core.IIdentifiable;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.swt.custom.CTabFolder;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.swt.widgets.Widget;
-import org.eclipse.ui.IPluginContribution;
-
-public class DefaultWidgetResolver implements IWidgetResolver {
-	public String getUniqueId(Widget widget) {
-		Object data = widget.getData();
-
-		// direct resolution (widget-independent)
-		if (data instanceof IPluginContribution)
-			return ((IPluginContribution) data).getLocalId();
-
-		// widget-specific resolution
-		if (widget instanceof TreeItem || widget instanceof TableItem) {
-			if (data instanceof IJavaElement)
-				return ((IJavaElement) data).getPath().toString();
-			if (data instanceof IResource)
-				return ((IResource) data).getFullPath().toString();
-			if (data instanceof IClasspathContainer)
-				return ((IClasspathContainer) data).getPath().toString();
-			if (data instanceof IPluginModelBase)
-				return ((IPluginModelBase)data).getPluginBase().getId();
-			if (data instanceof IFeatureModel)
-				return ((IFeatureModel)data).getFeature().getId();
-			if (data instanceof IIdentifiable)
-				return ((IIdentifiable)data).getId();
-		}
-		if (widget instanceof Button) {
-			if (data instanceof Integer)
-				return "ButtonId=" + ((Integer) data).intValue();
-		}
-		if (widget instanceof TabFolder || widget instanceof CTabFolder) {
-		}
-		return null;
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/IndexAction.java b/ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/IndexAction.java
deleted file mode 100644
index a008bda..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/IndexAction.java
+++ /dev/null

@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.pde.internal.ui.tests.macro.IRecorderListener;
-import org.eclipse.pde.internal.ui.tests.macro.MacroManager;
-import org.eclipse.pde.internal.ui.tests.macro.MacroPlugin;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-
-public class IndexAction implements IWorkbenchWindowActionDelegate, IRecorderListener {
-	private IAction action;
-	/**
-	 * The constructor.
-	 */
-	public IndexAction() {
-		MacroManager recorder = MacroPlugin.getDefault().getMacroManager();
-		recorder.addRecorderListener(this);
-	}
-
-	/**
-	 * The action has been activated. The argument of the
-	 * method represents the 'real' action sitting
-	 * in the workbench UI.
-	 * @see IWorkbenchWindowActionDelegate#run
-	 */
-	public void run(IAction action) {
-		MacroManager recorder = MacroPlugin.getDefault().getMacroManager();
-		this.action = action;
-		if (!recorder.isRecording()) {
-			action.setEnabled(false);
-			return;
-		}
-		RecordBlock.getInstance().insertIndex();
-	}
-
-	/**
-	 * Selection in the workbench has been changed. We 
-	 * can change the state of the 'real' action here
-	 * if we want, but this can only happen after 
-	 * the delegate has been created.
-	 * @see IWorkbenchWindowActionDelegate#selectionChanged
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-	}
-
-	public void recordingStarted() {
-		if (action!=null)
-			action.setEnabled(true);
-	}
-
-	public void recordingStopped() {
-		if (action!=null)
-			action.setEnabled(false);
-	}
-
-	public void recordingInterrupted(int type) {
-	}
-
-	/**
-	 * We can use this method to dispose of any system
-	 * resources we previously allocated.
-	 * @see IWorkbenchWindowActionDelegate#dispose
-	 */
-	public void dispose() {
-		MacroManager recorder = MacroPlugin.getDefault().getMacroManager();
-		recorder.removeRecorderListener(this);
-		RecordBlock.dispose();		
-	}
-
-	/**
-	 * We will cache window object in order to
-	 * be able to provide parent shell for the message dialog.
-	 * @see IWorkbenchWindowActionDelegate#init
-	 */
-	public void init(IWorkbenchWindow window) {
-		RecordBlock.init(window);
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/IndexPage.java b/ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/IndexPage.java
deleted file mode 100644
index 38947b9..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/IndexPage.java
+++ /dev/null

@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.wizard.WizardPage;
-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;
-
-public class IndexPage extends WizardPage {
-	private String indexId;
-	private Text text;
-	private TableViewer tableViewer;
-	private String [] existingIndices;
-	
-	class ExistingProvider implements IStructuredContentProvider {
-		public Object[] getElements(Object inputElement) {
-			return existingIndices;
-		}
-
-		public void dispose() {
-		}
-
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		}
-	}
-	
-	public IndexPage(String [] existingIndices) {
-		super("index");
-		setTitle("Script index");
-		setDescription("Enter a unique id for the script index. The index will be processed by index handled during execution of the script.");
-		this.existingIndices = existingIndices;
-	}
-
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		container.setLayout(layout);
-		Label label = new Label(container, SWT.NULL);
-		label.setText("&Index identifier:");
-		text = new Text(container, SWT.SINGLE|SWT.BORDER);
-		text.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				updateStatus();
-			}
-		});
-		text.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		label = new Label(container, SWT.NULL);
-		label.setText("&Existing indices:");
-		tableViewer = new TableViewer(container, SWT.BORDER);
-		tableViewer.setContentProvider(new ExistingProvider());
-		tableViewer.setInput(this);
-		tableViewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
-		tableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				IStructuredSelection sel = (IStructuredSelection)event.getSelection();
-				Object obj = sel.getFirstElement();
-				if (obj!=null)
-					text.setText(obj.toString());
-			}
-		});
-		setPageComplete(false);
-		setControl(container);
-	}
-	
-	public void setVisible(boolean visible) {
-		super.setVisible(visible);
-		if (visible)
-			text.setFocus();
-	}
-	
-	private void updateStatus() {
-		String id = text.getText();
-		String errorMessage=null;
-		if (id.length()==0) {
-			errorMessage = "Index id cannot be empty.";
-		}
-		else {
-			boolean exists=false;
-			for (int i=0; i<existingIndices.length; i++) {
-				if (id.equals(existingIndices[i])) {
-					exists=true;
-					break;
-				}
-			}
-			if (exists)
-				errorMessage="Index id already exists.";
-		}
-		setErrorMessage(errorMessage);
-		setPageComplete(errorMessage==null);
-		if (errorMessage==null)
-			this.indexId = id;
-	}
-	
-	public String getIndexId() {
-		return indexId;
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/IndexWizard.java b/ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/IndexWizard.java
deleted file mode 100644
index 3039d1c..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/IndexWizard.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.pde.internal.ui.tests.macro.MacroManager;
-
-
-public class IndexWizard extends Wizard {
-	private IndexPage page;
-	private MacroManager macroManager;
-	
-	public IndexWizard(MacroManager manager) {
-		this.macroManager = manager;
-		setWindowTitle("Macro Recorder");
-	}
-	
-	public void addPages() {
-		page = new IndexPage(macroManager.getExistingIndices());
-		addPage(page);
-	}
-	
-	public boolean performFinish() {
-		String indexId = page.getIndexId();
-		if (indexId!=null) {
-			macroManager.addIndex(indexId);
-		}
-		return true;
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/NewMacroWizard.java b/ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/NewMacroWizard.java
deleted file mode 100644
index 7885a8b..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/NewMacroWizard.java
+++ /dev/null

@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-import java.io.*;
-import java.io.ByteArrayInputStream;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.*;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-
-public class NewMacroWizard extends Wizard {
-	private String contents;
-	private NewMacroPage page;
-	
-	class NewMacroPage extends WizardNewFileCreationPage {
-		public NewMacroPage(IStructuredSelection ssel) {
-			super("newFile", ssel);
-			setTitle("Macro script name");
-			setDescription("Select the target location and the name of the new script (extension *.emc).");
-		} 
-		public InputStream getInitialContents() {
-			InputStream is=null;
-			try {
-				is = new ByteArrayInputStream(contents.getBytes("UTF8"));
-			}
-			catch (UnsupportedEncodingException e) {
-			}
-			return is;
-		}
-	}
-
-	public NewMacroWizard(String contents) {
-		this.contents = contents;
-		setWindowTitle("Macro Recorder");
-	}
-	
-	public void addPages() {
-		ISelectionService sservice = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService();
-		ISelection selection = sservice.getSelection();
-		IStructuredSelection ssel;
-		if (!(selection instanceof IStructuredSelection))
-			ssel = new StructuredSelection();
-		else
-			ssel = (IStructuredSelection)selection;
-			
-		page = new NewMacroPage(ssel);
-		addPage(page);
-	}
-	public boolean performFinish() {
-		IFile file = page.createNewFile();
-		return file!=null;
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/PlaybackAction.java b/ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/PlaybackAction.java
deleted file mode 100644
index d0d08b4..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/PlaybackAction.java
+++ /dev/null

@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-import java.io.InputStream;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.pde.internal.ui.tests.macro.MacroManager;
-import org.eclipse.pde.internal.ui.tests.macro.MacroPlugin;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-/**
- * Our sample action implements workbench action delegate.
- * The action proxy will be created by the workbench and
- * shown in the UI. When the user tries to use the action,
- * this delegate will be created and execution will be 
- * delegated to it.
- * @see IWorkbenchWindowActionDelegate
- */
-public class PlaybackAction implements IWorkbenchWindowActionDelegate {
-	private IWorkbenchWindow window;
-	/**
-	 * The constructor.
-	 */
-	public PlaybackAction() {
-	}
-
-	/**
-	 * The action has been activated. The argument of the
-	 * method represents the 'real' action sitting
-	 * in the workbench UI.
-	 * @see IWorkbenchWindowActionDelegate#run
-	 */
-	public void run(IAction action) {
-		ISelection selection = window.getSelectionService().getSelection();
-		if (selection instanceof IStructuredSelection) {
-			IStructuredSelection ssel = (IStructuredSelection)selection;
-			Object el = ssel.getFirstElement();
-			if (el instanceof IFile) {
-				action.setEnabled(false);
-				runFile((IFile)el);
-				action.setEnabled(true);
-			}
-		}
-	}
-
-	private void runFile(IFile file) {
-		try {
-			InputStream is = file.getContents();
-			MacroManager mng = MacroPlugin.getDefault().getMacroManager();
-			mng.setIndexHandler(new DefaultIndexHandler());
-			mng.play(window.getShell().getDisplay(), window, file.getName(), is);
-			mng.setIndexHandler(null);
-		}
-		catch (CoreException e) {
-			MacroPlugin.logException(e);
-		}
-	}
-
-	/**
-	 * Selection in the workbench has been changed. We 
-	 * can change the state of the 'real' action here
-	 * if we want, but this can only happen after 
-	 * the delegate has been created.
-	 * @see IWorkbenchWindowActionDelegate#selectionChanged
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-	}
-
-	/**
-	 * We can use this method to dispose of any system
-	 * resources we previously allocated.
-	 * @see IWorkbenchWindowActionDelegate#dispose
-	 */
-	public void dispose() {
-	}
-
-	/**
-	 * We will cache window object in order to
-	 * be able to provide parent shell for the message dialog.
-	 * @see IWorkbenchWindowActionDelegate#init
-	 */
-	public void init(IWorkbenchWindow window) {
-		this.window = window;
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/RecordAction.java b/ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/RecordAction.java
deleted file mode 100644
index 4e37cd7..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/RecordAction.java
+++ /dev/null

@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.pde.internal.ui.tests.macro.IRecorderListener;
-import org.eclipse.pde.internal.ui.tests.macro.MacroManager;
-import org.eclipse.pde.internal.ui.tests.macro.MacroPlugin;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-/**
- * Our sample action implements workbench action delegate.
- * The action proxy will be created by the workbench and
- * shown in the UI. When the user tries to use the action,
- * this delegate will be created and execution will be 
- * delegated to it.
- * @see IWorkbenchWindowActionDelegate
- */
-public class RecordAction implements IWorkbenchWindowActionDelegate, IRecorderListener {
-	private IAction action;
-	
-	/**
-	 * The constructor.
-	 */
-	public RecordAction() {
-		MacroManager recorder = MacroPlugin.getDefault().getMacroManager();
-		recorder.addRecorderListener(this);
-	}
-
-	/**
-	 * The action has been activated. The argument of the
-	 * method represents the 'real' action sitting
-	 * in the workbench UI.
-	 * @see IWorkbenchWindowActionDelegate#run
-	 */
-	public void run(IAction action) {
-		MacroManager recorder = MacroPlugin.getDefault().getMacroManager();
-		this.action = action;
-		if (recorder.isRecording()) {
-			action.setEnabled(false);
-			return;
-		}
-		RecordBlock.getInstance().startRecording();
-	}
-
-	/**
-	 * Selection in the workbench has been changed. We 
-	 * can change the state of the 'real' action here
-	 * if we want, but this can only happen after 
-	 * the delegate has been created.
-	 * @see IWorkbenchWindowActionDelegate#selectionChanged
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-	}
-
-	/**
-	 * We can use this method to dispose of any system
-	 * resources we previously allocated.
-	 * @see IWorkbenchWindowActionDelegate#dispose
-	 */
-	public void dispose() {
-		MacroManager recorder = MacroPlugin.getDefault().getMacroManager();
-		recorder.removeRecorderListener(this);
-		RecordBlock.dispose();
-	}
-	
-	public void recordingStarted() {
-		this.action.setEnabled(false);
-	}
-	
-	public void recordingStopped() {
-		this.action.setEnabled(true);
-	}
-
-	public void recordingInterrupted(int type) {
-	}
-
-	/**
-	 * We will cache window object in order to
-	 * be able to provide parent shell for the message dialog.
-	 * @see IWorkbenchWindowActionDelegate#init
-	 */
-	public void init(IWorkbenchWindow window) {
-		RecordBlock.init(window);
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/RecordBlock.java b/ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/RecordBlock.java
deleted file mode 100644
index d037297..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/RecordBlock.java
+++ /dev/null

@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.pde.internal.ui.tests.macro.IRecorderListener;
-import org.eclipse.pde.internal.ui.tests.macro.Macro;
-import org.eclipse.pde.internal.ui.tests.macro.MacroManager;
-import org.eclipse.pde.internal.ui.tests.macro.MacroPlugin;
-import org.eclipse.ui.IWorkbenchWindow;
-
-public class RecordBlock implements IRecorderListener {
-	private IWorkbenchWindow window;
-	private static RecordBlock instance;
-	
-	private RecordBlock() {
-	}
-
-	public static RecordBlock getInstance() {
-		if (instance==null) {
-			instance = new RecordBlock();
-		}
-		return instance;
-	}
-	
-	public static void init(IWorkbenchWindow window) {
-		if (instance==null) {
-			getInstance().internalInit(window);
-		}
-	}
-	
-	private void internalInit(IWorkbenchWindow window) {
-		this.window = window;
-		MacroManager recorder = MacroPlugin.getDefault().getMacroManager();
-		recorder.addRecorderListener(this);
-	}
-	
-	public static void dispose() {
-		if (instance!=null) {
-			instance.internalDispose();
-			instance=null;
-		}
-	}
-	
-	private void internalDispose() {
-		MacroManager recorder = MacroPlugin.getDefault().getMacroManager();
-		recorder.removeRecorderListener(this);
-	}
-
-	public void startRecording() {
-		MacroManager recorder = MacroPlugin.getDefault().getMacroManager();
-		recorder.startRecording();
-	}
-
-	public void stopRecording() {
-		MacroManager recorder = MacroPlugin.getDefault().getMacroManager();
-		Macro macro = recorder.stopRecording();
-		StringWriter swriter = new StringWriter();
-		PrintWriter pwriter = new PrintWriter(swriter);
-		macro.write("", pwriter);
-		pwriter.close();
-		try {
-			swriter.close();
-		}
-		catch (IOException e) {
-			System.out.println(e);
-		}
-		String contents = swriter.toString();
-		NewMacroWizard wizard = new NewMacroWizard(contents);
-		WizardDialog wd = new WizardDialog(window.getShell(), wizard);
-		wd.setMinimumPageSize(500, 500);
-		wd.open();
-	}
-
-	public void recordingStarted() {
-	}
-
-	public void recordingStopped() {
-	}
-
-	public void recordingInterrupted(int interruptType) {
-		if (interruptType==STOP)
-			stopRecording();
-		else if (interruptType==INDEX)
-			insertIndex();
-	}
-
-	public void insertIndex() {
-		MacroManager recorder = MacroPlugin.getDefault().getMacroManager();
-		IndexWizard wizard = new IndexWizard(recorder);
-		WizardDialog wd = new WizardDialog(window.getShell(), wizard);
-		//wd.setMinimumPageSize(300, 400);
-		wd.create();
-		wd.getShell().setData(MacroManager.IGNORE, Boolean.TRUE);
-		wd.getShell().setSize(300, 400);
-		wd.open();
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/StopAction.java b/ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/StopAction.java
deleted file mode 100644
index 68f5ac5..0000000
--- a/ui/org.eclipse.pde.ui.tests/Macro UI/org/eclipse/pde/internal/ui/tests/macro/StopAction.java
+++ /dev/null

@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.tests.macro;
-
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.pde.internal.ui.tests.macro.IRecorderListener;
-import org.eclipse.pde.internal.ui.tests.macro.MacroManager;
-import org.eclipse.pde.internal.ui.tests.macro.MacroPlugin;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-
-public class StopAction implements IWorkbenchWindowActionDelegate, IRecorderListener {
-	private IAction action;
-	/**
-	 * The constructor.
-	 */
-	public StopAction() {
-		MacroManager recorder = MacroPlugin.getDefault().getMacroManager();
-		recorder.addRecorderListener(this);
-	}
-
-	/**
-	 * The action has been activated. The argument of the
-	 * method represents the 'real' action sitting
-	 * in the workbench UI.
-	 * @see IWorkbenchWindowActionDelegate#run
-	 */
-	public void run(IAction action) {
-		MacroManager recorder = MacroPlugin.getDefault().getMacroManager();
-		this.action = action;
-		if (!recorder.isRecording()) {
-			action.setEnabled(false);
-			return;
-		}
-		RecordBlock.getInstance().stopRecording();
-	}
-
-	/**
-	 * Selection in the workbench has been changed. We 
-	 * can change the state of the 'real' action here
-	 * if we want, but this can only happen after 
-	 * the delegate has been created.
-	 * @see IWorkbenchWindowActionDelegate#selectionChanged
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-	}
-
-	public void recordingStarted() {
-		if (action!=null)
-			action.setEnabled(true);
-	}
-
-	public void recordingStopped() {
-		if (action!=null)
-			action.setEnabled(false);
-	}
-
-	public void recordingInterrupted(int type) {
-	}
-
-	/**
-	 * We can use this method to dispose of any system
-	 * resources we previously allocated.
-	 * @see IWorkbenchWindowActionDelegate#dispose
-	 */
-	public void dispose() {
-		MacroManager recorder = MacroPlugin.getDefault().getMacroManager();
-		recorder.removeRecorderListener(this);
-		RecordBlock.dispose();
-	}
-
-	/**
-	 * We will cache window object in order to
-	 * be able to provide parent shell for the message dialog.
-	 * @see IWorkbenchWindowActionDelegate#init
-	 */
-	public void init(IWorkbenchWindow window) {
-		RecordBlock.init(window);
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/about.html b/ui/org.eclipse.pde.ui.tests/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/ui/org.eclipse.pde.ui.tests/about.html
+++ /dev/null

@@ -1,22 +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>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation 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
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/build.properties b/ui/org.eclipse.pde.ui.tests/build.properties
deleted file mode 100644
index 39cbf10..0000000
--- a/ui/org.eclipse.pde.ui.tests/build.properties
+++ /dev/null

@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-source.tests.jar = src/,\
-                   Macro Manager/,\
-                   Macro UI/
-output.tests.jar = bin/
-bin.includes = tests.jar,\
-               plugin.xml,\
-               test.xml,\
-               about.html,\
-               scripts/,\
-               schema/,\
-               icons/,\
-               META-INF/

diff --git a/ui/org.eclipse.pde.ui.tests/icons/external_tools.gif b/ui/org.eclipse.pde.ui.tests/icons/external_tools.gif
deleted file mode 100644
index b05bf3e..0000000
--- a/ui/org.eclipse.pde.ui.tests/icons/external_tools.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.tests/icons/run_exc.gif b/ui/org.eclipse.pde.ui.tests/icons/run_exc.gif
deleted file mode 100644
index 57f4102..0000000
--- a/ui/org.eclipse.pde.ui.tests/icons/run_exc.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.tests/icons/sample.gif b/ui/org.eclipse.pde.ui.tests/icons/sample.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/ui/org.eclipse.pde.ui.tests/icons/sample.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.tests/icons/suspend_co.gif b/ui/org.eclipse.pde.ui.tests/icons/suspend_co.gif
deleted file mode 100644
index 161e3f5..0000000
--- a/ui/org.eclipse.pde.ui.tests/icons/suspend_co.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.tests/icons/terminate_co.gif b/ui/org.eclipse.pde.ui.tests/icons/terminate_co.gif
deleted file mode 100644
index dc47edf..0000000
--- a/ui/org.eclipse.pde.ui.tests/icons/terminate_co.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui.tests/plugin.xml b/ui/org.eclipse.pde.ui.tests/plugin.xml
deleted file mode 100644
index 20b60c8..0000000
--- a/ui/org.eclipse.pde.ui.tests/plugin.xml
+++ /dev/null

@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-   
-     <extension-point id="macroSupport" name="Macro Support" schema="schema/macroSupport.exsd"/>
-   <extension
-         point="org.eclipse.ui.actionSets">
-      <actionSet
-            label="Sample Action Set"
-            visible="true"
-            id="org.eclipse.ui.macro.actionSet">
-         <menu
-               label="&amp;Macros..."
-               path="window/additions"
-               id="macro">
-            <separator name="group1"/>
-         </menu>
-         <action
-               toolbarPath="sampleGroup"
-               label="&amp;Start Recording"
-               class="org.eclipse.pde.internal.ui.tests.macro.RecordAction"
-               tooltip="Start Recording"
-               icon="icons/external_tools.gif"
-               menubarPath="window/macro/group1"
-               id="org.eclipse.pde.ui.tests.RecordAction"/>
-         <action
-               class="org.eclipse.pde.internal.ui.tests.macro.IndexAction"
-               definitionId="org.eclipse.pde.ui.tests.index"
-               icon="icons/suspend_co.gif"
-               id="org.eclipse.pde.ui.tests.IndexAction"
-               label="&amp;Pause for Indexing"
-               menubarPath="window/macro/group1"
-               toolbarPath="sampleGroup"
-               tooltip="Pause for Indexing"/>
-         <action
-               class="org.eclipse.pde.internal.ui.tests.macro.StopAction"
-               definitionId="org.eclipse.pde.ui.tests.stopRecording"
-               icon="icons/terminate_co.gif"
-               id="org.eclipse.pde.ui.tests.StopAction"
-               label="S&amp;top Recording"
-               menubarPath="window/macro/group1"
-               toolbarPath="sampleGroup"
-               tooltip="Stop Recording"/>
-         <action
-               enablesFor="1"
-               toolbarPath="sampleGroup"
-               label="&amp;Playback"
-               icon="icons/run_exc.gif"
-               tooltip="&amp;Run Macro"
-               class="org.eclipse.pde.internal.ui.tests.macro.PlaybackAction"
-               menubarPath="window/macro/group1"
-               id="org.eclipse.pde.ui.tests.PlaybackAction">
-            <enablement>
-            	<and>
-   					<objectClass name="org.eclipse.core.resources.IFile"/>
-   						<objectState name="extension" value="emc"/>
-  				</and>
- 			</enablement>
- 		</action>
-     </actionSet>
-   </extension>
-   <extension
-         point="org.eclipse.pde.ui.tests.macroSupport">
-      <widgetResolver class="org.eclipse.pde.internal.ui.tests.macro.DefaultWidgetResolver"/>
-   </extension>
-   <extension
-         point="org.eclipse.ui.commands">
-      <command
-            description="Stops the recording of the macro"
-            categoryId="org.eclipse.ui.category.window"
-            name="Stop Macro Recording"
-            id="org.eclipse.pde.ui.tests.stopRecording"/>
-     <command
-            description="Places a named index in the macro"
-            categoryId="org.eclipse.ui.category.window"
-            name="Index Macro"
-            id="org.eclipse.pde.ui.tests.index"/>
-      <keyBinding
-            contextId="org.eclipse.ui.contexts.dialogAndWindow"
-            commandId="org.eclipse.pde.ui.tests.stopRecording"
-            keySequence="Ctrl+Shift+F11"
-            keyConfigurationId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
-      <keyBinding
-            contextId="org.eclipse.ui.contexts.dialogAndWindow"
-            commandId="org.eclipse.pde.ui.tests.index"
-            keySequence="Ctrl+Shift+F10"
-            keyConfigurationId="org.eclipse.ui.defaultAcceleratorConfiguration"/>            
-   </extension>
-</plugin>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui.tests/schema/macroSupport.exsd b/ui/org.eclipse.pde.ui.tests/schema/macroSupport.exsd
deleted file mode 100644
index 0547335..0000000
--- a/ui/org.eclipse.pde.ui.tests/schema/macroSupport.exsd
+++ /dev/null

@@ -1,115 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.pde.ui.tests">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.pde.ui.tests" id="macroSupport" name="Macro Support"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="widgetResolver" minOccurs="1" maxOccurs="unbounded"/>
-         </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>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="widgetResolver">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.ui.macro.IWidgetResolver"/>
-               </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>
-         Copyright (c) 2005 IBM Corporation and others.
-
-&lt;br&gt;
-
-All rights reserved. This program and the accompanying materials are made 
-
-available under the terms of the Eclipse Public License v1.0 which 
-
-accompanies this distribution, and is available at 
-
-&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;.
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/ui/org.eclipse.pde.ui.tests/scripts/macro1.emc b/ui/org.eclipse.pde.ui.tests/scripts/macro1.emc
deleted file mode 100644
index 6c07ce3..0000000
--- a/ui/org.eclipse.pde.ui.tests/scripts/macro1.emc
+++ /dev/null

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<macro version="0.1">
-   <shell id="org.eclipse.ui.internal.WorkbenchWindow" return-code="0">
-      <command type="select" contextId="menus" widgetId="contribclass/org.eclipse.ui.actions.NewWizardMenu">
-         <parent widgetId="file"/>
-         <parent widgetId="new"/>
-      </command>
-      <shell id="org.eclipse.jface.wizard.WizardDialog" return-code="0">
-         <command type="item-select" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1">
-            <item path="org.eclipse.pde.ui.NewProjectWizard"/>
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#1">
-         com.example.simple
-         </command>
-         <command type="select" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Button#3" selection="false"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=14"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-         <command type="wait"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-      </shell>
-      <command type="focus" contextId="editor/org.eclipse.pde.ui.manifestEditor/MANIFEST.MF" widgetId="org.eclipse.swt.widgets.Text#1"/>
-      <command type="wait"/>
-      <command type="select" contextId="menus" widgetId="contribid/close">
-         <parent widgetId="file"/>
-      </command>
-   </shell>
-</macro>

diff --git a/ui/org.eclipse.pde.ui.tests/scripts/macro10.emc b/ui/org.eclipse.pde.ui.tests/scripts/macro10.emc
deleted file mode 100644
index 5be5b69..0000000
--- a/ui/org.eclipse.pde.ui.tests/scripts/macro10.emc
+++ /dev/null

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<macro version="0.1">
-   <shell id="org.eclipse.ui.internal.WorkbenchWindow" return-code="0">
-      <command type="select" contextId="menus" widgetId="contribid/importExport">
-         <parent widgetId="file"/>
-      </command>
-      <shell id="org.eclipse.jface.wizard.WizardDialog" return-code="0">
-         <command type="focus" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.TabFolder#1"/>
-         <command type="choice-select" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.TabFolder#1" choiceId="item#0"/>
-         <command type="item-select" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.Table#1">
-            <item path="org.eclipse.pde.ui.PluginImportWizard"/>
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#1"/>
-         <command type="focus" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#10"/>
-         <command type="select" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#8" selection="false"/>
-         <command type="select" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#10" selection="true"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=14"/>
-         <command type="default-select" contextId="wizard-page/detailed" widgetId="org.eclipse.swt.widgets.Table#1">
-            <item path="org.eclipse.osgi"/>
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-         <command type="wait"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-      </shell>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-   </shell>
-</macro>

diff --git a/ui/org.eclipse.pde.ui.tests/scripts/macro11.emc b/ui/org.eclipse.pde.ui.tests/scripts/macro11.emc
deleted file mode 100644
index 7fd66d7..0000000
--- a/ui/org.eclipse.pde.ui.tests/scripts/macro11.emc
+++ /dev/null

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<macro version="0.1">
-   <shell id="org.eclipse.ui.internal.WorkbenchWindow" return-code="0">
-      <command type="select" contextId="menus" widgetId="contribid/importExport">
-         <parent widgetId="file"/>
-      </command>
-      <shell id="org.eclipse.jface.wizard.WizardDialog" return-code="0">
-         <command type="focus" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.TabFolder#1"/>
-         <command type="choice-select" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.TabFolder#1" choiceId="item#0"/>
-         <command type="item-select" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.Table#1">
-            <item path="org.eclipse.pde.ui.PluginImportWizard"/>
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#1"/>
-         <command type="select" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#10" selection="true"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=14"/>
-         <command type="default-select" contextId="wizard-page/detailed" widgetId="org.eclipse.swt.widgets.Table#1">
-            <item path="org.eclipse.jface"/>
-         </command>
-         <command type="select" contextId="wizard-page/detailed" widgetId="org.eclipse.swt.widgets.Button#8"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-         <command type="wait"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-      </shell>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-   </shell>
-</macro>

diff --git a/ui/org.eclipse.pde.ui.tests/scripts/macro12.emc b/ui/org.eclipse.pde.ui.tests/scripts/macro12.emc
deleted file mode 100644
index 86b44f0..0000000
--- a/ui/org.eclipse.pde.ui.tests/scripts/macro12.emc
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<macro version="0.1">
-   <shell id="org.eclipse.ui.internal.WorkbenchWindow" return-code="0">
-      <command type="select" contextId="menus" widgetId="contribid/importExport">
-         <parent widgetId="file"/>
-      </command>
-      <shell id="org.eclipse.jface.wizard.WizardDialog" return-code="0">
-         <command type="focus" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.TabFolder#1"/>
-         <command type="choice-select" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.TabFolder#1" choiceId="item#0"/>
-         <command type="item-select" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.Table#1">
-            <item path="org.eclipse.pde.ui.FeatureImportWizard"/>
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="select" contextId="wizard-page/FeatureImportWizardPage" widgetId="org.eclipse.swt.widgets.Button#3" selection="true"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=14"/>
-         <command type="select" contextId="wizard-page/FeatureImportWizardDetailedPage" widgetId="org.eclipse.swt.widgets.Button#ButtonId=1"/>
-         <command type="item-check" contextId="wizard-page/FeatureImportWizardDetailedPage" widgetId="org.eclipse.swt.widgets.Table#1" value="true">
-            <item path="org.eclipse.pde"/>
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-         <command type="wait"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-      </shell>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-   </shell>
-</macro>

diff --git a/ui/org.eclipse.pde.ui.tests/scripts/macro13.emc b/ui/org.eclipse.pde.ui.tests/scripts/macro13.emc
deleted file mode 100644
index eb4572e..0000000
--- a/ui/org.eclipse.pde.ui.tests/scripts/macro13.emc
+++ /dev/null

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<macro version="0.1">
-   <shell id="org.eclipse.ui.internal.WorkbenchWindow" return-code="0">
-      <command type="select" contextId="menus" widgetId="contribid/importExport">
-         <parent widgetId="file"/>
-      </command>
-      <shell id="org.eclipse.jface.wizard.WizardDialog" return-code="0">
-         <command type="focus" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.TabFolder#1"/>
-         <command type="choice-select" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.TabFolder#1" choiceId="item#0"/>
-         <command type="item-select" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.Table#1">
-            <item path="org.eclipse.pde.ui.FeatureImportWizard"/>
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="select" contextId="wizard-page/FeatureImportWizardPage" widgetId="org.eclipse.swt.widgets.Button#3" selection="true"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=14"/>
-         <command type="select" contextId="wizard-page/FeatureImportWizardDetailedPage" widgetId="org.eclipse.swt.widgets.Button#ButtonId=1"/>
-         <command type="item-check" contextId="wizard-page/FeatureImportWizardDetailedPage" widgetId="org.eclipse.swt.widgets.Table#1" value="true">
-            <item path="org.eclipse.sdk"/>
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-      </shell>
-   </shell>
-</macro>

diff --git a/ui/org.eclipse.pde.ui.tests/scripts/macro14.emc b/ui/org.eclipse.pde.ui.tests/scripts/macro14.emc
deleted file mode 100644
index 01d0cfa..0000000
--- a/ui/org.eclipse.pde.ui.tests/scripts/macro14.emc
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<macro version="0.1">
-   <shell id="org.eclipse.ui.internal.WorkbenchWindow" return-code="0">
-      <command type="select" contextId="menus" widgetId="contribid/importExport">
-         <parent widgetId="file"/>
-      </command>
-      <shell id="org.eclipse.jface.wizard.WizardDialog" return-code="0">
-         <command type="focus" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.TabFolder#1"/>
-         <command type="choice-select" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.TabFolder#1" choiceId="item#0"/>
-         <command type="item-select" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.Table#1">
-            <item path="org.eclipse.pde.ui.FeatureImportWizard"/>
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="select" contextId="wizard-page/FeatureImportWizardPage" widgetId="org.eclipse.swt.widgets.Button#1" selection="true"/>
-         <command type="select" contextId="wizard-page/FeatureImportWizardPage" widgetId="org.eclipse.swt.widgets.Button#3" selection="false"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=14"/>
-         <command type="select" contextId="wizard-page/FeatureImportWizardDetailedPage" widgetId="org.eclipse.swt.widgets.Button#ButtonId=1"/>
-         <command type="item-check" contextId="wizard-page/FeatureImportWizardDetailedPage" widgetId="org.eclipse.swt.widgets.Table#1" value="true">
-            <item path="org.eclipse.pde"/>
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-      </shell>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-   </shell>
-</macro>

diff --git a/ui/org.eclipse.pde.ui.tests/scripts/macro15.emc b/ui/org.eclipse.pde.ui.tests/scripts/macro15.emc
deleted file mode 100644
index c21755e..0000000
--- a/ui/org.eclipse.pde.ui.tests/scripts/macro15.emc
+++ /dev/null

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<macro version="0.1">
-   <shell id="org.eclipse.ui.internal.WorkbenchWindow" return-code="0">
-      <command type="select" contextId="menus" widgetId="contribclass/org.eclipse.ui.actions.NewWizardMenu">
-         <parent widgetId="file"/>
-         <parent widgetId="new"/>
-      </command>
-      <shell id="org.eclipse.jface.wizard.WizardDialog" return-code="0">
-         <command type="item-select" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1">
-            <item path="org.eclipse.jdt.ui.wizards.JavaProjectWizard"/>
-         </command>
-         <command type="item-expand" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1" value="true">
-            <item path="org.eclipse.pde.PDE"/>
-         </command>
-         <command type="item-select" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1">
-            <item path="org.eclipse.pde.ui.NewFeatureProjectWizard"/>
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#1">
-         com.example.test.feature
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="modify" contextId="wizard-page/specPage" widgetId="org.eclipse.swt.widgets.Text#1">
-         com.example.test.feature
-         </command>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=14"/>
-         <command type="modify" contextId="wizard-page/specPage" widgetId="org.eclipse.swt.widgets.Text#2">
-         com.example.test.feature
-         </command>
-         <command type="modify" contextId="wizard-page/specPage" widgetId="org.eclipse.swt.widgets.Text#3">
-         1.0.0
-         </command>
-         <command type="focus" contextId="wizard-page/specPage" widgetId="org.eclipse.swt.widgets.Text#1"/>
-         <command type="modify" contextId="wizard-page/specPage" widgetId="org.eclipse.swt.widgets.Text#2">
-         Test Feature
-         </command>
-         <command type="modify" contextId="wizard-page/specPage" widgetId="org.eclipse.swt.widgets.Text#3">
-         1.0.1
-         </command>
-         <command type="modify" contextId="wizard-page/specPage" widgetId="org.eclipse.swt.widgets.Text#4">
-         Eclipse.org
-         </command>
-         <command type="select" contextId="wizard-page/specPage" widgetId="org.eclipse.swt.widgets.Button#1" selection="false"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-         <command type="wait"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-      </shell>
-      <command type="focus" contextId="editor/org.eclipse.pde.ui.featureEditor/feature.xml" widgetId="org.eclipse.ui.forms.widgets.Form#1"/>
-   </shell>
-</macro>

diff --git a/ui/org.eclipse.pde.ui.tests/scripts/macro16.emc b/ui/org.eclipse.pde.ui.tests/scripts/macro16.emc
deleted file mode 100644
index 1b333ff..0000000
--- a/ui/org.eclipse.pde.ui.tests/scripts/macro16.emc
+++ /dev/null

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<macro version="0.1">
-   <shell id="org.eclipse.ui.internal.WorkbenchWindow" return-code="0">
-      <command type="select" contextId="menus" widgetId="contribclass/org.eclipse.ui.actions.NewWizardMenu">
-         <parent widgetId="file"/>
-         <parent widgetId="new"/>
-      </command>
-      <shell id="org.eclipse.jface.wizard.WizardDialog" return-code="0">
-         <command type="item-select" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1">
-            <item path="org.eclipse.jdt.ui.wizards.JavaProjectWizard"/>
-         </command>
-         <command type="item-expand" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1" value="true">
-            <item path="org.eclipse.pde.PDE"/>
-         </command>
-         <command type="item-select" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1">
-            <item path="org.eclipse.pde.ui.NewFeatureProjectWizard"/>
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#1">
-         com.example.test.feature
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="modify" contextId="wizard-page/specPage" widgetId="org.eclipse.swt.widgets.Text#1">
-         com.example.test.feature
-         </command>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=14"/>
-         <command type="modify" contextId="wizard-page/specPage" widgetId="org.eclipse.swt.widgets.Text#2">
-         com.example.test.feature
-         </command>
-         <command type="modify" contextId="wizard-page/specPage" widgetId="org.eclipse.swt.widgets.Text#3">
-         1.0.0
-         </command>
-         <command type="focus" contextId="wizard-page/specPage" widgetId="org.eclipse.swt.widgets.Text#1"/>
-         <command type="modify" contextId="wizard-page/specPage" widgetId="org.eclipse.swt.widgets.Text#2">
-         Test Feature
-         </command>
-         <command type="modify" contextId="wizard-page/specPage" widgetId="org.eclipse.swt.widgets.Text#3">
-         1.0.1
-         </command>
-         <command type="modify" contextId="wizard-page/specPage" widgetId="org.eclipse.swt.widgets.Text#4">
-         Eclipse.org
-         </command>
-         <command type="select" contextId="wizard-page/specPage" widgetId="org.eclipse.swt.widgets.Button#1" selection="true"/>
-         <command type="modify" contextId="wizard-page/specPage" widgetId="org.eclipse.swt.widgets.Text#5">
-         handler.jar
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-         <command type="wait"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-      </shell>
-      <command type="focus" contextId="editor/org.eclipse.pde.ui.featureEditor/feature.xml" widgetId="org.eclipse.ui.forms.widgets.Form#1"/>
-   </shell>
-</macro>

diff --git a/ui/org.eclipse.pde.ui.tests/scripts/macro17.emc b/ui/org.eclipse.pde.ui.tests/scripts/macro17.emc
deleted file mode 100644
index 6f8f521..0000000
--- a/ui/org.eclipse.pde.ui.tests/scripts/macro17.emc
+++ /dev/null

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<macro version="0.1">
-   <shell id="org.eclipse.ui.internal.WorkbenchWindow" return-code="0">
-      <command type="select" contextId="menus" widgetId="contribclass/org.eclipse.ui.actions.NewWizardMenu">
-         <parent widgetId="file"/>
-         <parent widgetId="new"/>
-      </command>
-      <shell id="org.eclipse.jface.wizard.WizardDialog" return-code="0">
-         <command type="item-select" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1">
-            <item path="org.eclipse.jdt.ui.wizards.JavaProjectWizard"/>
-         </command>
-         <command type="item-expand" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1" value="true">
-            <item path="org.eclipse.pde.PDE"/>
-         </command>
-         <command type="item-select" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1">
-            <item path="org.eclipse.pde.ui.NewFeatureProjectWizard"/>
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#1">
-         com.example.test.feature
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="modify" contextId="wizard-page/specPage" widgetId="org.eclipse.swt.widgets.Text#1">
-         com.example.test.feature
-         </command>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=14"/>
-         <command type="modify" contextId="wizard-page/specPage" widgetId="org.eclipse.swt.widgets.Text#2">
-         com.example.test.feature
-         </command>
-         <command type="modify" contextId="wizard-page/specPage" widgetId="org.eclipse.swt.widgets.Text#3">
-         1.0.0
-         </command>
-         <command type="focus" contextId="wizard-page/specPage" widgetId="org.eclipse.swt.widgets.Text#1"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard-page/pluginListPage" widgetId="org.eclipse.swt.widgets.Table#1"/>
-         <command type="select" contextId="wizard-page/pluginListPage" widgetId="org.eclipse.swt.widgets.Button#ButtonId=1"/>
-         <command type="item-check" contextId="wizard-page/pluginListPage" widgetId="org.eclipse.swt.widgets.Table#1" value="true">
-            <item path="org.eclipse.pde.ui"/>
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-         <command type="wait"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-      </shell>
-      <command type="focus" contextId="editor/org.eclipse.pde.ui.featureEditor/feature.xml" widgetId="org.eclipse.ui.forms.widgets.Form#1"/>
-   </shell>
-</macro>

diff --git a/ui/org.eclipse.pde.ui.tests/scripts/macro18.emc b/ui/org.eclipse.pde.ui.tests/scripts/macro18.emc
deleted file mode 100644
index 2a01f4b..0000000
--- a/ui/org.eclipse.pde.ui.tests/scripts/macro18.emc
+++ /dev/null

@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<macro version="0.1">
-   <shell id="org.eclipse.ui.internal.WorkbenchWindow" return-code="0">
-      <command type="select" contextId="menus" widgetId="contribclass/org.eclipse.ui.actions.NewWizardMenu">
-         <parent widgetId="file"/>
-         <parent widgetId="new"/>
-      </command>
-      <shell id="org.eclipse.jface.wizard.WizardDialog" return-code="0">
-         <command type="item-select" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1">
-            <item path="org.eclipse.pde.ui.NewProjectWizard"/>
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#1">
-         com.example.test.plugin
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=14"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-         <command type="wait"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-      </shell>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-      <command type="wait"/>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-      <command type="wait"/>
-      <command type="select" contextId="menus" widgetId="contribclass/org.eclipse.ui.actions.NewWizardMenu">
-         <parent widgetId="file"/>
-         <parent widgetId="new"/>
-      </command>
-      <shell id="org.eclipse.jface.wizard.WizardDialog" return-code="0">
-         <command type="item-select" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1">
-            <item path="org.eclipse.jdt.ui.wizards.JavaProjectWizard"/>
-         </command>
-         <command type="item-expand" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1" value="true">
-            <item path="org.eclipse.pde.PDE"/>
-         </command>
-         <command type="item-select" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1">
-            <item path="org.eclipse.pde.ui.NewFeatureProjectWizard"/>
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#1">
-         com.example.test.feature
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="modify" contextId="wizard-page/specPage" widgetId="org.eclipse.swt.widgets.Text#1">
-         com.example.test.feature
-         </command>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=14"/>
-         <command type="modify" contextId="wizard-page/specPage" widgetId="org.eclipse.swt.widgets.Text#2">
-         com.example.test.feature
-         </command>
-         <command type="modify" contextId="wizard-page/specPage" widgetId="org.eclipse.swt.widgets.Text#3">
-         1.0.0
-         </command>
-         <command type="focus" contextId="wizard-page/specPage" widgetId="org.eclipse.swt.widgets.Text#1"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard-page/pluginListPage" widgetId="org.eclipse.swt.widgets.Table#1"/>
-         <command type="select" contextId="wizard-page/pluginListPage" widgetId="org.eclipse.swt.widgets.Button#ButtonId=1"/>
-         <command type="item-check" contextId="wizard-page/pluginListPage" widgetId="org.eclipse.swt.widgets.Table#1" value="true">
-            <item path="com.example.test.plugin"/>
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-         <command type="wait"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-      </shell>
-      <command type="focus" contextId="editor/org.eclipse.pde.ui.featureEditor/feature.xml" widgetId="org.eclipse.ui.forms.widgets.Form#1"/>
-   </shell>
-</macro>

diff --git a/ui/org.eclipse.pde.ui.tests/scripts/macro19.emc b/ui/org.eclipse.pde.ui.tests/scripts/macro19.emc
deleted file mode 100644
index 89ddece..0000000
--- a/ui/org.eclipse.pde.ui.tests/scripts/macro19.emc
+++ /dev/null

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<macro version="0.1">
-   <shell id="org.eclipse.ui.internal.WorkbenchWindow" return-code="0">
-      <command type="select" contextId="menus" widgetId="contribclass/org.eclipse.ui.actions.NewWizardMenu">
-         <parent widgetId="file"/>
-         <parent widgetId="new"/>
-      </command>
-      <shell id="org.eclipse.jface.wizard.WizardDialog" return-code="0">
-         <command type="default-select" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1">
-            <item path="org.eclipse.pde.ui.NewProjectWizard"/>
-         </command>
-         <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#1">
-         com.example.xyz
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=14"/>
-         <command type="select" contextId="wizard-page/page2" widgetId="org.eclipse.swt.widgets.Button#1" selection="false"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-         <command type="wait"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-      </shell>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-      <command type="focus" contextId="editor/org.eclipse.pde.ui.manifestEditor/MANIFEST.MF" widgetId="org.eclipse.swt.widgets.Text#1"/>
-      <command type="select" contextId="menus" widgetId="contribid/close">
-         <parent widgetId="file"/>
-      </command>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-   </shell>
-</macro>

diff --git a/ui/org.eclipse.pde.ui.tests/scripts/macro2.emc b/ui/org.eclipse.pde.ui.tests/scripts/macro2.emc
deleted file mode 100644
index f69e319..0000000
--- a/ui/org.eclipse.pde.ui.tests/scripts/macro2.emc
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<macro version="0.1">
-   <shell id="org.eclipse.ui.internal.WorkbenchWindow" return-code="0">
-      <command type="select" contextId="menus" widgetId="contribclass/org.eclipse.ui.actions.NewWizardMenu">
-         <parent widgetId="file"/>
-         <parent widgetId="new"/>
-      </command>
-      <shell id="org.eclipse.jface.wizard.WizardDialog" return-code="0">
-         <command type="default-select" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1">
-            <item path="org.eclipse.pde.ui.NewProjectWizard"/>
-         </command>
-         <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#1">
-         com.example.simple
-         </command>
-         <command type="select" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Button#3" selection="false"/>
-         <command type="select" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Button#5" selection="false"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-      </shell>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-      <command type="wait"/>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-      <command type="select" contextId="menus" widgetId="contribid/close">
-         <parent widgetId="file"/>
-      </command>
-   </shell>
-</macro>

diff --git a/ui/org.eclipse.pde.ui.tests/scripts/macro20.emc b/ui/org.eclipse.pde.ui.tests/scripts/macro20.emc
deleted file mode 100644
index 7f19b40..0000000
--- a/ui/org.eclipse.pde.ui.tests/scripts/macro20.emc
+++ /dev/null

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<macro version="0.1">
-   <shell id="org.eclipse.ui.internal.WorkbenchWindow" return-code="0">
-      <command type="select" contextId="menus" widgetId="contribclass/org.eclipse.ui.actions.NewWizardMenu">
-         <parent widgetId="file"/>
-         <parent widgetId="new"/>
-      </command>
-      <shell id="org.eclipse.jface.wizard.WizardDialog" return-code="0">
-         <command type="default-select" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1">
-            <item path="org.eclipse.pde.ui.NewProjectWizard"/>
-         </command>
-         <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#1">
-         com.example.xyz
-         </command>
-         <command type="select" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Button#5" selection="false"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="select" contextId="wizard-page/page2" widgetId="org.eclipse.swt.widgets.Button#1" selection="false"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-      </shell>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-      <command type="wait"/>
-      <command type="select" contextId="menus" widgetId="contribid/close">
-         <parent widgetId="file"/>
-      </command>
-   </shell>
-</macro>

diff --git a/ui/org.eclipse.pde.ui.tests/scripts/macro21.emc b/ui/org.eclipse.pde.ui.tests/scripts/macro21.emc
deleted file mode 100644
index cfec7f8..0000000
--- a/ui/org.eclipse.pde.ui.tests/scripts/macro21.emc
+++ /dev/null

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<macro version="0.1">
-   <shell id="org.eclipse.ui.internal.WorkbenchWindow" return-code="0">
-      <command type="select" contextId="menus" widgetId="contribclass/org.eclipse.ui.actions.NewWizardMenu">
-         <parent widgetId="file"/>
-         <parent widgetId="new"/>
-      </command>
-      <shell id="org.eclipse.jface.wizard.WizardDialog" return-code="0">
-         <command type="default-select" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1">
-            <item path="org.eclipse.pde.ui.NewProjectWizard"/>
-         </command>
-         <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#1">
-         com.example.xyz
-         </command>
-         <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#3">
-         src/abc
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=14"/>
-         <command type="select" contextId="wizard-page/page2" widgetId="org.eclipse.swt.widgets.Button#1" selection="false"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-         <command type="wait"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-      </shell>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-      <command type="wait"/>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-      <command type="wait"/>
-      <command type="focus" contextId="editor/org.eclipse.pde.ui.manifestEditor/MANIFEST.MF" widgetId="org.eclipse.swt.widgets.Text#1"/>
-      <command type="wait"/>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-   </shell>
-</macro>

diff --git a/ui/org.eclipse.pde.ui.tests/scripts/macro22.emc b/ui/org.eclipse.pde.ui.tests/scripts/macro22.emc
deleted file mode 100644
index 87afd92..0000000
--- a/ui/org.eclipse.pde.ui.tests/scripts/macro22.emc
+++ /dev/null

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<macro version="0.1">
-   <shell id="org.eclipse.ui.internal.WorkbenchWindow" return-code="0">
-      <command type="select" contextId="menus" widgetId="contribclass/org.eclipse.ui.actions.NewWizardMenu">
-         <parent widgetId="file"/>
-         <parent widgetId="new"/>
-      </command>
-      <shell id="org.eclipse.jface.wizard.WizardDialog" return-code="0">
-         <command type="default-select" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1">
-            <item path="org.eclipse.pde.ui.NewProjectWizard"/>
-         </command>
-         <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#1">
-         com.example.xyz
-         </command>
-         <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#4">
-         bin/abc
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=14"/>
-         <command type="select" contextId="wizard-page/page2" widgetId="org.eclipse.swt.widgets.Button#1" selection="false"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-         <command type="wait"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-      </shell>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-      <command type="wait"/>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-      <command type="focus" contextId="editor/org.eclipse.pde.ui.manifestEditor/MANIFEST.MF" widgetId="org.eclipse.swt.widgets.Text#1"/>
-      <command type="wait"/>
-      <command type="select" contextId="menus" widgetId="contribid/close">
-         <parent widgetId="file"/>
-      </command>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-   </shell>
-</macro>

diff --git a/ui/org.eclipse.pde.ui.tests/scripts/macro23.emc b/ui/org.eclipse.pde.ui.tests/scripts/macro23.emc
deleted file mode 100644
index 7c3be33..0000000
--- a/ui/org.eclipse.pde.ui.tests/scripts/macro23.emc
+++ /dev/null

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<macro version="0.1">
-   <shell id="org.eclipse.ui.internal.WorkbenchWindow" return-code="0">
-      <command type="select" contextId="menus" widgetId="contribclass/org.eclipse.ui.actions.NewWizardMenu">
-         <parent widgetId="file"/>
-         <parent widgetId="new"/>
-      </command>
-      <shell id="org.eclipse.jface.wizard.WizardDialog" return-code="0">
-         <command type="default-select" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1">
-            <item path="org.eclipse.pde.ui.NewProjectWizard"/>
-         </command>
-         <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#1">
-         com.example.xyz
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=14"/>
-         <command type="modify" contextId="wizard-page/page2" widgetId="org.eclipse.swt.widgets.Text#5">
-         .
-         </command>
-         <command type="select" contextId="wizard-page/page2" widgetId="org.eclipse.swt.widgets.Button#1" selection="false"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-      </shell>
- 	  <command type="wait"/>
-      <command type="focus" contextId="editor/org.eclipse.pde.ui.manifestEditor/MANIFEST.MF" widgetId="org.eclipse.swt.widgets.Text#1"/>
-      <command type="select" contextId="menus" widgetId="contribid/close">
-         <parent widgetId="file"/>
-      </command>
-   </shell>
-</macro>

diff --git a/ui/org.eclipse.pde.ui.tests/scripts/macro24.emc b/ui/org.eclipse.pde.ui.tests/scripts/macro24.emc
deleted file mode 100644
index 05e93a8..0000000
--- a/ui/org.eclipse.pde.ui.tests/scripts/macro24.emc
+++ /dev/null

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<macro version="0.1">
-   <shell id="org.eclipse.ui.internal.WorkbenchWindow" return-code="0">
-      <command type="select" contextId="menus" widgetId="contribclass/org.eclipse.ui.actions.NewWizardMenu">
-         <parent widgetId="file"/>
-         <parent widgetId="new"/>
-      </command>
-      <shell id="org.eclipse.jface.wizard.WizardDialog" return-code="0">
-         <command type="default-select" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1">
-            <item path="org.eclipse.pde.ui.NewProjectWizard"/>
-         </command>
-         <command type="focus" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#1"/>
-         <command type="wait"/>
-         <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#1">
-         com.example.xyz
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=14"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-         <command type="wait"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-      </shell>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-      <command type="wait"/>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-      <command type="focus" contextId="editor/org.eclipse.pde.ui.manifestEditor/MANIFEST.MF" widgetId="org.eclipse.swt.widgets.Text#1"/>
-      <command type="wait"/>
-      <command type="select" contextId="menus" widgetId="contribid/close">
-         <parent widgetId="file"/>
-      </command>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-   </shell>
-</macro>

diff --git a/ui/org.eclipse.pde.ui.tests/scripts/macro25.emc b/ui/org.eclipse.pde.ui.tests/scripts/macro25.emc
deleted file mode 100644
index 1e643fc..0000000
--- a/ui/org.eclipse.pde.ui.tests/scripts/macro25.emc
+++ /dev/null

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<macro version="0.1">
-   <shell id="org.eclipse.ui.internal.WorkbenchWindow" return-code="0">
-      <command type="select" contextId="menus" widgetId="contribclass/org.eclipse.ui.actions.NewWizardMenu">
-         <parent widgetId="file"/>
-         <parent widgetId="new"/>
-      </command>
-      <shell id="org.eclipse.jface.wizard.WizardDialog" return-code="0">
-         <command type="default-select" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1">
-            <item path="org.eclipse.pde.ui.NewProjectWizard"/>
-         </command>
-         <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#1">
-         com.example.xyz
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=14"/>
-         <command type="select" contextId="wizard-page/page2" widgetId="org.eclipse.swt.widgets.Button#2" selection="false"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-         <command type="wait"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-      </shell>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-      <command type="wait"/>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-      <command type="focus" contextId="editor/org.eclipse.pde.ui.manifestEditor/MANIFEST.MF" widgetId="org.eclipse.swt.widgets.Text#1"/>
-      <command type="wait"/>
-      <command type="select" contextId="menus" widgetId="contribid/close">
-         <parent widgetId="file"/>
-      </command>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-   </shell>
-</macro>

diff --git a/ui/org.eclipse.pde.ui.tests/scripts/macro26.emc b/ui/org.eclipse.pde.ui.tests/scripts/macro26.emc
deleted file mode 100644
index fe61f81..0000000
--- a/ui/org.eclipse.pde.ui.tests/scripts/macro26.emc
+++ /dev/null

@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<macro version="0.1">
-   <shell id="org.eclipse.ui.internal.WorkbenchWindow" return-code="0">
-      <command type="select" contextId="menus" widgetId="contribid/importExport">
-         <parent widgetId="file"/>
-      </command>
-      <shell id="org.eclipse.jface.wizard.WizardDialog" return-code="0">
-         <command type="focus" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.TabFolder#1"/>
-         <command type="choice-select" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.TabFolder#1" choiceId="item#0"/>
-         <command type="item-select" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.Table#1">
-            <item path="org.eclipse.pde.ui.PluginImportWizard"/>
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#1"/>
-         <command type="focus" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#8"/>
-         <command type="select" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#9" selection="false"/>
-         <command type="select" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#8" selection="true"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=14"/>
-         <command type="default-select" contextId="wizard-page/detailed" widgetId="org.eclipse.swt.widgets.Table#1">
-            <item path="org.eclipse.pde.ui"/>
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-         <command type="wait"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-      </shell>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-      <command type="wait"/>
-      <command type="select" contextId="menus" widgetId="contribclass/org.eclipse.ui.actions.NewWizardMenu">
-         <parent widgetId="file"/>
-         <parent widgetId="new"/>
-      </command>
-      <shell id="org.eclipse.jface.wizard.WizardDialog" return-code="0">
-         <command type="item-select" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1">
-            <item path="org.eclipse.jdt.ui.wizards.JavaProjectWizard"/>
-         </command>
-         <command type="item-expand" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1" value="false">
-            <item path="org.eclipse.pde.PDE"/>
-         </command>
-         <command type="item-select" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1">
-            <item path="org.eclipse.pde.PDE"/>
-         </command>
-         <command type="item-expand" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1" value="true">
-            <item path="org.eclipse.pde.PDE"/>
-         </command>
-         <command type="item-select" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1">
-            <item path="org.eclipse.pde.ui.NewLibraryPluginProjectWizard"/>
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=14"/>
-         <command type="select" contextId="wizard-page/jars" widgetId="org.eclipse.swt.widgets.Button#1"/>
-         <shell id="org.eclipse.ui.dialogs.ElementTreeSelectionDialog" return-code="0">
-            <command type="item-select" contextId="shell" widgetId="org.eclipse.swt.widgets.Tree#1">
-               <item path="/org.eclipse.pde.ui"/>
-            </command>
-            <command type="item-expand" contextId="shell" widgetId="org.eclipse.swt.widgets.Tree#1" value="true">
-               <item path="/org.eclipse.pde.ui"/>
-            </command>
-            <command type="item-select" contextId="shell" widgetId="org.eclipse.swt.widgets.Tree#1">
-               <item path="/org.eclipse.pde.ui/pdeuiant.jar"/>
-            </command>
-            <command type="select" contextId="shell" widgetId="org.eclipse.swt.widgets.Button#ButtonId=0"/>
-         </shell>
-         <command type="focus" contextId="wizard-page/jars" widgetId="org.eclipse.swt.widgets.Button#1"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-               <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#1">
-               com.example.xyz
-               </command>
-               <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#3">
-               com.example.xyz
-               </command>
-               <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#5">
-               Xyz Plug-in
-               </command>
-               <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#3">
-               com.example.xyz
-               </command>
-               <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#5">
-               Xyz Plug-in
-               </command>
-               <command type="focus" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#3"/>
-               <command type="wait"/>
-               <command type="focus" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#3"/>
-               <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#4">
-               1.0.1
-               </command>
-               <command type="focus" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#5"/>
-               <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#6">
-               Eclipse.org
-               </command>
-               <command type="select" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Button#3" selection="false"/>
-               <command type="select" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Button#4" selection="false"/>
-               <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-               <command type="wait"/>
-               <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-      </shell>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-      <command type="wait"/>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-   </shell>
-</macro>

diff --git a/ui/org.eclipse.pde.ui.tests/scripts/macro27.emc b/ui/org.eclipse.pde.ui.tests/scripts/macro27.emc
deleted file mode 100644
index 7c0d61b..0000000
--- a/ui/org.eclipse.pde.ui.tests/scripts/macro27.emc
+++ /dev/null

@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<macro version="0.1">
-   <shell id="org.eclipse.ui.internal.WorkbenchWindow" return-code="0">
-      <command type="select" contextId="menus" widgetId="contribid/importExport">
-         <parent widgetId="file"/>
-      </command>
-      <shell id="org.eclipse.jface.wizard.WizardDialog" return-code="0">
-         <command type="focus" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.TabFolder#1"/>
-         <command type="choice-select" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.TabFolder#1" choiceId="item#1"/>
-         <command type="choice-select" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.TabFolder#1" choiceId="item#0"/>
-         <command type="item-select" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.Table#1">
-            <item path="org.eclipse.pde.ui.PluginImportWizard"/>
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#1"/>
-         <command type="focus" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#8"/>
-         <command type="select" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#9" selection="false"/>
-         <command type="select" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#8" selection="true"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=14"/>
-         <command type="default-select" contextId="wizard-page/detailed" widgetId="org.eclipse.swt.widgets.Table#1">
-            <item path="org.eclipse.pde.ui"/>
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-         <command type="wait"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-      </shell>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-      <command type="wait"/>
-      <command type="select" contextId="menus" widgetId="contribclass/org.eclipse.ui.actions.NewWizardMenu">
-         <parent widgetId="file"/>
-         <parent widgetId="new"/>
-      </command>
-      <shell id="org.eclipse.jface.wizard.WizardDialog" return-code="0">
-         <command type="item-select" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1">
-            <item path="org.eclipse.jdt.ui.wizards.JavaProjectWizard"/>
-         </command>
-         <command type="item-expand" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1" value="false">
-            <item path="org.eclipse.pde.PDE"/>
-         </command>
-         <command type="item-select" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1">
-            <item path="org.eclipse.pde.PDE"/>
-         </command>
-         <command type="item-expand" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1" value="true">
-            <item path="org.eclipse.pde.PDE"/>
-         </command>
-         <command type="item-select" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1">
-            <item path="org.eclipse.pde.ui.NewLibraryPluginProjectWizard"/>
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=14"/>
-         <command type="select" contextId="wizard-page/jars" widgetId="org.eclipse.swt.widgets.Button#1"/>
-         <shell id="org.eclipse.ui.dialogs.ElementTreeSelectionDialog" return-code="0">
-            <command type="item-select" contextId="shell" widgetId="org.eclipse.swt.widgets.Tree#1">
-               <item path="/org.eclipse.pde.ui"/>
-            </command>
-            <command type="item-expand" contextId="shell" widgetId="org.eclipse.swt.widgets.Tree#1" value="true">
-               <item path="/org.eclipse.pde.ui"/>
-            </command>
-            <command type="item-select" contextId="shell" widgetId="org.eclipse.swt.widgets.Tree#1">
-               <item path="/org.eclipse.pde.ui/pdeuiant.jar"/>
-            </command>
-            <command type="select" contextId="shell" widgetId="org.eclipse.swt.widgets.Button#ButtonId=0"/>
-         </shell>
-         <command type="focus" contextId="wizard-page/jars" widgetId="org.eclipse.swt.widgets.Button#1"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-               <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#1">
-               com.example.xyz
-               </command>
-               <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#3">
-               com.example.xyz
-               </command>
-               <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#5">
-               Xyz Plug-in
-               </command>
-               <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#3">
-               com.example.xyz
-               </command>
-               <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#5">
-               Xyz Plug-in
-               </command>
-               <command type="focus" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#3"/>
-               <command type="wait"/>
-               <command type="focus" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#3"/>
-               <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#4">
-               1.0.1
-               </command>
-               <command type="focus" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#5"/>
-               <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#6">
-               Eclipse.org
-               </command>
-               <command type="select" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Button#3" selection="true"/>
-               <command type="select" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Button#4" selection="false"/>
-               <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-               <command type="wait"/>
-               <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-      </shell>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-      <command type="wait"/>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-   </shell>
-</macro>

diff --git a/ui/org.eclipse.pde.ui.tests/scripts/macro28.emc b/ui/org.eclipse.pde.ui.tests/scripts/macro28.emc
deleted file mode 100644
index 54a394d..0000000
--- a/ui/org.eclipse.pde.ui.tests/scripts/macro28.emc
+++ /dev/null

@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<macro version="0.1">
-   <shell id="org.eclipse.ui.internal.WorkbenchWindow" return-code="0">
-      <command type="select" contextId="menus" widgetId="contribid/importExport">
-         <parent widgetId="file"/>
-      </command>
-      <shell id="org.eclipse.jface.wizard.WizardDialog" return-code="0">
-         <command type="focus" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.TabFolder#1"/>
-         <command type="choice-select" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.TabFolder#1" choiceId="item#0"/>
-         <command type="item-select" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.Table#1">
-            <item path="org.eclipse.pde.ui.PluginImportWizard"/>
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#1"/>
-         <command type="focus" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#8"/>
-         <command type="select" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#9" selection="false"/>
-         <command type="select" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#8" selection="true"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=14"/>
-         <command type="default-select" contextId="wizard-page/detailed" widgetId="org.eclipse.swt.widgets.Table#1">
-            <item path="org.eclipse.pde.ui"/>
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-         <command type="wait"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-      </shell>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-      <command type="wait"/>
-      <command type="select" contextId="menus" widgetId="contribclass/org.eclipse.ui.actions.NewWizardMenu">
-         <parent widgetId="file"/>
-         <parent widgetId="new"/>
-      </command>
-      <shell id="org.eclipse.jface.wizard.WizardDialog" return-code="0">
-         <command type="item-select" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1">
-            <item path="org.eclipse.jdt.ui.wizards.JavaProjectWizard"/>
-         </command>
-         <command type="item-expand" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1" value="false">
-            <item path="org.eclipse.pde.PDE"/>
-         </command>
-         <command type="item-select" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1">
-            <item path="org.eclipse.pde.PDE"/>
-         </command>
-         <command type="item-expand" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1" value="true">
-            <item path="org.eclipse.pde.PDE"/>
-         </command>
-         <command type="item-select" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1">
-            <item path="org.eclipse.pde.ui.NewLibraryPluginProjectWizard"/>
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=14"/>
-         <command type="select" contextId="wizard-page/jars" widgetId="org.eclipse.swt.widgets.Button#1"/>
-         <shell id="org.eclipse.ui.dialogs.ElementTreeSelectionDialog" return-code="0">
-            <command type="item-select" contextId="shell" widgetId="org.eclipse.swt.widgets.Tree#1">
-               <item path="/org.eclipse.pde.ui"/>
-            </command>
-            <command type="item-expand" contextId="shell" widgetId="org.eclipse.swt.widgets.Tree#1" value="true">
-               <item path="/org.eclipse.pde.ui"/>
-            </command>
-            <command type="item-select" contextId="shell" widgetId="org.eclipse.swt.widgets.Tree#1">
-               <item path="/org.eclipse.pde.ui/pdeuiant.jar"/>
-            </command>
-            <command type="select" contextId="shell" widgetId="org.eclipse.swt.widgets.Button#ButtonId=0"/>
-         </shell>
-         <command type="focus" contextId="wizard-page/jars" widgetId="org.eclipse.swt.widgets.Button#1"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-               <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#1">
-               com.example.xyz
-               </command>
-               <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#3">
-               com.example.xyz
-               </command>
-               <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#5">
-               Xyz Plug-in
-               </command>
-               <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#3">
-               com.example.xyz
-               </command>
-               <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#5">
-               Xyz Plug-in
-               </command>
-               <command type="focus" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#3"/>
-               <command type="wait"/>
-               <command type="focus" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#3"/>
-               <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#4">
-               1.0.1
-               </command>
-               <command type="focus" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#5"/>
-               <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#6">
-               Eclipse.org
-               </command>
-               <command type="select" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Button#3" selection="false"/>
-               <command type="select" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Button#4" selection="true"/>
-               <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-               <command type="wait"/>
-               <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-      </shell>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-      <command type="wait"/>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-   </shell>
-</macro>

diff --git a/ui/org.eclipse.pde.ui.tests/scripts/macro29.emc b/ui/org.eclipse.pde.ui.tests/scripts/macro29.emc
deleted file mode 100644
index 875660b..0000000
--- a/ui/org.eclipse.pde.ui.tests/scripts/macro29.emc
+++ /dev/null

@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<macro version="0.1">
-   <shell id="org.eclipse.ui.internal.WorkbenchWindow" return-code="0">
-      <command type="select" contextId="menus" widgetId="contribid/importExport">
-         <parent widgetId="file"/>
-      </command>
-      <shell id="org.eclipse.jface.wizard.WizardDialog" return-code="0">
-         <command type="focus" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.TabFolder#1"/>
-         <command type="choice-select" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.TabFolder#1" choiceId="item#0"/>
-         <command type="item-select" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.Table#1">
-            <item path="org.eclipse.pde.ui.PluginImportWizard"/>
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#1"/>
-         <command type="focus" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#8"/>
-         <command type="select" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#9" selection="false"/>
-         <command type="select" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#8" selection="true"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=14"/>
-         <command type="default-select" contextId="wizard-page/detailed" widgetId="org.eclipse.swt.widgets.Table#1">
-            <item path="org.eclipse.pde.ui"/>
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-         <command type="wait"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-      </shell>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-      <command type="wait"/>
-      <command type="select" contextId="menus" widgetId="contribclass/org.eclipse.ui.actions.NewWizardMenu">
-         <parent widgetId="file"/>
-         <parent widgetId="new"/>
-      </command>
-      <shell id="org.eclipse.jface.wizard.WizardDialog" return-code="0">
-         <command type="item-select" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1">
-            <item path="org.eclipse.jdt.ui.wizards.JavaProjectWizard"/>
-         </command>
-         <command type="item-expand" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1" value="false">
-            <item path="org.eclipse.pde.PDE"/>
-         </command>
-         <command type="item-select" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1">
-            <item path="org.eclipse.pde.PDE"/>
-         </command>
-         <command type="item-expand" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1" value="true">
-            <item path="org.eclipse.pde.PDE"/>
-         </command>
-         <command type="item-select" contextId="wizard-page/newWizardSelectionPage" widgetId="org.eclipse.swt.widgets.Tree#1">
-            <item path="org.eclipse.pde.ui.NewLibraryPluginProjectWizard"/>
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=14"/>
-         <command type="select" contextId="wizard-page/jars" widgetId="org.eclipse.swt.widgets.Button#1"/>
-         <shell id="org.eclipse.ui.dialogs.ElementTreeSelectionDialog" return-code="0">
-            <command type="item-select" contextId="shell" widgetId="org.eclipse.swt.widgets.Tree#1">
-               <item path="/org.eclipse.pde.ui"/>
-            </command>
-            <command type="item-expand" contextId="shell" widgetId="org.eclipse.swt.widgets.Tree#1" value="true">
-               <item path="/org.eclipse.pde.ui"/>
-            </command>
-            <command type="item-select" contextId="shell" widgetId="org.eclipse.swt.widgets.Tree#1">
-               <item path="/org.eclipse.pde.ui/pdeuiant.jar"/>
-            </command>
-            <command type="select" contextId="shell" widgetId="org.eclipse.swt.widgets.Button#ButtonId=0"/>
-         </shell>
-         <command type="focus" contextId="wizard-page/jars" widgetId="org.eclipse.swt.widgets.Button#1"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-               <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#1">
-               com.example.xyz
-               </command>
-               <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#3">
-               com.example.xyz
-               </command>
-               <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#5">
-               Xyz Plug-in
-               </command>
-               <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#3">
-               com.example.xyz
-               </command>
-               <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#5">
-               Xyz Plug-in
-               </command>
-               <command type="focus" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#3"/>
-               <command type="wait"/>
-               <command type="focus" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#3"/>
-               <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#4">
-               1.0.1
-               </command>
-               <command type="focus" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#5"/>
-               <command type="modify" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Text#6">
-               Eclipse.org
-               </command>
-               <command type="select" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Button#3" selection="true"/>
-               <command type="select" contextId="wizard-page/main" widgetId="org.eclipse.swt.widgets.Button#4" selection="true"/>
-               <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-               <command type="wait"/>
-               <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-      </shell>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-      <command type="wait"/>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-   </shell>
-</macro>

diff --git a/ui/org.eclipse.pde.ui.tests/scripts/macro3.emc b/ui/org.eclipse.pde.ui.tests/scripts/macro3.emc
deleted file mode 100644
index d34ec05..0000000
--- a/ui/org.eclipse.pde.ui.tests/scripts/macro3.emc
+++ /dev/null

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<macro version="0.1">
-   <shell id="org.eclipse.ui.internal.WorkbenchWindow" return-code="0">
-      <command type="select" contextId="menus" widgetId="contribid/importExport">
-         <parent widgetId="file"/>
-      </command>
-      <shell id="org.eclipse.jface.wizard.WizardDialog" return-code="0">
-         <command type="focus" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.TabFolder#1"/>
-         <command type="default-select" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.Tree#1">
-            <item path="org.eclipse.pde.ui.PluginImportWizard"/>
-         </command>
-         <command type="focus" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#1"/>
-         <command type="focus" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#9"/>
-         <command type="select" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#8" selection="false"/>
-         <command type="select" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#9" selection="true"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=14"/>
-         <command type="default-select" contextId="wizard-page/detailed" widgetId="org.eclipse.swt.widgets.Table#1">
-            <item path="org.eclipse.core.filebuffers"/>
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-      </shell>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-   </shell>
-</macro>

diff --git a/ui/org.eclipse.pde.ui.tests/scripts/macro4.emc b/ui/org.eclipse.pde.ui.tests/scripts/macro4.emc
deleted file mode 100644
index 3aaca15..0000000
--- a/ui/org.eclipse.pde.ui.tests/scripts/macro4.emc
+++ /dev/null

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<macro version="0.1">
-   <shell id="org.eclipse.ui.internal.WorkbenchWindow" return-code="0">
-      <command type="select" contextId="menus" widgetId="contribid/importExport">
-         <parent widgetId="file"/>
-      </command>
-      <shell id="org.eclipse.jface.wizard.WizardDialog" return-code="0">
-         <command type="focus" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.TabFolder#1"/>
-         <command type="default-select" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.Tree#1">
-            <item path="org.eclipse.pde.ui.PluginImportWizard"/>
-         </command>
-         <command type="focus" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#1"/>
-         <command type="select" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#9" selection="true"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=14"/>
-         <command type="default-select" contextId="wizard-page/detailed" widgetId="org.eclipse.swt.widgets.Table#1">
-            <item path="org.eclipse.osgi"/>
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-      </shell>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-   </shell>
-</macro>

diff --git a/ui/org.eclipse.pde.ui.tests/scripts/macro5.emc b/ui/org.eclipse.pde.ui.tests/scripts/macro5.emc
deleted file mode 100644
index 8788e5b..0000000
--- a/ui/org.eclipse.pde.ui.tests/scripts/macro5.emc
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<macro version="0.1">
-   <shell id="org.eclipse.ui.internal.WorkbenchWindow" return-code="0">
-      <command type="select" contextId="menus" widgetId="contribid/importExport">
-         <parent widgetId="file"/>
-      </command>
-      <shell id="org.eclipse.jface.wizard.WizardDialog" return-code="0">
-         <command type="focus" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.TabFolder#1"/>
-         <command type="choice-select" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.TabFolder#1" choiceId="item#0"/>
-         <command type="item-select" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.Table#1">
-            <item path="org.eclipse.pde.ui.PluginImportWizard"/>
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#1"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=14"/>
-         <command type="default-select" contextId="wizard-page/detailed" widgetId="org.eclipse.swt.widgets.Table#1">
-            <item path="org.eclipse.jface"/>
-         </command>
-         <command type="select" contextId="wizard-page/detailed" widgetId="org.eclipse.swt.widgets.Button#8"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-         <command type="wait"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-      </shell>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-   </shell>
-</macro>

diff --git a/ui/org.eclipse.pde.ui.tests/scripts/macro6.emc b/ui/org.eclipse.pde.ui.tests/scripts/macro6.emc
deleted file mode 100644
index a2a41bb..0000000
--- a/ui/org.eclipse.pde.ui.tests/scripts/macro6.emc
+++ /dev/null

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<macro version="0.1">
-   <shell id="org.eclipse.ui.internal.WorkbenchWindow" return-code="0">
-      <command type="select" contextId="menus" widgetId="contribid/importExport">
-         <parent widgetId="file"/>
-      </command>
-      <shell id="org.eclipse.jface.wizard.WizardDialog" return-code="0">
-         <command type="focus" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.TabFolder#1"/>
-         <command type="item-expand" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.Tree#1" value="true">
-            <item path="org.eclipse.pde.ui.PluginDevelopment"/>
-         </command>
-         <command type="default-select" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.Tree#1">
-            <item path="org.eclipse.pde.ui.PluginImportWizard"/>
-         </command>
-         <command type="focus" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#1"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=14"/>
-         <command type="default-select" contextId="wizard-page/detailed" widgetId="org.eclipse.swt.widgets.Table#1">
-            <item path="org.eclipse.core.filebuffers"/>
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-      </shell>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-   </shell>
-</macro>

diff --git a/ui/org.eclipse.pde.ui.tests/scripts/macro7.emc b/ui/org.eclipse.pde.ui.tests/scripts/macro7.emc
deleted file mode 100644
index 5aa8f5c..0000000
--- a/ui/org.eclipse.pde.ui.tests/scripts/macro7.emc
+++ /dev/null

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<macro version="0.1">
-   <shell id="org.eclipse.ui.internal.WorkbenchWindow" return-code="0">
-      <command type="select" contextId="menus" widgetId="contribid/importExport">
-         <parent widgetId="file"/>
-      </command>
-      <shell id="org.eclipse.jface.wizard.WizardDialog" return-code="0">
-         <command type="focus" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.TabFolder#1"/>
-         <command type="item-expand" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.Tree#1" value="true">
-            <item path="org.eclipse.pde.ui.PluginDevelopment"/>
-         </command>
-         <command type="default-select" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.Tree#1">
-            <item path="org.eclipse.pde.ui.PluginImportWizard"/>
-         </command>
-         <command type="focus" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#1"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=14"/>
-         <command type="default-select" contextId="wizard-page/detailed" widgetId="org.eclipse.swt.widgets.Table#1">
-            <item path="org.eclipse.osgi"/>
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-      </shell>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-   </shell>
-</macro>

diff --git a/ui/org.eclipse.pde.ui.tests/scripts/macro8.emc b/ui/org.eclipse.pde.ui.tests/scripts/macro8.emc
deleted file mode 100644
index e4ea211..0000000
--- a/ui/org.eclipse.pde.ui.tests/scripts/macro8.emc
+++ /dev/null

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<macro version="0.1">
-   <shell id="org.eclipse.ui.internal.WorkbenchWindow" return-code="0">
-      <command type="select" contextId="menus" widgetId="contribid/importExport">
-         <parent widgetId="file"/>
-      </command>
-      <shell id="org.eclipse.jface.wizard.WizardDialog" return-code="0">
-         <command type="focus" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.TabFolder#1"/>
-         <command type="default-select" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.Tree#1">
-            <item path="org.eclipse.pde.ui.PluginImportWizard"/>
-         </command>
-         <command type="focus" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#1"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=14"/>
-         <command type="default-select" contextId="wizard-page/detailed" widgetId="org.eclipse.swt.widgets.Table#1">
-            <item path="org.eclipse.jface"/>
-         </command>
-         <command type="select" contextId="wizard-page/detailed" widgetId="org.eclipse.swt.widgets.Button#8"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-      </shell>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-   </shell>
-</macro>

diff --git a/ui/org.eclipse.pde.ui.tests/scripts/macro9.emc b/ui/org.eclipse.pde.ui.tests/scripts/macro9.emc
deleted file mode 100644
index a20936e..0000000
--- a/ui/org.eclipse.pde.ui.tests/scripts/macro9.emc
+++ /dev/null

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<macro version="0.1">
-   <shell id="org.eclipse.ui.internal.WorkbenchWindow" return-code="0">
-      <command type="select" contextId="menus" widgetId="contribid/importExport">
-         <parent widgetId="file"/>
-      </command>
-      <shell id="org.eclipse.jface.wizard.WizardDialog" return-code="0">
-         <command type="focus" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.TabFolder#1"/>
-         <command type="choice-select" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.TabFolder#1" choiceId="item#0"/>
-         <command type="item-select" contextId="wizard-page/importExportPage" widgetId="org.eclipse.swt.widgets.Table#1">
-            <item path="org.eclipse.pde.ui.PluginImportWizard"/>
-         </command>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#1"/>
-         <command type="focus" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#10"/>
-         <command type="select" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#8" selection="false"/>
-         <command type="select" contextId="wizard-page/first" widgetId="org.eclipse.swt.widgets.Button#10" selection="true"/>
-         <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=15"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=14"/>
-         <command type="default-select" contextId="wizard-page/detailed" widgetId="org.eclipse.swt.widgets.Table#1">
-            <item path="org.eclipse.core.filebuffers"/>
-         </command>
-          <command type="select" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-         <command type="wait"/>
-         <command type="focus" contextId="wizard" widgetId="org.eclipse.swt.widgets.Button#ButtonId=16"/>
-      </shell>
-      <command type="focus" contextId="view/org.eclipse.jdt.ui.PackageExplorer" widgetId="org.eclipse.swt.widgets.Tree#1"/>
-   </shell>
-</macro>

diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/AllPDETests.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/AllPDETests.java
deleted file mode 100644
index 36bc5f9..0000000
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/AllPDETests.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.tests;
-
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllPDETests {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite("Test Suite for org.eclipse.pde.ui"); //$NON-NLS-1$
-		//suite.addTest(AllNewProjectTests.suite());
-		//suite.addTest(AllNewFeatureProjectTests.suite());
-		//suite.addTest(AllImportTests.suite());
-		//suite.addTest(NewSiteProjectTest.suite());
-		return suite;
-	}
-	
-	
-}

diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/Catalog.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/Catalog.java
deleted file mode 100644
index b2fabb6..0000000
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/Catalog.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.tests;
-
-public class Catalog {
-
-	public static final String SIMPLE_PLUGIN_1 = "macro1.emc";
-	public static final String SIMPLE_PLUGIN_2 = "macro2.emc";
-	public static final String IMPORT_LINKS_1 = "macro3.emc";
-	public static final String IMPORT_LINKS_2 = "macro4.emc";
-	public static final String IMPORT_LINKS_3 = "macro5.emc";
-	public static final String IMPORT_BINARY_1 = "macro6.emc";
-	public static final String IMPORT_BINARY_2 = "macro7.emc";
-	public static final String IMPORT_BINARY_3 = "macro8.emc";
-	public static final String IMPORT_SOURCE_1 = "macro9.emc";
-	public static final String IMPORT_SOURCE_2 = "macro10.emc";
-	public static final String IMPORT_SOURCE_3 = "macro11.emc";
-	public static final String IMPORT_BINARY_FEATURE_1 = "macro12.emc";
-	public static final String IMPORT_BINARY_FEATURE_2 = "macro13.emc";
-	public static final String IMPORT_SOURCE_FEATURE = "macro14.emc";
-	public static final String SIMPLE_FEATURE_1 = "macro15.emc";
-	public static final String SIMPLE_FEATURE_2 = "macro16.emc";
-	public static final String FEATURE_WITH_PLUGIN_1 = "macro17.emc";
-	public static final String FEATURE_WITH_PLUGIN_2 = "macro18.emc";
-	public static final String BASIC_JAVA_PLUGIN_1 = "macro19.emc";
-	public static final String BASIC_JAVA_PLUGIN_2 = "macro20.emc";
-	public static final String BASIC_JAVA_PLUGIN_3 = "macro21.emc";
-	public static final String BASIC_JAVA_PLUGIN_4 = "macro22.emc";
-	public static final String BASIC_JAVA_PLUGIN_5 = "macro23.emc";
-	public static final String BASIC_JAVA_PLUGIN_6 = "macro24.emc";
-	public static final String BASIC_JAVA_PLUGIN_7 = "macro25.emc";
-	public static final String LIBRARY_PLUGIN_1 = "macro26.emc";
-	public static final String LIBRARY_PLUGIN_2 = "macro27.emc";
-	public static final String LIBRARY_PLUGIN_3 = "macro28.emc";
-	public static final String LIBRARY_PLUGIN_4 = "macro29.emc";
-
-}

diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/PDETestCase.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/PDETestCase.java
deleted file mode 100644
index 2a1a2ff..0000000
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/PDETestCase.java
+++ /dev/null

@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.tests;
-
-import java.io.*;
-import java.net.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.tests.macro.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.intro.*;
-
-import junit.framework.*;
-
-public abstract class PDETestCase extends TestCase {
-	
-	private static boolean FIRST_TEST = true;
-	
-	private static IWorkbench fWorkbench;
-
-	protected void setUp() throws Exception {
-		if (FIRST_TEST) {
-			fWorkbench = PlatformUI.getWorkbench();
-			
-				// close intro
-			IIntroManager intro = fWorkbench.getIntroManager();
-			intro.closeIntro(intro.getIntro());
-		
-			// open PDE perspective
-			fWorkbench.showPerspective(PDEPlugin.PERSPECTIVE_ID, fWorkbench.getActiveWorkbenchWindow());
-			
-			// set to false
-			FIRST_TEST = false;
-		}	
-	}
-	
-	protected void playScript(String scriptName) {
-		InputStream stream = null;
-		try {
-			MacroManager recorder = MacroPlugin.getDefault().getMacroManager();
-			URL url = Platform.getBundle("org.eclipse.pde.ui.tests").getEntry("scripts/" + scriptName);
-			if (url == null)
-				fail("Script \"" + scriptName + "\" could not be found");
-			stream = url.openStream();			
-			recorder.play(fWorkbench.getDisplay(), fWorkbench.getActiveWorkbenchWindow(), scriptName, stream);
-			recorder.shutdown();
-		} catch (CoreException e) {
-			fail("Error playing the script: \"" + scriptName + "\"");
-		} catch (IOException e) {			
-		} finally {
-			try {
-				if (stream != null) 
-					stream.close();
-			} catch (IOException e) {
-			}
-		}
-	}
-	
-	protected void tearDown() {
-		IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
-		IProject[] projects = workspaceRoot.getProjects();
-		try {
-			for (int i = 0; i < projects.length; i++) {
-				projects[i].delete(true, new NullProgressMonitor());
-			}
-		} catch (CoreException e) {
-		}
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/imports/AllImportTests.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/imports/AllImportTests.java
deleted file mode 100644
index 149c47a..0000000
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/imports/AllImportTests.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.tests.imports;
-
-import junit.framework.*;
-
-public class AllImportTests {
-	
-	public static Test suite() {
-		TestSuite suite = new TestSuite("Test Suite to test the plug-in and feature import wizards."); //$NON-NLS-1$
-		suite.addTest(ImportWithLinksTestCase.suite());
-		suite.addTest(ImportAsBinaryTestCase.suite());
-		suite.addTest(ImportAsSourceTestCase.suite());
-		suite.addTest(ImportFeatureTestCase.suite());
-		return suite;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/imports/ImportAsBinaryTestCase.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/imports/ImportAsBinaryTestCase.java
deleted file mode 100644
index 10dadd2..0000000
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/imports/ImportAsBinaryTestCase.java
+++ /dev/null

@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.tests.imports;
-
-import junit.framework.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.ui.tests.*;
-
-public class ImportAsBinaryTestCase extends PDETestCase {
-
-	public static Test suite() {
-		return new TestSuite(ImportAsBinaryTestCase.class);
-	}
-	
-	public void testImportBinary1() {
-		playScript(Catalog.IMPORT_BINARY_1);
-		try {
-			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-			verifyProject(root.getProject("org.eclipse.core.filebuffers"));
-		} catch (CoreException e) {
-			fail("testImportBinary1:" + e);
-		}
-	}
-
-	public void testImportBinary2() {
-		playScript(Catalog.IMPORT_BINARY_2);
-		try {
-			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-			verifyProject(root.getProject("org.eclipse.osgi"));
-		} catch (CoreException e) {
-			fail("testImportBinary2:" + e);
-		}
-	}
-	
-	public void testImportBinary3() {
-		playScript(Catalog.IMPORT_BINARY_3);
-		try {
-			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-			IProject[] projects = root.getProjects();
-			assertTrue(projects.length > 0);
-			for (int i = 0; i < projects.length; i++) {
-				verifyProject(projects[i]);				
-			}
-		} catch (CoreException e) {
-			fail("testImportBinary3:" + e);
-		}
-	}
-
-	private void verifyProject(IProject project) throws CoreException {
-		assertTrue("Project was not created.", project.exists());
-		assertNotNull(project.getPersistentProperty(PDECore.EXTERNAL_PROJECT_PROPERTY));
-		if (project.hasNature(JavaCore.NATURE_ID))
-			assertTrue(checkSourceAttached(JavaCore.create(project)));
-	}
-		
-	private boolean checkSourceAttached(IJavaProject jProject) throws CoreException {
-		IPackageFragmentRoot[] roots = jProject.getPackageFragmentRoots();
-		for (int i = 0; i < roots.length; i++) {
-			IClasspathEntry entry = roots[i].getRawClasspathEntry();
-			if (entry.getEntryKind() != IClasspathEntry.CPE_LIBRARY 
-					|| entry.getEntryKind() != IClasspathEntry.CPE_CONTAINER 
-					|| !entry.getPath().equals(new Path(PDECore.CLASSPATH_CONTAINER_ID)))
-				continue;
-			if (roots[i].getSourceAttachmentPath() == null)
-				return false;
-		}
-		return true;
-	}
-	
-
-}

diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/imports/ImportAsSourceTestCase.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/imports/ImportAsSourceTestCase.java
deleted file mode 100644
index 10c38fe..0000000
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/imports/ImportAsSourceTestCase.java
+++ /dev/null

@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.tests.imports;
-
-import junit.framework.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.ui.tests.*;
-
-public class ImportAsSourceTestCase extends PDETestCase {
-
-	public static Test suite() {
-		return new TestSuite(ImportAsSourceTestCase.class);
-	}
-	
-	public void testImportSource1() {
-		playScript(Catalog.IMPORT_SOURCE_1);
-		try {
-			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-			verifyProject(root.getProject("org.eclipse.core.filebuffers"));
-		} catch (CoreException e) {
-			fail("testImportSource1:" + e);
-		}
-	}
-
-	public void testImportSource2() {
-		playScript(Catalog.IMPORT_SOURCE_2);
-		try {
-			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-			verifyProject(root.getProject("org.eclipse.osgi"));
-		} catch (CoreException e) {
-			fail("testImportSource2:" + e);
-		}
-	}
-	
-	public void testImportSource3() {
-		playScript(Catalog.IMPORT_SOURCE_3);
-		try {
-			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-			IProject[] projects = root.getProjects();
-			assertTrue(projects.length > 0);
-			for (int i = 0; i < projects.length; i++) {
-				verifyProject(projects[i]);				
-			}
-		} catch (CoreException e) {
-			fail("testImportSource3:" + e);
-		}
-	}
-
-	private void verifyProject(IProject project) throws CoreException {
-		assertTrue("Project was not created.", project.exists());
-		if (project.hasNature(JavaCore.NATURE_ID))
-			assertTrue(checkSourceAttached(JavaCore.create(project)));
-	}
-		
-	private boolean checkSourceAttached(IJavaProject jProject) throws CoreException {
-		IPackageFragmentRoot[] roots = jProject.getPackageFragmentRoots();
-		for (int i = 0; i < roots.length; i++) {
-			IClasspathEntry entry = roots[i].getRawClasspathEntry();
-			if (entry.getEntryKind() != IClasspathEntry.CPE_CONTAINER 
-					|| !entry.getPath().equals(new Path(PDECore.CLASSPATH_CONTAINER_ID)))
-				continue;
-			if (roots[i].getSourceAttachmentPath() == null)
-				return false;
-		}
-		return true;
-	}
-	
-
-}

diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/imports/ImportFeatureTestCase.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/imports/ImportFeatureTestCase.java
deleted file mode 100644
index 8667702..0000000
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/imports/ImportFeatureTestCase.java
+++ /dev/null

@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.tests.imports;
-
-import junit.framework.Test;
-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.CoreException;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.feature.FeatureChild;
-import org.eclipse.pde.internal.core.ifeature.IFeature;
-import org.eclipse.pde.internal.core.ifeature.IFeatureChild;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.ui.tests.Catalog;
-import org.eclipse.pde.ui.tests.PDETestCase;
-
-public class ImportFeatureTestCase extends PDETestCase {
-
-	public static Test suite() {
-		return new TestSuite(ImportFeatureTestCase.class);
-	}
-
-	public void testImportBinaryFeature1() {
-		playScript(Catalog.IMPORT_BINARY_FEATURE_1);
-		try {
-			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-			verifyProject(root.getProject("org.eclipse.pde-feature"), true);
-			verifyModel("org.eclipse.pde", "org.eclipse.pde-feature");
-		} catch (CoreException e) {
-			fail("testImportBinaryFeature1:" + e);
-		}
-	}
-
-	public void testImportBinaryFeature2() {
-		playScript(Catalog.IMPORT_BINARY_FEATURE_2);
-		try {
-			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-			verifyProject(root.getProject("org.eclipse.sdk-feature"), true);
-			verifyModel("org.eclipse.sdk", "org.eclipse.sdk-feature");
-			IFeature feature = PDECore.getDefault().getFeatureModelManager()
-					.findFeatureModels("org.eclipse.sdk")[0].getFeature();
-			IFeatureChild[] included = feature.getIncludedFeatures();
-			assertTrue("SDK feature does not include other features",
-					included.length > 0);
-			boolean foundPDE = false;
-			for (int i = 0; i < included.length; i++) {
-				IFeature inclFeature = ((FeatureChild) included[i])
-						.getReferencedFeature();
-				if (inclFeature != null
-						&& "org.eclipse.pde".equals(inclFeature.getId())) {
-					foundPDE = true;
-				}
-			}
-			assertTrue("Included feature not found.", foundPDE);
-		} catch (CoreException e) {
-			fail("testImportBinaryFeature2:" + e);
-		}
-	}
-
-	public void testImportFeatureAsSource() {
-		playScript(Catalog.IMPORT_SOURCE_FEATURE);
-		try {
-			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-			verifyProject(root.getProject("org.eclipse.pde-feature"), false);
-			verifyModel("org.eclipse.pde", "org.eclipse.pde-feature");
-		} catch (CoreException e) {
-			fail("testImportFeatureAsSource:" + e);
-		}
-	}
-
-	private void verifyProject(IProject project, boolean binary)
-			throws CoreException {
-		assertTrue("Project was not created.", project.exists());
-		if (binary) {
-			assertTrue(
-					"Project not binary.",
-					PDECore.BINARY_PROJECT_VALUE
-							.equals(project
-									.getPersistentProperty(PDECore.EXTERNAL_PROJECT_PROPERTY)));
-		} else {
-			assertFalse(
-					"Project is binary.",
-					PDECore.BINARY_PROJECT_VALUE
-							.equals(project
-									.getPersistentProperty(PDECore.EXTERNAL_PROJECT_PROPERTY)));
-
-		}
-	}
-
-	private void verifyModel(String featureId, String projectName)
-			throws CoreException {
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		IFeatureModel[] models = PDECore.getDefault().getFeatureModelManager()
-				.findFeatureModels(featureId);
-		assertTrue("Model not found.", models.length > 0);
-		IFeature feature = models[0].getFeature();
-		assertTrue("Model has no feature.", feature != null);
-		if (feature.getInstallHandler() == null) {
-			assertFalse("Project has Java nature.", root
-					.getProject(projectName).hasNature(JavaCore.NATURE_ID));
-		} else {
-			assertTrue("Project does not have Java nature.", root.getProject(
-					projectName).hasNature(JavaCore.NATURE_ID));
-		}
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/imports/ImportWithLinksTestCase.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/imports/ImportWithLinksTestCase.java
deleted file mode 100644
index e861abf..0000000
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/imports/ImportWithLinksTestCase.java
+++ /dev/null

@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.tests.imports;
-
-import junit.framework.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.ui.tests.*;
-
-public class ImportWithLinksTestCase extends PDETestCase {
-
-	public static Test suite() {
-		return new TestSuite(ImportWithLinksTestCase.class);
-	}
-	
-	public void testImportLinks1() {
-		playScript(Catalog.IMPORT_LINKS_1);
-		try {
-			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-			verifyProject(root.getProject("org.eclipse.core.filebuffers"));
-		} catch (CoreException e) {
-			fail("testImportLinks1:" + e);
-		}
-	}
-
-	public void testImportLinks2() {
-		playScript(Catalog.IMPORT_LINKS_2);
-		try {
-			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-			verifyProject(root.getProject("org.eclipse.osgi"));
-		} catch (CoreException e) {
-			fail("testImportLinks2:" + e);
-		}
-	}
-	
-	public void testImportLinks3() {
-		playScript(Catalog.IMPORT_LINKS_3);
-		try {
-			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-			IProject[] projects = root.getProjects();
-			assertTrue(projects.length > 0);
-			for (int i = 0; i < projects.length; i++) {
-				verifyProject(projects[i]);				
-			}
-		} catch (CoreException e) {
-			fail("testImportLinks3:" + e);
-		}
-	}
-
-	private void verifyProject(IProject project) throws CoreException {
-		assertTrue("Project was not created.", project.exists());
-		assertTrue(WorkspaceModelManager.isBinaryPluginProject(project));
-		if (project.hasNature(JavaCore.NATURE_ID))
-			assertTrue(checkSourceAttached(JavaCore.create(project)));
-	}
-		
-	private boolean checkSourceAttached(IJavaProject jProject) throws CoreException {
-		IPackageFragmentRoot[] roots = jProject.getPackageFragmentRoots();
-		for (int i = 0; i < roots.length; i++) {
-			IClasspathEntry entry = roots[i].getRawClasspathEntry();
-			if (entry.getEntryKind() != IClasspathEntry.CPE_LIBRARY 
-					|| entry.getEntryKind() != IClasspathEntry.CPE_CONTAINER 
-					|| !entry.getPath().equals(new Path(PDECore.CLASSPATH_CONTAINER_ID)))
-				continue;
-			if (roots[i].getSourceAttachmentPath() == null)
-				return false;
-		}
-		return true;
-	}
-	
-
-}

diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/performance/PDEPerformanceTests.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/performance/PDEPerformanceTests.java
deleted file mode 100644
index 8b7d19b..0000000
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/performance/PDEPerformanceTests.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.tests.performance;
-
-import org.eclipse.pde.ui.tests.performance.parts.*;
-
-import junit.framework.*;
-
-public class PDEPerformanceTests {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite("Performance Test Suite for org.eclipse.pde.ui"); //$NON-NLS-1$
-		suite.addTest(OpenManifestEditorPerfTest.suite());
-		suite.addTest(SchemaPerfTest.suite());
-		suite.addTest(InitializeModelsPerfTest.suite());
-		return suite;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/performance/parts/InitializeModelsPerfTest.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/performance/parts/InitializeModelsPerfTest.java
deleted file mode 100644
index 458ca82..0000000
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/performance/parts/InitializeModelsPerfTest.java
+++ /dev/null

@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.tests.performance.parts;
-
-import java.io.File;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.pde.internal.core.ExternalModelManager;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.PDEState;
-import org.eclipse.pde.internal.core.PluginPathFinder;
-import org.eclipse.test.performance.Dimension;
-import org.eclipse.test.performance.PerformanceTestCase;
-
-public class InitializeModelsPerfTest extends PerformanceTestCase {
-
-	public static Test suite() {
-		return new TestSuite(InitializeModelsPerfTest.class);
-	}
-	
-	protected void setUp() throws Exception {
-		super.setUp();
-		deleteContent(new File(PDECore.getDefault().getStateLocation().toOSString()));
-	}
-	
-	public void testModels() throws Exception {
-		tagAsSummary("Initialize Plug-ins (no caching)", Dimension.ELAPSED_PROCESS);
-		String path = ExternalModelManager.getEclipseHome().toOSString();
-		startMeasuring();
-		new PDEState(PluginPathFinder.getPluginPaths(path), false, new NullProgressMonitor());
-		stopMeasuring();
-		commitMeasurements();
-		assertPerformance();
-	}
-	
-	public void testCachedModels() throws Exception {
-		tagAsGlobalSummary("Initialize Plug-ins (with caching)", Dimension.ELAPSED_PROCESS);
-		String path = ExternalModelManager.getEclipseHome().toOSString();
-		new PDEState(PluginPathFinder.getPluginPaths(path), true, new NullProgressMonitor());
-		startMeasuring();
-		new PDEState(PluginPathFinder.getPluginPaths(path), true, new NullProgressMonitor());
-		stopMeasuring();
-		commitMeasurements();
-		assertPerformance();
-	}
-	
-	protected void tearDown() throws Exception {
-		deleteContent(new File(PDECore.getDefault().getStateLocation().toOSString()));
-	}
-	
-	private void deleteContent(File curr) {
-		if (curr.exists()) {
-			if (curr.isDirectory()) {
-				File[] children = curr.listFiles();
-				if (children != null) {
-					for (int i = 0; i < children.length; i++) {
-						deleteContent(children[i]);
-					}
-				}
-			}
-			curr.delete();
-		}
-	}
-
-	
-}

diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/performance/parts/OpenManifestEditorPerfTest.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/performance/parts/OpenManifestEditorPerfTest.java
deleted file mode 100644
index a6a5280..0000000
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/performance/parts/OpenManifestEditorPerfTest.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.tests.performance.parts;
-
-import junit.framework.*;
-
-import org.eclipse.pde.internal.ui.editor.plugin.*;
-import org.eclipse.test.performance.*;
-import org.eclipse.ui.*;
-
-public class OpenManifestEditorPerfTest extends PerformanceTestCase {
-
-	public static Test suite() {
-		return new TestSuite(OpenManifestEditorPerfTest.class);
-	}
-	
-	public void testOpen() throws Exception {
-		tagAsGlobalSummary("Open Plug-in Editor", Dimension.ELAPSED_PROCESS); //$NON-NLS-1$
-		IWorkbenchPage page= PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-
-		for (int i = 0; i < 20; i++) {
-			startMeasuring();
-			ManifestEditor.openPluginEditor("org.eclipse.core.runtime"); //$NON-NLS-1$
-			stopMeasuring();
-			page.closeAllEditors(false);
-		}	
-		commitMeasurements();
-		assertPerformance();
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/performance/parts/SchemaPerfTest.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/performance/parts/SchemaPerfTest.java
deleted file mode 100644
index 09b226d..0000000
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/performance/parts/SchemaPerfTest.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.tests.performance.parts;
-
-import junit.framework.*;
-
-import org.eclipse.pde.core.plugin.IPluginExtensionPoint;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.test.performance.*;
-
-public class SchemaPerfTest extends PerformanceTestCase {
-
-	public static Test suite() {
-		return new TestSuite(SchemaPerfTest.class);
-	}
-	
-	public void testLoadAllSchemas() throws Exception {
-		tagAsSummary("Loading all schemas", Dimension.ELAPSED_PROCESS);
-		IPluginModelBase[] models = PDECore.getDefault().getModelManager().getAllPlugins();
-		startMeasuring();
-		for (int i = 0; i < models.length; i++) {
-			IPluginExtensionPoint[] extPoints = models[i].getPluginBase().getExtensionPoints();
-			for (int j = 0; j < extPoints.length; j++) {
-				PDECore.getDefault().getSchemaRegistry().getSchema(extPoints[j].getFullId());
-			}
-		}
-		stopMeasuring();
-		commitMeasurements();
-		assertPerformance();
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/NewSiteProjectTest.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/NewSiteProjectTest.java
deleted file mode 100644
index f877eac..0000000
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/NewSiteProjectTest.java
+++ /dev/null

@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.tests.wizards;
-
-import java.io.ByteArrayInputStream;
-import java.lang.reflect.InvocationTargetException;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-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.IWorkspaceRoot;
-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.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.pde.internal.PDE;
-import org.eclipse.pde.internal.core.site.WorkspaceSiteModel;
-import org.eclipse.pde.internal.ui.wizards.site.NewSiteProjectCreationOperation;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.progress.IProgressService;
-
-public class NewSiteProjectTest extends TestCase {
-	private static final String EXISTING_PROJECT_NAME = "ExistingSiteProject"; //$NON-NLS-1$
-
-	public static Test suite() {
-		return new TestSuite(NewSiteProjectTest.class);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see junit.framework.TestCase#setUp()
-	 */
-	protected void setUp() throws Exception {
-		super.setUp();
-		if ("testExistingSiteProject".equalsIgnoreCase(getName())) { //$NON-NLS-1$
-			IProject project = ResourcesPlugin.getWorkspace().getRoot()
-					.getProject(EXISTING_PROJECT_NAME);
-			project.create(new NullProgressMonitor());
-			project.open(new NullProgressMonitor());
-			IFile file = project.getFile(new Path("site.xml")); //$NON-NLS-1$
-			String content = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" //$NON-NLS-1$
-					+ "<site>" //$NON-NLS-1$
-					+ "<category-def name=\"new_category_1\" label=\"New Category 1\"/>" //$NON-NLS-1$
-					+ "</site>"; //$NON-NLS-1$
-			ByteArrayInputStream source = new ByteArrayInputStream(content
-					.getBytes("ASCII")); //$NON-NLS-1$
-			if (file.exists())
-				file
-						.setContents(source, true, false,
-								new NullProgressMonitor());
-			else
-				file.create(source, true, new NullProgressMonitor());
-			project.delete(false, true, new NullProgressMonitor());
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see junit.framework.TestCase#tearDown()
-	 */
-	protected void tearDown() throws Exception {
-		IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
-		IProject[] projects = workspaceRoot.getProjects();
-		try {
-			for (int i = 0; i < projects.length; i++) {
-				projects[i].delete(true, new NullProgressMonitor());
-			}
-		} catch (CoreException e) {
-			// do nothing if deletion fails. No need to fail the test.
-		}
-		super.tearDown();
-	}
-
-	private void createSite(IProject project, IPath path, String webLocation)
-			throws InvocationTargetException, InterruptedException {
-		NewSiteProjectCreationOperation createOperation = new NewSiteProjectCreationOperation(
-				Display.getDefault(), project, path, webLocation);
-		IProgressService progressService = PlatformUI.getWorkbench()
-				.getProgressService();
-		progressService.runInUI(progressService, createOperation, null);
-	}
-
-	/**
-	 * @param project
-	 */
-	private void ensureCreated(IProject project) {
-		assertTrue("Project not created.", project.exists()); //$NON-NLS-1$
-		assertTrue("Project not open.", project.isOpen()); //$NON-NLS-1$
-		try {
-			assertTrue("Site nature not added.", project //$NON-NLS-1$
-					.hasNature(PDE.SITE_NATURE));
-		} catch (Exception e) {
-		}
-		assertTrue("site.xml not created.", project //$NON-NLS-1$
-				.exists(new Path("site.xml"))); //$NON-NLS-1$
-		WorkspaceSiteModel model = new WorkspaceSiteModel(project
-				.getFile(new Path("site.xml"))); //$NON-NLS-1$
-		model.load();
-		assertTrue("Model cannot be loaded.", model.isLoaded()); //$NON-NLS-1$
-		assertTrue("Model is not valid.", model.isValid()); //$NON-NLS-1$
-		assertFalse("ISite is null.", model.getSite() == null); //$NON-NLS-1$
-		model.dispose();
-	}
-
-	public void testExistingSiteProject() {
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
-				EXISTING_PROJECT_NAME);
-		IPath path = Platform.getLocation();
-		try {
-			createSite(project, path, null); 
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail("testExistingSiteProject: " + e); //$NON-NLS-1$
-		}
-		ensureCreated(project);
-		WorkspaceSiteModel model = new WorkspaceSiteModel(project
-				.getFile(new Path("site.xml"))); //$NON-NLS-1$
-		model.load();
-		assertTrue("Existig site overwritten.", model.getSite() //$NON-NLS-1$
-				.getCategoryDefinitions().length > 0);
-		model.dispose();
-
-	}
-
-	public void testSiteProject() {
-		String projectName = "SiteProject"; //$NON-NLS-1$
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
-				projectName);
-		IPath path = Platform.getLocation();
-		try {
-			createSite(project, path, null); 
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail("testSiteProject: " + e); //$NON-NLS-1$
-		}
-		ensureCreated(project);
-		assertFalse("index.html should have not been generated.", project //$NON-NLS-1$
-				.exists(new Path("index.html"))); //$NON-NLS-1$
-	}
-
-	public void testSiteProjectWithWeb() {
-		String projectName = "SiteProjectWithWeb"; //$NON-NLS-1$
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
-				projectName);
-		IPath path = Platform.getLocation();
-		try {
-			createSite(project, path, "testWeb"); //$NON-NLS-1$
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail("testSiteProjectWithWeb: " + e); //$NON-NLS-1$
-		}
-		ensureCreated(project);
-		assertTrue("index.html not generated.", project.exists(new Path( //$NON-NLS-1$
-				"index.html"))); //$NON-NLS-1$
-		IFolder webFolder = project.getFolder(new Path("testWeb")); //$NON-NLS-1$
-		assertTrue("Web folder not generated.", webFolder.exists()); //$NON-NLS-1$
-		assertTrue("site.xsl not generated.", webFolder.exists(new Path( //$NON-NLS-1$
-				"site.xsl"))); //$NON-NLS-1$
-		assertTrue("site.css not generated.", webFolder.exists(new Path( //$NON-NLS-1$
-				"site.css"))); //$NON-NLS-1$
-	}
-}

diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/feature/AllNewFeatureProjectTests.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/feature/AllNewFeatureProjectTests.java
deleted file mode 100644
index d14d01e..0000000
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/feature/AllNewFeatureProjectTests.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.tests.wizards.feature;
-
-import junit.framework.*;
-
-public class AllNewFeatureProjectTests {
-	
-	public static Test suite() {
-		TestSuite suite = new TestSuite("Test Suite to test new feature project creation wizards."); //$NON-NLS-1$
-		suite.addTest(SimpleFeatureTestCase.suite());
-		suite.addTest(FeatureWithPluginTestCase.suite());
-		return suite;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/feature/FeatureWithPluginTestCase.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/feature/FeatureWithPluginTestCase.java
deleted file mode 100644
index b2a8d97..0000000
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/feature/FeatureWithPluginTestCase.java
+++ /dev/null

@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.tests.wizards.feature;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.pde.core.plugin.IPluginModel;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.ifeature.IFeature;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.core.ifeature.IFeaturePlugin;
-import org.eclipse.pde.ui.tests.Catalog;
-import org.eclipse.pde.ui.tests.wizards.plugin.NewProjectTest;
-
-public class FeatureWithPluginTestCase extends NewProjectTest {
-
-	private static final String PROJECT_NAME = "com.example.test.feature";
-
-	public static Test suite() {
-		return new TestSuite(FeatureWithPluginTestCase.class);
-	}
-
-	public void testFeatureWithExternalPlugin() {
-		playScript(Catalog.FEATURE_WITH_PLUGIN_1);
-		verifyProjectExistence();
-		verifyFeatureModel("org.eclipse.pde.ui");
-	}
-
-	public void testFeatureWithWorkspacePlugin() {
-		playScript(Catalog.FEATURE_WITH_PLUGIN_2);
-		verifyProjectExistence();
-		verifyFeatureModel("com.example.test.plugin");
-	}
-
-	protected String getProjectName() {
-		return PROJECT_NAME;
-	}
-
-	private void verifyFeatureModel(String refPlugin) {
-		IFeatureModel[] models = PDECore.getDefault().getFeatureModelManager()
-				.findFeatureModels(PROJECT_NAME);
-		assertTrue("Model is not found.", models.length > 0);
-		IFeature feature = models[0].getFeature();
-		assertNotNull("Model's feature is null.", feature);
-		IFeaturePlugin[] plugins = feature.getPlugins();
-		assertTrue("Feature does not contain plug-in " + refPlugin + ".",
-				plugins.length == 1);
-		String pluginId = plugins[0].getId();
-		assertNotNull("Feature plug-in ID is null.", pluginId);
-		assertTrue(refPlugin.equals(pluginId));
-		IPluginModel pluginModel = PDECore.getDefault().getModelManager()
-				.findPluginModel(pluginId);
-		assertNotNull("Model for feature plug-in " + pluginId + " not found ", pluginModel);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/feature/SimpleFeatureTestCase.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/feature/SimpleFeatureTestCase.java
deleted file mode 100644
index 39dc75c..0000000
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/feature/SimpleFeatureTestCase.java
+++ /dev/null

@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.tests.wizards.feature;
-
-import junit.framework.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.ui.PreferenceConstants;
-import org.eclipse.pde.core.build.*;
-import org.eclipse.pde.internal.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.core.build.*;
-import org.eclipse.pde.internal.core.ifeature.IFeature;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.ui.tests.*;
-import org.eclipse.pde.ui.tests.wizards.plugin.NewProjectTest;
-
-public class SimpleFeatureTestCase extends NewProjectTest {
-
-	private static final String PROJECT_NAME = "com.example.test.feature";
-
-	public static Test suite() {
-		return new TestSuite(SimpleFeatureTestCase.class);
-	}
-
-	public void testSimpleFeatureProject() {
-		playScript(Catalog.SIMPLE_FEATURE_1);
-		verifyProjectContent(false);
-	}
-
-	public void testSimpleFeatureWithInstallHandlerProject() {
-		playScript(Catalog.SIMPLE_FEATURE_2);
-		verifyProjectContent(true);
-	}
-
-	private void verifyProjectContent(boolean isJava) {
-		verifyProjectExistence();
-		assertNatures(isJava);
-		verifyFeatureModel(isJava);
-		verifyBuildProperties(isJava);
-	}
-
-	protected String getProjectName() {
-		return PROJECT_NAME;
-	}
-
-	private void assertNatures(boolean isJava) {
-		assertTrue("Feature project does not have a feature nature.",
-				hasNature(PDE.FEATURE_NATURE));
-		assertFalse("Feature project had plugin nature.",
-				hasNature(PDE.PLUGIN_NATURE));
-		if (isJava) {
-			assertTrue("Java Project has no Java nature.",
-					hasNature(JavaCore.NATURE_ID));
-		} else {
-			assertFalse("Simple Project has a Java nature.",
-					hasNature(JavaCore.NATURE_ID));
-		}
-	}
-
-	private void verifyFeatureModel(boolean isJava) {
-		IFeatureModel[] models = PDECore.getDefault().getFeatureModelManager()
-				.findFeatureModels(PROJECT_NAME);
-		assertTrue("Model is not found.", models.length > 0);
-		IFeature feature = models[0].getFeature();
-		assertNotNull("Model's feature is null.", feature);
-		assertEquals(PROJECT_NAME, feature.getId());
-		assertEquals("1.0.1", feature.getVersion());
-		assertEquals("Eclipse.org", feature.getProviderName());
-		assertEquals("Test Feature", feature.getLabel());
-		assertTrue(feature.isValid());
-		assertTrue((feature.getInstallHandler() != null) == isJava);
-	}
-
-	private void verifyBuildProperties(boolean isJava) {
-		IFile buildFile = getProject().getFile("build.properties"); //$NON-NLS-1$
-		assertTrue("Build.properties does not exist.", buildFile.exists());
-
-		IBuildModel model = new WorkspaceBuildModel(buildFile);
-		try {
-			model.load();
-		} catch (CoreException e) {
-			fail("Model cannot be loaded:" + e);
-		}
-
-		IBuild build = model.getBuild();
-		assertEquals(isJava ? 3 : 1, build.getBuildEntries().length);
-		IBuildEntry entry = build.getEntry("bin.includes");
-		assertNotNull(entry);
-		String[] tokens = entry.getTokens();
-		assertEquals(isJava ? 2 : 1, tokens.length);
-		assertEquals(tokens[0], "feature.xml");
-		if (isJava) {
-			assertEquals(tokens[1], "handler.jar");
-
-			entry = build.getEntry("source.handler.jar");
-			assertNotNull(entry);
-			tokens = entry.getTokens();
-			assertEquals(1, tokens.length);
-			String sourceFolder = PreferenceConstants.getPreferenceStore()
-					.getString(PreferenceConstants.SRCBIN_SRCNAME);
-			assertEquals(tokens[0], sourceFolder + "/");
-
-			entry = build.getEntry("output.handler.jar");
-			assertNotNull(entry);
-			tokens = entry.getTokens();
-			assertEquals(1, tokens.length);
-			String buildFolder = PreferenceConstants.getPreferenceStore()
-					.getString(PreferenceConstants.SRCBIN_BINNAME);
-			assertEquals(tokens[0], buildFolder + "/");
-		}
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/plugin/AllNewProjectTests.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/plugin/AllNewProjectTests.java
deleted file mode 100644
index 2bb5d2b..0000000
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/plugin/AllNewProjectTests.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.tests.wizards.plugin;
-
-import junit.framework.*;
-
-public class AllNewProjectTests {
-	
-	public static Test suite() {
-		TestSuite suite = new TestSuite("Test Suite to test the new plug-in project creation wizard."); //$NON-NLS-1$
-		suite.addTest(SimplePluginTestCase.suite());
-		suite.addTest(BasicJavaPluginTestCase.suite());
-		suite.addTest(LibraryPluginTestCase.suite());
-		return suite;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/plugin/BasicJavaPluginTestCase.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/plugin/BasicJavaPluginTestCase.java
deleted file mode 100644
index 94b949b..0000000
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/plugin/BasicJavaPluginTestCase.java
+++ /dev/null

@@ -1,235 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.tests.wizards.plugin;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.pde.core.build.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.core.build.*;
-import org.eclipse.pde.ui.tests.*;
-
-import junit.framework.*;
-
-public class BasicJavaPluginTestCase extends NewProjectTest {
-
-	private static final String PROJECT_NAME = "com.example.xyz";
-
-	public static Test suite() {
-		return new TestSuite(BasicJavaPluginTestCase.class);
-	}
-	
-	public void testMinimalJavaPlugin() {
-		try {
-			playScript(Catalog.BASIC_JAVA_PLUGIN_1);
-			verifyProject(true);
-			verifyPluginModel(null, ".", true);
-			verifyBuildProperties(true, ".", "src", "bin");
-		} catch (CoreException e) {
-			fail("testMinimalJavaPlugin:" + e);
-		}
-	}
-	
-	public void testMinimalJavaPluginWithoutManifest() {
-		try {
-			playScript(Catalog.BASIC_JAVA_PLUGIN_2);
-			verifyProject(false);
-			verifyPluginModel(null, "xyz.jar", false);
-			verifyBuildProperties(false, "xyz.jar", "src", "bin");
-		} catch (CoreException e) {
-			fail("testMinimalJavaPluginWithoutManifest:" + e);
-		}
-	}
-	
-	public void testMultiSegmentSourceFolder() {
-		try {
-			playScript(Catalog.BASIC_JAVA_PLUGIN_3);
-			verifyProject(true, null, "src/abc", "bin");
-			verifyPluginModel(null, ".", true);
-			verifyBuildProperties(true, ".", "src/abc", "bin");
-		} catch (CoreException e) {
-			fail("testMultiSegmentSourceFolder:" + e);
-		}
-	}
-	
-	public void testMultiSegmentOutputFolder() {
-		try {
-			playScript(Catalog.BASIC_JAVA_PLUGIN_4);
-			verifyProject(true, null, "src", "bin/abc");
-			verifyPluginModel(null, ".", true);
-			verifyBuildProperties(true, ".", "src", "bin/abc");
-		} catch (CoreException e) {
-			fail("testMultiSegmentOutputFolder:" + e);
-		}
-	}
-	
-	public void testUIPlugin() {
-		try {
-			playScript(Catalog.BASIC_JAVA_PLUGIN_6);
-			verifyProject(true, "com.example.xyz.XyzPlugin", "src", "bin");
-			verifyPluginModel("com.example.xyz.XyzPlugin", ".", true);
-			verifyBuildProperties(true, ".", "src", "bin");
-			verifyType(true, "com.example.xyz.XyzPlugin");
-		} catch (CoreException e) {
-			fail("testUIPlugin:" + e);
-		}
-	}
-	
-	public void testNonUIPlugin() {
-		try {
-			playScript(Catalog.BASIC_JAVA_PLUGIN_7);
-			verifyProject(true, "com.example.xyz.XyzPlugin", "src", "bin");
-			verifyPluginModel("com.example.xyz.XyzPlugin", ".", true);
-			verifyBuildProperties(true, ".", "src", "bin");
-			verifyType(false, "com.example.xyz.XyzPlugin");
-		} catch (CoreException e) {
-			fail("testNonUIPlugin:" + e);
-		}
-	}
-	
-	public void verifyType(boolean ui, String className) throws CoreException {
-		if (className != null) {
-			IJavaProject jProject = JavaCore.create(getProject());
-			IType type = jProject.findType(className);
-			assertNotNull(type);
-			assertTrue(type.isClass());
-			assertFalse(type.isBinary());
-			if (ui)
-				assertEquals("AbstractUIPlugin", type.getSuperclassName());
-			else
-				assertEquals("Plugin", type.getSuperclassName());
-		}
-
-	}
-
-	protected String getProjectName() {
-		return PROJECT_NAME;
-	}
-	
-	private void verifyProject(boolean isBundle) throws CoreException {
-		verifyProject(isBundle, null, "src", "bin");
-	}
-	
-	private void verifyProject(boolean isBundle, String className, String srcFolder, String outputFolder) throws CoreException {
-		verifyProjectExistence();
-		verifyNatures();
-		verifyManifestFiles(isBundle);
-		verifyClasspath(className, srcFolder, outputFolder);
-	}
-	
-	private void verifyNatures() {
-		assertTrue("Project does not have a PDE nature.", hasNature(PDE.PLUGIN_NATURE));
-		assertTrue("Simple Project has a Java nature.", hasNature(JavaCore.NATURE_ID));
-	}
-	
-	private void verifyManifestFiles(boolean isBundle) {
-		if (isBundle) {
-			assertTrue(getProject().getFile("META-INF/MANIFEST.MF").exists());
-			assertFalse(getProject().getFile("plugin.xml").exists());
-		} else {
-			assertTrue(getProject().getFile("plugin.xml").exists());
-			assertFalse(getProject().getFile("META-INF/MANIFEST.MF").exists());
-		}
-	}
-	
-	private void verifyClasspath(String className, String srcFolder, String outputFolder) throws CoreException {
-		IJavaProject jProject = JavaCore.create(getProject());
-		IPath expected = new Path(getProjectName()).append(outputFolder).makeAbsolute();
-		assertEquals(expected, jProject.getOutputLocation());
-		
-		IClasspathEntry[] entries = jProject.getRawClasspath();
-		assertEquals(3, entries.length);
-		
-		// verify source folder
-		IClasspathEntry entry = entries[0];
-		assertEquals(IClasspathEntry.CPE_SOURCE, entry.getEntryKind());
-		assertEquals(new Path(getProjectName()).append(srcFolder).makeAbsolute(), entry.getPath());
-		
-		// verify JRE container
-		entry = entries[1];
-		assertEquals(IClasspathEntry.CPE_CONTAINER, entry.getEntryKind());
-		assertEquals(new Path(JavaRuntime.JRE_CONTAINER), entry.getPath());
-		
-		// verify PDE container 
-		entry = entries[2];
-		assertEquals(IClasspathEntry.CPE_CONTAINER, entry.getEntryKind());
-		assertEquals(new Path(PDECore.CLASSPATH_CONTAINER_ID), entry.getPath());
-		
-		IPackageFragmentRoot[] roots = jProject.findPackageFragmentRoots(entry);
-		assertEquals(className == null, roots.length == 0);
-		
-		// verify no errors
-		assertEquals(0, getProject().findMarkers(null, true, IResource.DEPTH_INFINITE).length);
-
-	}
-	
-	private void verifyPluginModel(String className, String libraryName, boolean bundle) {
-		IPluginModelBase model = PDECore.getDefault().getModelManager().findModel(getProject());
-		assertTrue("Model is not found.", model != null);
-		IPlugin plugin = (IPlugin)model.getPluginBase();
-		assertEquals("com.example.xyz", plugin.getId());
-		assertEquals("1.0.0", plugin.getVersion());
-		assertEquals("EXAMPLE", plugin.getProviderName());
-		assertEquals("Xyz Plug-in", plugin.getName());
-		if (className == null)
-			assertNull(plugin.getClassName());
-		else
-			assertEquals(className, plugin.getClassName());
-		assertEquals(bundle ? 0 : 1, plugin.getLibraries().length);
-		if (!bundle)
-			assertEquals(libraryName, plugin.getLibraries()[0].getName());
-		assertEquals(0, plugin.getExtensionPoints().length);
-		assertEquals(0, plugin.getExtensions().length);
-	}
-
-	private void verifyBuildProperties(boolean isBundle, String libraryName, String srcFolder, String outputFolder) {
-		IFile buildFile = getProject().getFile("build.properties"); //$NON-NLS-1$
-		assertTrue("Build.properties does not exist.", buildFile.exists());
-		
-		IBuildModel model =  new WorkspaceBuildModel(buildFile);
-		try {
-			model.load();
-		} catch (CoreException e) {
-			fail("Model cannot be loaded:" + e);
-		}
-		
-		IBuild build = model.getBuild();
-		assertEquals(3, build.getBuildEntries().length);
-		
-		// verify bin.includes
-		IBuildEntry entry = build.getEntry("bin.includes");
-		assertNotNull(entry);		
-		String[] tokens = entry.getTokens();
-		assertEquals(2, tokens.length);
-		assertEquals(isBundle ? "META-INF/" : "plugin.xml", tokens[0]);
-		if (!libraryName.equals("."))
-			assertEquals(libraryName, tokens[1]);
-		
-		// verify source.<libraryName> and output.<libraryName>
-		entry = build.getEntry("source." + libraryName);
-		assertNotNull(entry);		
-		tokens = entry.getTokens();
-		assertEquals(1, tokens.length);
-		assertEquals(srcFolder + "/", tokens[0]);
-		
-		// verify output.<libraryName> and output.<libraryName>
-		entry = build.getEntry("output." + libraryName);
-		assertNotNull(entry);		
-		tokens = entry.getTokens();
-		assertEquals(1, tokens.length);
-		assertEquals(outputFolder + "/", tokens[0]);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/plugin/LibraryPluginTestCase.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/plugin/LibraryPluginTestCase.java
deleted file mode 100644
index bed2e91..0000000
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/plugin/LibraryPluginTestCase.java
+++ /dev/null

@@ -1,207 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.tests.wizards.plugin;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.pde.core.build.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.core.build.*;
-import org.eclipse.pde.ui.tests.*;
-
-import junit.framework.*;
-
-public class LibraryPluginTestCase extends NewProjectTest {
-
-	private static final String PROJECT_NAME = "com.example.xyz";
-
-	public static Test suite() {
-		return new TestSuite(LibraryPluginTestCase.class);
-	}
-	
-	public void testLibrariesFromWorkspacePlugin() {
-		try {
-			playScript(Catalog.LIBRARY_PLUGIN_1);
-			verifyProject(false, "pdeuiant.jar", "bin");
-			verifyPluginModel(null, "pdeuiant.jar");
-			verifyBuildProperties(false, false, "pdeuiant.jar");
-		} catch (CoreException e) {
-			fail("testLibrariesFromWorkspacePlugin:" + e);
-		}
-	}
-	
-	public void testLibrariesFromWorkspacePluginWithManifest() {
-		try {
-			playScript(Catalog.LIBRARY_PLUGIN_2);
-			verifyProject(true, "pdeuiant.jar", "bin");
-			verifyPluginModel(null, "pdeuiant.jar");
-			verifyBuildProperties(true, false, "pdeuiant.jar");
-		} catch (CoreException e) {
-			fail("testLibrariesFromWorkspacePluginWithManifest:" + e);
-		}
-	}
-	
-	public void testUnzipFromWorkspacePlugin() {
-		try {
-			playScript(Catalog.LIBRARY_PLUGIN_3);
-			verifyProject(false, ".", "bin");
-			verifyPluginModel(null, ".");
-			verifyBuildProperties(false, true, ".");
-		} catch (CoreException e) {
-			fail("testLibrariesFromWorkspacePlugin:" + e);
-		}
-	}
-	
-	public void testUnzipFromWorkspacePluginWithManifest() {
-		try {
-			playScript(Catalog.LIBRARY_PLUGIN_4);
-			verifyProject(true, ".", "bin");
-			verifyPluginModel(null, ".");
-			verifyBuildProperties(true, true, ".");
-		} catch (CoreException e) {
-			fail("testLibrariesFromWorkspacePluginWithManifest:" + e);
-		}
-	}
-	
-	public void verifyType(boolean ui, String className) throws CoreException {
-		if (className != null) {
-			IJavaProject jProject = JavaCore.create(getProject());
-			IType type = jProject.findType(className);
-			assertNotNull(type);
-			assertTrue(type.isClass());
-			assertFalse(type.isBinary());
-			if (ui)
-				assertEquals("AbstractUIPlugin", type.getSuperclassName());
-			else
-				assertEquals("Plugin", type.getSuperclassName());
-		}
-
-	}
-
-	protected String getProjectName() {
-		return PROJECT_NAME;
-	}
-	
-	private void verifyProject(boolean isBundle, String libName, String outputFolder) throws CoreException {
-		verifyProjectExistence();
-		verifyNatures();
-		verifyManifestFiles(isBundle);
-		verifyClasspath(libName, outputFolder);
-	}
-	
-	private void verifyNatures() {
-		assertTrue("Project does not have a PDE nature.", hasNature(PDE.PLUGIN_NATURE));
-		assertTrue("Simple Project has a Java nature.", hasNature(JavaCore.NATURE_ID));
-	}
-	
-	private void verifyManifestFiles(boolean isBundle) {
-		if (isBundle) {
-			assertTrue(getProject().getFile("META-INF/MANIFEST.MF").exists());
-			assertFalse(getProject().getFile("plugin.xml").exists());
-		} else {
-			assertTrue(getProject().getFile("plugin.xml").exists());
-			assertFalse(getProject().getFile("META-INF/MANIFEST.MF").exists());
-		}
-	}
-	
-	private void verifyClasspath(String libName, String outputFolder) throws CoreException {
-		IJavaProject jProject = JavaCore.create(getProject());
-		IPath expected = new Path(getProjectName()).append(outputFolder).makeAbsolute();
-		assertEquals(expected, jProject.getOutputLocation());
-		
-		IClasspathEntry[] entries = jProject.getRawClasspath();
-		assertEquals(3, entries.length);
-		
-		// verify library
-		IClasspathEntry entry = entries[0];
-		assertEquals(IClasspathEntry.CPE_LIBRARY, entry.getEntryKind());
-		assertEquals(new Path(getProjectName()).append(libName).makeAbsolute(), entry.getPath());
-		
-		// verify JRE container
-		entry = entries[1];
-		assertEquals(IClasspathEntry.CPE_CONTAINER, entry.getEntryKind());
-		assertEquals(new Path(JavaRuntime.JRE_CONTAINER), entry.getPath());
-		
-		// verify PDE container 
-		entry = entries[2];
-		assertEquals(IClasspathEntry.CPE_CONTAINER, entry.getEntryKind());
-		assertEquals(new Path(PDECore.CLASSPATH_CONTAINER_ID), entry.getPath());
-		
-		// verify no errors
-		assertEquals(0, getProject().findMarkers(null, true, IResource.DEPTH_INFINITE).length);
-
-	}
-	
-	private void verifyPluginModel(String className, String libraryName) {
-		IPluginModelBase model = PDECore.getDefault().getModelManager().findModel(getProject());
-		assertTrue("Model is not found.", model != null);
-		IPlugin plugin = (IPlugin)model.getPluginBase();
-		assertEquals("com.example.xyz", plugin.getId());
-		assertEquals("1.0.1", plugin.getVersion());
-		assertEquals("Eclipse.org", plugin.getProviderName());
-		assertEquals("Xyz Plug-in", plugin.getName());
-		if (className == null)
-			assertNull(plugin.getClassName());
-		else
-			assertEquals(className, plugin.getClassName());
-		assertEquals(1, plugin.getLibraries().length);
-		assertEquals(libraryName, plugin.getLibraries()[0].getName());
-		assertEquals(0, plugin.getExtensionPoints().length);
-		assertEquals(0, plugin.getExtensions().length);
-	}
-
-	private void verifyBuildProperties(boolean isBundle, boolean isUnzip, String libraryName) {
-		IFile buildFile = getProject().getFile("build.properties"); //$NON-NLS-1$
-		assertTrue("Build.properties does not exist.", buildFile.exists());
-		
-		IBuildModel model =  new WorkspaceBuildModel(buildFile);
-		try {
-			model.load();
-		} catch (CoreException e) {
-			fail("Model cannot be loaded:" + e);
-		}
-		
-		IBuild build = model.getBuild();
-		assertEquals(isUnzip ? 3 : 1, build.getBuildEntries().length);
-		
-		// verify bin.includes
-		IBuildEntry entry = build.getEntry("bin.includes");
-		assertNotNull(entry);		
-		String[] tokens = entry.getTokens();
-		assertEquals(2, tokens.length);
-		assertEquals(isBundle ? "META-INF/" : "plugin.xml", tokens[0]);
-		if (libraryName.equals("."))
-			assertEquals("org/", tokens[1]);
-		else
-			assertEquals(libraryName, tokens[1]);
-		
-		if (isUnzip) {
-			entry = build.getEntry("source..");
-			assertNotNull(entry);
-			tokens = entry.getTokens();
-			assertEquals(1, tokens.length);
-			assertEquals(".", tokens[0]);
-
-			entry = build.getEntry("output..");
-			assertNotNull(entry);
-			tokens = entry.getTokens();
-			assertEquals(1, tokens.length);
-			assertEquals(".", tokens[0]);
-			
-		}
-		
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/plugin/NewProjectTest.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/plugin/NewProjectTest.java
deleted file mode 100644
index 9fb4225..0000000
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/plugin/NewProjectTest.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.tests.wizards.plugin;
-
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.pde.ui.tests.*;
-
-public abstract class NewProjectTest extends PDETestCase {
-	
-	protected void verifyProjectExistence() {
-		assertTrue("Project does not exist", getProject().exists());
-	}
-	
-	protected IProject getProject() {
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		return root.getProject(getProjectName());	
-	}
-	
-	protected boolean hasNature(String nature) {
-		boolean hasNature = false;
-		try {
-			hasNature = getProject().hasNature(nature);
-		} catch (CoreException e) {
-		}
-		return hasNature;
-	}
-	
-	protected abstract String getProjectName();
-
-
-}

diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/plugin/SimplePluginTestCase.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/plugin/SimplePluginTestCase.java
deleted file mode 100644
index 0743cda..0000000
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/wizards/plugin/SimplePluginTestCase.java
+++ /dev/null

@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.tests.wizards.plugin;
-
-import junit.framework.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.pde.core.build.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.core.build.*;
-import org.eclipse.pde.ui.tests.*;
-
-public class SimplePluginTestCase extends NewProjectTest {
-	
-	private static final String PROJECT_NAME = "com.example.simple";
-
-	public static Test suite() {
-		return new TestSuite(SimplePluginTestCase.class);
-	}
-
-	public void testSimplePluginProject() {
-		playScript(Catalog.SIMPLE_PLUGIN_1);
-		verifyProjectContent(true);
-	}
-	
-	public void testSimplePluginWithoutManifest() {
-		playScript(Catalog.SIMPLE_PLUGIN_2);
-		verifyProjectContent(false);
-	}
-	
-	private void verifyProjectContent(boolean isBundle) {
-		verifyProjectExistence();
-		verifyNatures();
-		verifyManifestFiles(isBundle);
-		verifyPluginModel();
-		verifyBuildProperties(isBundle);			
-	}
-	
-	protected String getProjectName() {
-		return PROJECT_NAME;
-	}
-	
-	private void verifyManifestFiles(boolean isBundle) {
-		if (isBundle) {
-			assertTrue(getProject().getFile("META-INF/MANIFEST.MF").exists());
-			assertFalse(getProject().getFile("plugin.xml").exists());
-		} else {
-			assertTrue(getProject().getFile("plugin.xml").exists());
-			assertFalse(getProject().getFile("META-INF/MANIFEST.MF").exists());
-		}
-	}
-	
-	private void verifyNatures() {
-		assertTrue("Project does not have a PDE nature.", hasNature(PDE.PLUGIN_NATURE));
-		assertFalse("Simple Project has a Java nature.", hasNature(JavaCore.NATURE_ID));
-	}
-
-	private void verifyPluginModel() {
-		IPluginModelBase model = PDECore.getDefault().getModelManager().findModel(getProject());
-		assertTrue("Model is not found.", model != null);
-		IPlugin plugin = (IPlugin)model.getPluginBase();
-		assertEquals("com.example.simple", plugin.getId());
-		assertEquals("1.0.0", plugin.getVersion());
-		assertEquals("EXAMPLE", plugin.getProviderName());
-		assertEquals("Simple Plug-in", plugin.getName());
-		assertNull(plugin.getClassName());
-		assertEquals(0, plugin.getLibraries().length);
-		assertEquals(0, plugin.getExtensionPoints().length);
-		assertEquals(0, plugin.getExtensions().length);
-	}
-
-	private void verifyBuildProperties(boolean isBundle) {
-		IFile buildFile = getProject().getFile("build.properties"); //$NON-NLS-1$
-		assertTrue("Build.properties does not exist.", buildFile.exists());
-		
-		IBuildModel model =  new WorkspaceBuildModel(buildFile);
-		try {
-			model.load();
-		} catch (CoreException e) {
-			fail("Model cannot be loaded:" + e);
-		}
-		
-		IBuild build = model.getBuild();
-		assertEquals(1, build.getBuildEntries().length);
-		IBuildEntry entry = build.getEntry("bin.includes");
-		assertNotNull(entry);
-		String[] tokens = entry.getTokens();
-		assertEquals(1, tokens.length);
-		assertEquals(isBundle ? "META-INF/" : "plugin.xml", tokens[0]);
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui.tests/test.xml b/ui/org.eclipse.pde.ui.tests/test.xml
deleted file mode 100644
index a42ed4d..0000000
--- a/ui/org.eclipse.pde.ui.tests/test.xml
+++ /dev/null

@@ -1,68 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-  <!-- The property ${eclipse-home} should be passed into this script -->
-
-  <!-- sets the properties eclipse-home, and library-file -->
-  <property name="eclipse-home" value="${basedir}/../.."/>
-  <property name="plugin-name" value="org.eclipse.pde.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="location1" value="${eclipse-home}/pde_sniff_folder"/>
-    <delete dir="${location1}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${location1}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.pde.ui.tests.AllPDETests"/>
-    </ant>
-
-  </target>
-
-  <!-- This target holds code to cleanup the testing environment after the tests -->
-  <!-- have been run. You can use this to delete temporary files that are 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 defines the performance tests that need to be run. -->
-	<target name="performance-suite">
-	  <property name="your-performance-folder" value="${eclipse-home}/pde_performance_folder"/>
-	  <delete dir="${your-performance-folder}" quiet="true"/>
-	  <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-	    <property name="data-dir" value="${your-performance-folder}"/>
-	    <property name="plugin-name" value="${plugin-name}"/>
-	    <property name="classname" value="org.eclipse.pde.ui.tests.performance.PDEPerformanceTests"/>
-	  </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/ui/org.eclipse.pde.ui/.classpath b/ui/org.eclipse.pde.ui/.classpath
deleted file mode 100644
index e90595d..0000000
--- a/ui/org.eclipse.pde.ui/.classpath
+++ /dev/null

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

-<classpath>

-	<classpathentry kind="src" path="src">

-		<attributes>

-		</attributes>

-	</classpathentry>

-	<classpathentry output="binary" kind="src" path="src_ant">

-		<attributes>

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="src" path="src_Forms">

-		<attributes>

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="src" path="src_samples">

-		<attributes>

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">

-		<attributes>

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">

-		<attributes>

-		</attributes>

-	</classpathentry>

-	<classpathentry kind="output" path="bin"/>

-</classpath>


diff --git a/ui/org.eclipse.pde.ui/.cvsignore b/ui/org.eclipse.pde.ui/.cvsignore
deleted file mode 100644
index 892aa1a..0000000
--- a/ui/org.eclipse.pde.ui/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-bin
-binary
-build.xml

diff --git a/ui/org.eclipse.pde.ui/.project b/ui/org.eclipse.pde.ui/.project
deleted file mode 100644
index 8835712..0000000
--- a/ui/org.eclipse.pde.ui/.project
+++ /dev/null

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

-<projectDescription>

-	<name>org.eclipse.pde.ui</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/ui/org.eclipse.pde.ui/.settings/org.eclipse.pde.core.prefs b/ui/org.eclipse.pde.ui/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index 0c6933f..0000000
--- a/ui/org.eclipse.pde.ui/.settings/org.eclipse.pde.core.prefs
+++ /dev/null

@@ -1,3 +0,0 @@
-#Wed Apr 13 23:35:06 EDT 2005
-eclipse.preferences.version=1
-selfhosting.binExcludes=/org.eclipse.pde.ui/binary

diff --git a/ui/org.eclipse.pde.ui/META-INF/MANIFEST.MF b/ui/org.eclipse.pde.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 66828c3..0000000
--- a/ui/org.eclipse.pde.ui/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,79 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %name
-Bundle-SymbolicName: org.eclipse.pde.ui; singleton:=true
-Bundle-Version: 3.1.0
-Bundle-Activator: org.eclipse.pde.internal.ui.PDEPlugin
-Bundle-Vendor: %provider-name
-Bundle-Localization: plugin
-Export-Package: org.eclipse.pde.internal.ui;x-internal:=true,
- org.eclipse.pde.internal.ui.build;x-internal:=true,
- org.eclipse.pde.internal.ui.editor;x-internal:=true,
- org.eclipse.pde.internal.ui.editor.build;x-internal:=true,
- org.eclipse.pde.internal.ui.editor.context;x-internal:=true,
- org.eclipse.pde.internal.ui.editor.feature;x-internal:=true,
- org.eclipse.pde.internal.ui.editor.plugin;x-internal:=true,
- org.eclipse.pde.internal.ui.editor.plugin.rows;x-internal:=true,
- org.eclipse.pde.internal.ui.editor.product;x-internal:=true,
- org.eclipse.pde.internal.ui.editor.schema;x-internal:=true,
- org.eclipse.pde.internal.ui.editor.site;x-internal:=true,
- org.eclipse.pde.internal.ui.editor.text;x-internal:=true,
- org.eclipse.pde.internal.ui.elements;x-internal:=true,
- org.eclipse.pde.internal.ui.launcher;x-internal:=true,
- org.eclipse.pde.internal.ui.model;x-internal:=true,
- org.eclipse.pde.internal.ui.model.build;x-internal:=true,
- org.eclipse.pde.internal.ui.model.bundle;x-internal:=true,
- org.eclipse.pde.internal.ui.model.plugin;x-internal:=true,
- org.eclipse.pde.internal.ui.parts;x-internal:=true,
- org.eclipse.pde.internal.ui.preferences;x-internal:=true,
- org.eclipse.pde.internal.ui.properties;x-internal:=true,
- org.eclipse.pde.internal.ui.refactoring;x-internal:=true,
- org.eclipse.pde.internal.ui.search;x-internal:=true,
- org.eclipse.pde.internal.ui.search.dependencies;x-internal:=true,
- org.eclipse.pde.internal.ui.util;x-internal:=true,
- org.eclipse.pde.internal.ui.view;x-internal:=true,
- org.eclipse.pde.internal.ui.wizards;x-internal:=true,
- org.eclipse.pde.internal.ui.wizards.exports;x-internal:=true,
- org.eclipse.pde.internal.ui.wizards.extension;x-internal:=true,
- org.eclipse.pde.internal.ui.wizards.feature;x-internal:=true,
- org.eclipse.pde.internal.ui.wizards.imports;x-internal:=true,
- org.eclipse.pde.internal.ui.wizards.plugin;x-internal:=true,
- org.eclipse.pde.internal.ui.wizards.product;x-internal:=true,
- org.eclipse.pde.internal.ui.wizards.site;x-internal:=true,
- org.eclipse.pde.internal.ui.wizards.templates;x-internal:=true,
- org.eclipse.pde.internal.ui.wizards.tools;x-internal:=true,
- org.eclipse.pde.ui,
- org.eclipse.pde.ui.internal.samples;x-internal:=true,
- org.eclipse.pde.ui.launcher,
- org.eclipse.pde.ui.templates
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.ui.ide,
- org.eclipse.ui.views,
- org.eclipse.jface.text,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.editors,
- org.eclipse.ant.core,
- org.eclipse.core.resources,
- org.eclipse.debug.core,
- org.eclipse.debug.ui,
- org.eclipse.jdt.core,
- org.eclipse.jdt.debug.ui,
- org.eclipse.jdt.launching,
- org.eclipse.jdt.ui,
- org.eclipse.pde,
- org.eclipse.pde.build,
- org.eclipse.search,
- org.eclipse.team.core,
- org.eclipse.ui,
- org.eclipse.update.core,
- org.eclipse.ui.forms,
- org.eclipse.ant.ui,
- org.eclipse.jdt.junit,
- org.eclipse.ui.intro,
- org.eclipse.ui.cheatsheets,
- org.eclipse.update.configurator,
- org.eclipse.help.base,
- org.eclipse.pde.runtime,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.core.variables
-Eclipse-LazyStart: true

diff --git a/ui/org.eclipse.pde.ui/about.html b/ui/org.eclipse.pde.ui/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/ui/org.eclipse.pde.ui/about.html
+++ /dev/null

@@ -1,22 +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>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation 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
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/build.properties b/ui/org.eclipse.pde.ui/build.properties
deleted file mode 100644
index 94c3d4d..0000000
--- a/ui/org.eclipse.pde.ui/build.properties
+++ /dev/null

@@ -1,31 +0,0 @@
-###############################################################################

-# Copyright (c) 2003, 2005 IBM Corporation and others.

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#     IBM Corporation - initial API and implementation

-###############################################################################

-source.pdeuiant.jar = src_ant/

-bin.includes = plugin.properties,\

-               icons/,\

-               .,\

-               pdeuiant.jar,\

-               plugin.xml,\

-               about.html,\

-               templates/,\

-               templates_3.0/,\

-               templates_3.1/,\

-               META-INF/,\

-               macosx/

-jars.compile.order = .,\

-                     pdeuiant.jar

-src.includes = about.html,\

-               schema/

-source.. = src/,\

-                   src_Forms/,\

-                   src_samples/

-jars.extra.classpath = platform:/plugin/org.apache.ant/lib/ant.jar

-output.. = bin/


diff --git a/ui/org.eclipse.pde.ui/icons/dlcl16/add_att.gif b/ui/org.eclipse.pde.ui/icons/dlcl16/add_att.gif
deleted file mode 100644
index dfbf68f..0000000
--- a/ui/org.eclipse.pde.ui/icons/dlcl16/add_att.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dlcl16/alphab_sort_co.gif b/ui/org.eclipse.pde.ui/icons/dlcl16/alphab_sort_co.gif
deleted file mode 100644
index 0169b42..0000000
--- a/ui/org.eclipse.pde.ui/icons/dlcl16/alphab_sort_co.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dlcl16/ch_callees.gif b/ui/org.eclipse.pde.ui/icons/dlcl16/ch_callees.gif
deleted file mode 100644
index 4e01f24..0000000
--- a/ui/org.eclipse.pde.ui/icons/dlcl16/ch_callees.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dlcl16/ch_callers.gif b/ui/org.eclipse.pde.ui/icons/dlcl16/ch_callers.gif
deleted file mode 100644
index 4091cac..0000000
--- a/ui/org.eclipse.pde.ui/icons/dlcl16/ch_callers.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dlcl16/clear.gif b/ui/org.eclipse.pde.ui/icons/dlcl16/clear.gif
deleted file mode 100644
index 6775edf..0000000
--- a/ui/org.eclipse.pde.ui/icons/dlcl16/clear.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dlcl16/clone_att.gif b/ui/org.eclipse.pde.ui/icons/dlcl16/clone_att.gif
deleted file mode 100644
index c57b60a..0000000
--- a/ui/org.eclipse.pde.ui/icons/dlcl16/clone_att.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dlcl16/clone_el.gif b/ui/org.eclipse.pde.ui/icons/dlcl16/clone_el.gif
deleted file mode 100644
index 52f498d..0000000
--- a/ui/org.eclipse.pde.ui/icons/dlcl16/clone_el.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dlcl16/collapseall.gif b/ui/org.eclipse.pde.ui/icons/dlcl16/collapseall.gif
deleted file mode 100644
index 7dc0de5..0000000
--- a/ui/org.eclipse.pde.ui/icons/dlcl16/collapseall.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dlcl16/dep_loop.gif b/ui/org.eclipse.pde.ui/icons/dlcl16/dep_loop.gif
deleted file mode 100644
index 892bc61..0000000
--- a/ui/org.eclipse.pde.ui/icons/dlcl16/dep_loop.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dlcl16/find_obj.gif b/ui/org.eclipse.pde.ui/icons/dlcl16/find_obj.gif
deleted file mode 100644
index f246a63..0000000
--- a/ui/org.eclipse.pde.ui/icons/dlcl16/find_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dlcl16/flatLayout.gif b/ui/org.eclipse.pde.ui/icons/dlcl16/flatLayout.gif
deleted file mode 100644
index a19548d..0000000
--- a/ui/org.eclipse.pde.ui/icons/dlcl16/flatLayout.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dlcl16/full_hierarchy.gif b/ui/org.eclipse.pde.ui/icons/dlcl16/full_hierarchy.gif
deleted file mode 100644
index dff027f..0000000
--- a/ui/org.eclipse.pde.ui/icons/dlcl16/full_hierarchy.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dlcl16/generate_class.gif b/ui/org.eclipse.pde.ui/icons/dlcl16/generate_class.gif
deleted file mode 100644
index 21a24b3..0000000
--- a/ui/org.eclipse.pde.ui/icons/dlcl16/generate_class.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dlcl16/goto_obj.gif b/ui/org.eclipse.pde.ui/icons/dlcl16/goto_obj.gif
deleted file mode 100644
index 4957126..0000000
--- a/ui/org.eclipse.pde.ui/icons/dlcl16/goto_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dlcl16/hierarchicalLayout.gif b/ui/org.eclipse.pde.ui/icons/dlcl16/hierarchicalLayout.gif
deleted file mode 100644
index 8e807e6..0000000
--- a/ui/org.eclipse.pde.ui/icons/dlcl16/hierarchicalLayout.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dlcl16/history_list.gif b/ui/org.eclipse.pde.ui/icons/dlcl16/history_list.gif
deleted file mode 100644
index 131063c..0000000
--- a/ui/org.eclipse.pde.ui/icons/dlcl16/history_list.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dlcl16/maximize.gif b/ui/org.eclipse.pde.ui/icons/dlcl16/maximize.gif
deleted file mode 100644
index 1da8aea..0000000
--- a/ui/org.eclipse.pde.ui/icons/dlcl16/maximize.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dlcl16/properties.gif b/ui/org.eclipse.pde.ui/icons/dlcl16/properties.gif
deleted file mode 100644
index ec394d6..0000000
--- a/ui/org.eclipse.pde.ui/icons/dlcl16/properties.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dlcl16/refresh.gif b/ui/org.eclipse.pde.ui/icons/dlcl16/refresh.gif
deleted file mode 100644
index 6eafa48..0000000
--- a/ui/org.eclipse.pde.ui/icons/dlcl16/refresh.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dlcl16/remove_att.gif b/ui/org.eclipse.pde.ui/icons/dlcl16/remove_att.gif
deleted file mode 100644
index 559e462..0000000
--- a/ui/org.eclipse.pde.ui/icons/dlcl16/remove_att.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dlcl16/restore.gif b/ui/org.eclipse.pde.ui/icons/dlcl16/restore.gif
deleted file mode 100644
index e69d461..0000000
--- a/ui/org.eclipse.pde.ui/icons/dlcl16/restore.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dlcl16/restore_log.gif b/ui/org.eclipse.pde.ui/icons/dlcl16/restore_log.gif
deleted file mode 100644
index ab62179..0000000
--- a/ui/org.eclipse.pde.ui/icons/dlcl16/restore_log.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dlcl16/search_sortmatch.gif b/ui/org.eclipse.pde.ui/icons/dlcl16/search_sortmatch.gif
deleted file mode 100644
index 8a107ae..0000000
--- a/ui/org.eclipse.pde.ui/icons/dlcl16/search_sortmatch.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dlcl16/synced.gif b/ui/org.eclipse.pde.ui/icons/dlcl16/synced.gif
deleted file mode 100644
index 4f6e43a..0000000
--- a/ui/org.eclipse.pde.ui/icons/dlcl16/synced.gif
+++ /dev/null
Binary files differ

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

diff --git a/ui/org.eclipse.pde.ui/icons/dlcl16/th_vertical.gif b/ui/org.eclipse.pde.ui/icons/dlcl16/th_vertical.gif
deleted file mode 100644
index a404f8d..0000000
--- a/ui/org.eclipse.pde.ui/icons/dlcl16/th_vertical.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dtool16/convjpprj_wiz.gif b/ui/org.eclipse.pde.ui/icons/dtool16/convjpprj_wiz.gif
deleted file mode 100644
index 001fd66..0000000
--- a/ui/org.eclipse.pde.ui/icons/dtool16/convjpprj_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dtool16/defbcon_wiz.gif b/ui/org.eclipse.pde.ui/icons/dtool16/defbcon_wiz.gif
deleted file mode 100644
index 622bb27..0000000
--- a/ui/org.eclipse.pde.ui/icons/dtool16/defbcon_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dtool16/defcon_wiz.gif b/ui/org.eclipse.pde.ui/icons/dtool16/defcon_wiz.gif
deleted file mode 100644
index 0e8d52e..0000000
--- a/ui/org.eclipse.pde.ui/icons/dtool16/defcon_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dtool16/eclipse_launcher.gif b/ui/org.eclipse.pde.ui/icons/dtool16/eclipse_launcher.gif
deleted file mode 100644
index 2872b65..0000000
--- a/ui/org.eclipse.pde.ui/icons/dtool16/eclipse_launcher.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dtool16/eclipse_launcher_wiz.gif b/ui/org.eclipse.pde.ui/icons/dtool16/eclipse_launcher_wiz.gif
deleted file mode 100644
index 18aac88..0000000
--- a/ui/org.eclipse.pde.ui/icons/dtool16/eclipse_launcher_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dtool16/exp_deployfeat.gif b/ui/org.eclipse.pde.ui/icons/dtool16/exp_deployfeat.gif
deleted file mode 100644
index 543687f..0000000
--- a/ui/org.eclipse.pde.ui/icons/dtool16/exp_deployfeat.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dtool16/exp_deployplug.gif b/ui/org.eclipse.pde.ui/icons/dtool16/exp_deployplug.gif
deleted file mode 100644
index dd62afe..0000000
--- a/ui/org.eclipse.pde.ui/icons/dtool16/exp_deployplug.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dtool16/exp_product.gif b/ui/org.eclipse.pde.ui/icons/dtool16/exp_product.gif
deleted file mode 100644
index 14d832c..0000000
--- a/ui/org.eclipse.pde.ui/icons/dtool16/exp_product.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dtool16/imp_extfeat.gif b/ui/org.eclipse.pde.ui/icons/dtool16/imp_extfeat.gif
deleted file mode 100644
index 73881e7..0000000
--- a/ui/org.eclipse.pde.ui/icons/dtool16/imp_extfeat.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dtool16/imp_extplug.gif b/ui/org.eclipse.pde.ui/icons/dtool16/imp_extplug.gif
deleted file mode 100644
index 64e49a1..0000000
--- a/ui/org.eclipse.pde.ui/icons/dtool16/imp_extplug.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dtool16/jarToPlugin.gif b/ui/org.eclipse.pde.ui/icons/dtool16/jarToPlugin.gif
deleted file mode 100644
index be58b2f..0000000
--- a/ui/org.eclipse.pde.ui/icons/dtool16/jarToPlugin.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dtool16/newefix_wiz.gif b/ui/org.eclipse.pde.ui/icons/dtool16/newefix_wiz.gif
deleted file mode 100644
index ea2cd7c..0000000
--- a/ui/org.eclipse.pde.ui/icons/dtool16/newefix_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dtool16/newex_wiz.gif b/ui/org.eclipse.pde.ui/icons/dtool16/newex_wiz.gif
deleted file mode 100644
index 417ea0b..0000000
--- a/ui/org.eclipse.pde.ui/icons/dtool16/newex_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dtool16/newexp_wiz.gif b/ui/org.eclipse.pde.ui/icons/dtool16/newexp_wiz.gif
deleted file mode 100644
index d502869..0000000
--- a/ui/org.eclipse.pde.ui/icons/dtool16/newexp_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dtool16/newexprj_wiz.gif b/ui/org.eclipse.pde.ui/icons/dtool16/newexprj_wiz.gif
deleted file mode 100644
index 4ad5db6..0000000
--- a/ui/org.eclipse.pde.ui/icons/dtool16/newexprj_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dtool16/newfprj_wiz.gif b/ui/org.eclipse.pde.ui/icons/dtool16/newfprj_wiz.gif
deleted file mode 100644
index d3aea41..0000000
--- a/ui/org.eclipse.pde.ui/icons/dtool16/newfprj_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dtool16/newftrprj_wiz.gif b/ui/org.eclipse.pde.ui/icons/dtool16/newftrprj_wiz.gif
deleted file mode 100644
index 68cb4bc..0000000
--- a/ui/org.eclipse.pde.ui/icons/dtool16/newftrprj_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dtool16/newpprj_wiz.gif b/ui/org.eclipse.pde.ui/icons/dtool16/newpprj_wiz.gif
deleted file mode 100644
index 7f90111..0000000
--- a/ui/org.eclipse.pde.ui/icons/dtool16/newpprj_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dtool16/newsiteprj_wiz.gif b/ui/org.eclipse.pde.ui/icons/dtool16/newsiteprj_wiz.gif
deleted file mode 100644
index 2b7dbdf..0000000
--- a/ui/org.eclipse.pde.ui/icons/dtool16/newsiteprj_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dtool16/prd_config_wiz.gif b/ui/org.eclipse.pde.ui/icons/dtool16/prd_config_wiz.gif
deleted file mode 100644
index 84458d4..0000000
--- a/ui/org.eclipse.pde.ui/icons/dtool16/prd_config_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/dtool16/script_wiz.gif b/ui/org.eclipse.pde.ui/icons/dtool16/script_wiz.gif
deleted file mode 100644
index 84121cf..0000000
--- a/ui/org.eclipse.pde.ui/icons/dtool16/script_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/add_att.gif b/ui/org.eclipse.pde.ui/icons/elcl16/add_att.gif
deleted file mode 100644
index 252d7eb..0000000
--- a/ui/org.eclipse.pde.ui/icons/elcl16/add_att.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/alphab_sort_co.gif b/ui/org.eclipse.pde.ui/icons/elcl16/alphab_sort_co.gif
deleted file mode 100644
index 6311cc0..0000000
--- a/ui/org.eclipse.pde.ui/icons/elcl16/alphab_sort_co.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/ch_callees.gif b/ui/org.eclipse.pde.ui/icons/elcl16/ch_callees.gif
deleted file mode 100644
index 695e5a5..0000000
--- a/ui/org.eclipse.pde.ui/icons/elcl16/ch_callees.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/ch_callers.gif b/ui/org.eclipse.pde.ui/icons/elcl16/ch_callers.gif
deleted file mode 100644
index de0e6f9..0000000
--- a/ui/org.eclipse.pde.ui/icons/elcl16/ch_callers.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/clear.gif b/ui/org.eclipse.pde.ui/icons/elcl16/clear.gif
deleted file mode 100644
index af30a42..0000000
--- a/ui/org.eclipse.pde.ui/icons/elcl16/clear.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/clone_att.gif b/ui/org.eclipse.pde.ui/icons/elcl16/clone_att.gif
deleted file mode 100644
index db7d8de..0000000
--- a/ui/org.eclipse.pde.ui/icons/elcl16/clone_att.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/clone_el.gif b/ui/org.eclipse.pde.ui/icons/elcl16/clone_el.gif
deleted file mode 100644
index 6b33feb..0000000
--- a/ui/org.eclipse.pde.ui/icons/elcl16/clone_el.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/collapseall.gif b/ui/org.eclipse.pde.ui/icons/elcl16/collapseall.gif
deleted file mode 100644
index a2d80a9..0000000
--- a/ui/org.eclipse.pde.ui/icons/elcl16/collapseall.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/dep_loop.gif b/ui/org.eclipse.pde.ui/icons/elcl16/dep_loop.gif
deleted file mode 100644
index 0213bf2..0000000
--- a/ui/org.eclipse.pde.ui/icons/elcl16/dep_loop.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/find_obj.gif b/ui/org.eclipse.pde.ui/icons/elcl16/find_obj.gif
deleted file mode 100644
index d540a01..0000000
--- a/ui/org.eclipse.pde.ui/icons/elcl16/find_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/flatLayout.gif b/ui/org.eclipse.pde.ui/icons/elcl16/flatLayout.gif
deleted file mode 100644
index 1ef74cf..0000000
--- a/ui/org.eclipse.pde.ui/icons/elcl16/flatLayout.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/full_hierarchy.gif b/ui/org.eclipse.pde.ui/icons/elcl16/full_hierarchy.gif
deleted file mode 100644
index cad1237..0000000
--- a/ui/org.eclipse.pde.ui/icons/elcl16/full_hierarchy.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/generate_class.gif b/ui/org.eclipse.pde.ui/icons/elcl16/generate_class.gif
deleted file mode 100644
index b9f9aaa..0000000
--- a/ui/org.eclipse.pde.ui/icons/elcl16/generate_class.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/goto_obj.gif b/ui/org.eclipse.pde.ui/icons/elcl16/goto_obj.gif
deleted file mode 100644
index 71ad510..0000000
--- a/ui/org.eclipse.pde.ui/icons/elcl16/goto_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/help.gif b/ui/org.eclipse.pde.ui/icons/elcl16/help.gif
deleted file mode 100644
index 9d70301..0000000
--- a/ui/org.eclipse.pde.ui/icons/elcl16/help.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/hierarchicalLayout.gif b/ui/org.eclipse.pde.ui/icons/elcl16/hierarchicalLayout.gif
deleted file mode 100644
index 2344861..0000000
--- a/ui/org.eclipse.pde.ui/icons/elcl16/hierarchicalLayout.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/history_list.gif b/ui/org.eclipse.pde.ui/icons/elcl16/history_list.gif
deleted file mode 100644
index 364c0e7..0000000
--- a/ui/org.eclipse.pde.ui/icons/elcl16/history_list.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/maximize.gif b/ui/org.eclipse.pde.ui/icons/elcl16/maximize.gif
deleted file mode 100644
index 5e5999b..0000000
--- a/ui/org.eclipse.pde.ui/icons/elcl16/maximize.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/properties.gif b/ui/org.eclipse.pde.ui/icons/elcl16/properties.gif
deleted file mode 100644
index 1dc19a3..0000000
--- a/ui/org.eclipse.pde.ui/icons/elcl16/properties.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/refresh.gif b/ui/org.eclipse.pde.ui/icons/elcl16/refresh.gif
deleted file mode 100644
index e383147..0000000
--- a/ui/org.eclipse.pde.ui/icons/elcl16/refresh.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/remove_att.gif b/ui/org.eclipse.pde.ui/icons/elcl16/remove_att.gif
deleted file mode 100644
index 2cd9c54..0000000
--- a/ui/org.eclipse.pde.ui/icons/elcl16/remove_att.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/restore.gif b/ui/org.eclipse.pde.ui/icons/elcl16/restore.gif
deleted file mode 100644
index 258e536..0000000
--- a/ui/org.eclipse.pde.ui/icons/elcl16/restore.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/restore_log.gif b/ui/org.eclipse.pde.ui/icons/elcl16/restore_log.gif
deleted file mode 100644
index 2cb6962..0000000
--- a/ui/org.eclipse.pde.ui/icons/elcl16/restore_log.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/search_sortmatch.gif b/ui/org.eclipse.pde.ui/icons/elcl16/search_sortmatch.gif
deleted file mode 100644
index 8630705..0000000
--- a/ui/org.eclipse.pde.ui/icons/elcl16/search_sortmatch.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/synced.gif b/ui/org.eclipse.pde.ui/icons/elcl16/synced.gif
deleted file mode 100644
index 870934b..0000000
--- a/ui/org.eclipse.pde.ui/icons/elcl16/synced.gif
+++ /dev/null
Binary files differ

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

diff --git a/ui/org.eclipse.pde.ui/icons/elcl16/th_vertical.gif b/ui/org.eclipse.pde.ui/icons/elcl16/th_vertical.gif
deleted file mode 100644
index 50a54e0..0000000
--- a/ui/org.eclipse.pde.ui/icons/elcl16/th_vertical.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/etool16/convjpprj_wiz.gif b/ui/org.eclipse.pde.ui/icons/etool16/convjpprj_wiz.gif
deleted file mode 100644
index af748e3..0000000
--- a/ui/org.eclipse.pde.ui/icons/etool16/convjpprj_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/etool16/defbcon_wiz.gif b/ui/org.eclipse.pde.ui/icons/etool16/defbcon_wiz.gif
deleted file mode 100644
index b6007ea..0000000
--- a/ui/org.eclipse.pde.ui/icons/etool16/defbcon_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/etool16/defcon_wiz.gif b/ui/org.eclipse.pde.ui/icons/etool16/defcon_wiz.gif
deleted file mode 100644
index f794b29..0000000
--- a/ui/org.eclipse.pde.ui/icons/etool16/defcon_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/etool16/eclipse_launcher.gif b/ui/org.eclipse.pde.ui/icons/etool16/eclipse_launcher.gif
deleted file mode 100644
index eb7b90c..0000000
--- a/ui/org.eclipse.pde.ui/icons/etool16/eclipse_launcher.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/etool16/eclipse_launcher_wiz.gif b/ui/org.eclipse.pde.ui/icons/etool16/eclipse_launcher_wiz.gif
deleted file mode 100644
index 4cdb299..0000000
--- a/ui/org.eclipse.pde.ui/icons/etool16/eclipse_launcher_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/etool16/exp_deployfeat.gif b/ui/org.eclipse.pde.ui/icons/etool16/exp_deployfeat.gif
deleted file mode 100644
index d10b1f4..0000000
--- a/ui/org.eclipse.pde.ui/icons/etool16/exp_deployfeat.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/etool16/exp_deployplug.gif b/ui/org.eclipse.pde.ui/icons/etool16/exp_deployplug.gif
deleted file mode 100644
index aca7d61..0000000
--- a/ui/org.eclipse.pde.ui/icons/etool16/exp_deployplug.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/etool16/exp_product.gif b/ui/org.eclipse.pde.ui/icons/etool16/exp_product.gif
deleted file mode 100644
index 0d5825b..0000000
--- a/ui/org.eclipse.pde.ui/icons/etool16/exp_product.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/etool16/imp_extfeat.gif b/ui/org.eclipse.pde.ui/icons/etool16/imp_extfeat.gif
deleted file mode 100644
index 2ee3fc0..0000000
--- a/ui/org.eclipse.pde.ui/icons/etool16/imp_extfeat.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/etool16/imp_extplug.gif b/ui/org.eclipse.pde.ui/icons/etool16/imp_extplug.gif
deleted file mode 100644
index ed04eb1..0000000
--- a/ui/org.eclipse.pde.ui/icons/etool16/imp_extplug.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/etool16/jarToPlugin.gif b/ui/org.eclipse.pde.ui/icons/etool16/jarToPlugin.gif
deleted file mode 100644
index 4aa094b..0000000
--- a/ui/org.eclipse.pde.ui/icons/etool16/jarToPlugin.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/etool16/newefix_wiz.gif b/ui/org.eclipse.pde.ui/icons/etool16/newefix_wiz.gif
deleted file mode 100644
index fed603a..0000000
--- a/ui/org.eclipse.pde.ui/icons/etool16/newefix_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/etool16/newex_wiz.gif b/ui/org.eclipse.pde.ui/icons/etool16/newex_wiz.gif
deleted file mode 100644
index b1526e9..0000000
--- a/ui/org.eclipse.pde.ui/icons/etool16/newex_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/etool16/newexp_wiz.gif b/ui/org.eclipse.pde.ui/icons/etool16/newexp_wiz.gif
deleted file mode 100644
index da31eb6..0000000
--- a/ui/org.eclipse.pde.ui/icons/etool16/newexp_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/etool16/newexprj_wiz.gif b/ui/org.eclipse.pde.ui/icons/etool16/newexprj_wiz.gif
deleted file mode 100644
index 4e5f1cf..0000000
--- a/ui/org.eclipse.pde.ui/icons/etool16/newexprj_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/etool16/newfprj_wiz.gif b/ui/org.eclipse.pde.ui/icons/etool16/newfprj_wiz.gif
deleted file mode 100644
index 1e5532d..0000000
--- a/ui/org.eclipse.pde.ui/icons/etool16/newfprj_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/etool16/newftrprj_wiz.gif b/ui/org.eclipse.pde.ui/icons/etool16/newftrprj_wiz.gif
deleted file mode 100644
index eb351fa..0000000
--- a/ui/org.eclipse.pde.ui/icons/etool16/newftrprj_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/etool16/newpprj_wiz.gif b/ui/org.eclipse.pde.ui/icons/etool16/newpprj_wiz.gif
deleted file mode 100644
index 0af5bd4..0000000
--- a/ui/org.eclipse.pde.ui/icons/etool16/newpprj_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/etool16/newsiteprj_wiz.gif b/ui/org.eclipse.pde.ui/icons/etool16/newsiteprj_wiz.gif
deleted file mode 100644
index 72d4042..0000000
--- a/ui/org.eclipse.pde.ui/icons/etool16/newsiteprj_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/etool16/prd_config_wiz.gif b/ui/org.eclipse.pde.ui/icons/etool16/prd_config_wiz.gif
deleted file mode 100644
index 761a078..0000000
--- a/ui/org.eclipse.pde.ui/icons/etool16/prd_config_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/etool16/script_wiz.gif b/ui/org.eclipse.pde.ui/icons/etool16/script_wiz.gif
deleted file mode 100644
index d35b00e..0000000
--- a/ui/org.eclipse.pde.ui/icons/etool16/script_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/eview16/plugin_depend.gif b/ui/org.eclipse.pde.ui/icons/eview16/plugin_depend.gif
deleted file mode 100644
index 0fa090a..0000000
--- a/ui/org.eclipse.pde.ui/icons/eview16/plugin_depend.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/eview16/plugins.gif b/ui/org.eclipse.pde.ui/icons/eview16/plugins.gif
deleted file mode 100644
index 8493df4..0000000
--- a/ui/org.eclipse.pde.ui/icons/eview16/plugins.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/alert_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/alert_obj.gif
deleted file mode 100644
index e8d763d..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/alert_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/all_sc_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/all_sc_obj.gif
deleted file mode 100644
index 6d74e80..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/all_sc_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/att_URI_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/att_URI_obj.gif
deleted file mode 100644
index 8a92e51..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/att_URI_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/att_class_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/att_class_obj.gif
deleted file mode 100644
index c58797d..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/att_class_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/att_file_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/att_file_obj.gif
deleted file mode 100644
index c4ad57c..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/att_file_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/att_impl_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/att_impl_obj.gif
deleted file mode 100644
index 65e295a..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/att_impl_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/att_req_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/att_req_obj.gif
deleted file mode 100644
index 7347be3..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/att_req_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/build_exec.gif b/ui/org.eclipse.pde.ui/icons/obj16/build_exec.gif
deleted file mode 100644
index e3eeb74..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/build_exec.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/build_var_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/build_var_obj.gif
deleted file mode 100644
index bf043f9..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/build_var_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/bundle_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/bundle_obj.gif
deleted file mode 100644
index b6096e2..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/bundle_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/category_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/category_obj.gif
deleted file mode 100644
index 5ef0ed7..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/category_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/choice_sc_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/choice_sc_obj.gif
deleted file mode 100644
index 89ba825..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/choice_sc_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/debug_exc.gif b/ui/org.eclipse.pde.ui/icons/obj16/debug_exc.gif
deleted file mode 100644
index d90a29f..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/debug_exc.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/discovery.gif b/ui/org.eclipse.pde.ui/icons/obj16/discovery.gif
deleted file mode 100644
index ec6cca4..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/discovery.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/doc_section_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/doc_section_obj.gif
deleted file mode 100644
index f52d86a..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/doc_section_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/element.gif b/ui/org.eclipse.pde.ui/icons/obj16/element.gif
deleted file mode 100644
index dd45f08..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/element.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/elref_sc_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/elref_sc_obj.gif
deleted file mode 100644
index 51e8b54..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/elref_sc_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/error_st_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/error_st_obj.gif
deleted file mode 100644
index 0bc6068..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/error_st_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/ext_plugin_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/ext_plugin_obj.gif
deleted file mode 100644
index d17cc22..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/ext_plugin_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/ext_point_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/ext_point_obj.gif
deleted file mode 100644
index 17f771a..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/ext_point_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/ext_points_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/ext_points_obj.gif
deleted file mode 100644
index 52f4e5e..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/ext_points_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/extension_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/extension_obj.gif
deleted file mode 100644
index 7f3f595..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/extension_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/extensions_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/extensions_obj.gif
deleted file mode 100644
index e8abf43..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/extensions_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/external_frgmt_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/external_frgmt_obj.gif
deleted file mode 100644
index 5653901..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/external_frgmt_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/feature_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/feature_obj.gif
deleted file mode 100644
index 411a32a..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/feature_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/frgmt_dis_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/frgmt_dis_obj.gif
deleted file mode 100644
index f080d8f..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/frgmt_dis_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/frgmt_mf_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/frgmt_mf_obj.gif
deleted file mode 100644
index df14708..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/frgmt_mf_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/frgmt_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/frgmt_obj.gif
deleted file mode 100644
index d55b09f..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/frgmt_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/frgmts_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/frgmts_obj.gif
deleted file mode 100644
index df79d63..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/frgmts_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/ftr_jar_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/ftr_jar_obj.gif
deleted file mode 100644
index 2fa1d77..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/ftr_jar_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/ftr_mf_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/ftr_mf_obj.gif
deleted file mode 100644
index 6930e52..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/ftr_mf_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/ftr_xml_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/ftr_xml_obj.gif
deleted file mode 100644
index faa5c5c..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/ftr_xml_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/gel_sc_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/gel_sc_obj.gif
deleted file mode 100644
index 363ffaf..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/gel_sc_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/generic_xml_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/generic_xml_obj.gif
deleted file mode 100644
index 4083e21..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/generic_xml_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/group_sc_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/group_sc_obj.gif
deleted file mode 100644
index 0a13d8c..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/group_sc_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/incomplete_tsk.gif b/ui/org.eclipse.pde.ui/icons/obj16/incomplete_tsk.gif
deleted file mode 100644
index f6b9f8a..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/incomplete_tsk.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/info_st_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/info_st_obj.gif
deleted file mode 100644
index 2da001e..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/info_st_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/install-handler.gif b/ui/org.eclipse.pde.ui/icons/obj16/install-handler.gif
deleted file mode 100644
index c7b1e86..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/install-handler.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/jar_l_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/jar_l_obj.gif
deleted file mode 100644
index 6cb185c..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/jar_l_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/jar_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/jar_obj.gif
deleted file mode 100644
index 2fa1d77..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/jar_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/java_lib_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/java_lib_obj.gif
deleted file mode 100644
index cb55e33..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/java_lib_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/julaunchpgn.gif b/ui/org.eclipse.pde.ui/icons/obj16/julaunchpgn.gif
deleted file mode 100644
index 6e4ff2c..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/julaunchpgn.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/link_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/link_obj.gif
deleted file mode 100644
index 5fd9c94..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/link_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/links_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/links_obj.gif
deleted file mode 100644
index 6123b27..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/links_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/loop_node_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/loop_node_obj.gif
deleted file mode 100644
index 46e9bfa..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/loop_node_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/loop_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/loop_obj.gif
deleted file mode 100644
index 0213bf2..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/loop_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/main_tab.gif b/ui/org.eclipse.pde.ui/icons/obj16/main_tab.gif
deleted file mode 100644
index 0193dbe..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/main_tab.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/noref_feature_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/noref_feature_obj.gif
deleted file mode 100644
index f192b84..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/noref_feature_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/ok_st_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/ok_st_obj.gif
deleted file mode 100644
index 9cacb96..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/ok_st_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/output_folder_attrib.gif b/ui/org.eclipse.pde.ui/icons/obj16/output_folder_attrib.gif
deleted file mode 100644
index 4b39f0a..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/output_folder_attrib.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/overview_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/overview_obj.gif
deleted file mode 100644
index 0624021..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/overview_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/page_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/page_obj.gif
deleted file mode 100644
index c1a19e1..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/page_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/plugin_config_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/plugin_config_obj.gif
deleted file mode 100644
index 9be7aa5..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/plugin_config_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/plugin_configs_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/plugin_configs_obj.gif
deleted file mode 100644
index edb494d..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/plugin_configs_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/plugin_dis_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/plugin_dis_obj.gif
deleted file mode 100644
index d17cc22..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/plugin_dis_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/plugin_mf_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/plugin_mf_obj.gif
deleted file mode 100644
index eedacd2..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/plugin_mf_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/plugin_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/plugin_obj.gif
deleted file mode 100644
index 8493df4..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/plugin_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/processinginst.gif b/ui/org.eclipse.pde.ui/icons/obj16/processinginst.gif
deleted file mode 100644
index 74436d8d..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/processinginst.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/product_xml_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/product_xml_obj.gif
deleted file mode 100644
index 24004f0..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/product_xml_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/psearch_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/psearch_obj.gif
deleted file mode 100644
index 83c0f44..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/psearch_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/req_plugin_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/req_plugin_obj.gif
deleted file mode 100644
index c54f2b3..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/req_plugin_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/req_plugins_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/req_plugins_obj.gif
deleted file mode 100644
index 7f135be..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/req_plugins_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/run_exc.gif b/ui/org.eclipse.pde.ui/icons/obj16/run_exc.gif
deleted file mode 100644
index 57f4102..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/run_exc.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/runtime_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/runtime_obj.gif
deleted file mode 100644
index f159bcd..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/runtime_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/schema_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/schema_obj.gif
deleted file mode 100644
index 11f896c..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/schema_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/scomp_jar_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/scomp_jar_obj.gif
deleted file mode 100644
index b0ca216..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/scomp_jar_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/seq_sc_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/seq_sc_obj.gif
deleted file mode 100644
index 8bf3f97..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/seq_sc_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/site_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/site_obj.gif
deleted file mode 100644
index d789de3..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/site_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/site_xml_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/site_xml_obj.gif
deleted file mode 100644
index 35ff8c1..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/site_xml_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/source_attach_attrib.gif b/ui/org.eclipse.pde.ui/icons/obj16/source_attach_attrib.gif
deleted file mode 100644
index 27ee786..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/source_attach_attrib.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/swt_launcher.gif b/ui/org.eclipse.pde.ui/icons/obj16/swt_launcher.gif
deleted file mode 100644
index 3c4c7c8..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/swt_launcher.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/test.gif b/ui/org.eclipse.pde.ui/icons/obj16/test.gif
deleted file mode 100644
index 229d8e7..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/test.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/tsk_alert_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/tsk_alert_obj.gif
deleted file mode 100644
index 750aadf..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/tsk_alert_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/update.gif b/ui/org.eclipse.pde.ui/icons/obj16/update.gif
deleted file mode 100644
index 1b724a6..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/update.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/url.gif b/ui/org.eclipse.pde.ui/icons/obj16/url.gif
deleted file mode 100644
index b26c71d..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/url.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/obj16/warning_st_obj.gif b/ui/org.eclipse.pde.ui/icons/obj16/warning_st_obj.gif
deleted file mode 100644
index 2b2e50f..0000000
--- a/ui/org.eclipse.pde.ui/icons/obj16/warning_st_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/ovr16/binary_co.gif b/ui/org.eclipse.pde.ui/icons/ovr16/binary_co.gif
deleted file mode 100644
index 16fee86..0000000
--- a/ui/org.eclipse.pde.ui/icons/ovr16/binary_co.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/ovr16/doc_co.gif b/ui/org.eclipse.pde.ui/icons/ovr16/doc_co.gif
deleted file mode 100644
index 05ef403..0000000
--- a/ui/org.eclipse.pde.ui/icons/ovr16/doc_co.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/ovr16/error_co.gif b/ui/org.eclipse.pde.ui/icons/ovr16/error_co.gif
deleted file mode 100644
index 119dccc..0000000
--- a/ui/org.eclipse.pde.ui/icons/ovr16/error_co.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/ovr16/export_co.gif b/ui/org.eclipse.pde.ui/icons/ovr16/export_co.gif
deleted file mode 100644
index b18233d..0000000
--- a/ui/org.eclipse.pde.ui/icons/ovr16/export_co.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/ovr16/external_co.gif b/ui/org.eclipse.pde.ui/icons/ovr16/external_co.gif
deleted file mode 100644
index 3f2057b..0000000
--- a/ui/org.eclipse.pde.ui/icons/ovr16/external_co.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/ovr16/jar_co.gif b/ui/org.eclipse.pde.ui/icons/ovr16/jar_co.gif
deleted file mode 100644
index d8406b6..0000000
--- a/ui/org.eclipse.pde.ui/icons/ovr16/jar_co.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/ovr16/java_co.gif b/ui/org.eclipse.pde.ui/icons/ovr16/java_co.gif
deleted file mode 100644
index cc4eff5..0000000
--- a/ui/org.eclipse.pde.ui/icons/ovr16/java_co.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/ovr16/project_co.gif b/ui/org.eclipse.pde.ui/icons/ovr16/project_co.gif
deleted file mode 100644
index 388f315..0000000
--- a/ui/org.eclipse.pde.ui/icons/ovr16/project_co.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/ovr16/run_co.gif b/ui/org.eclipse.pde.ui/icons/ovr16/run_co.gif
deleted file mode 100644
index c3130bd..0000000
--- a/ui/org.eclipse.pde.ui/icons/ovr16/run_co.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/ovr16/warning_co.gif b/ui/org.eclipse.pde.ui/icons/ovr16/warning_co.gif
deleted file mode 100644
index ee2dac4..0000000
--- a/ui/org.eclipse.pde.ui/icons/ovr16/warning_co.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/view16/error_log.gif b/ui/org.eclipse.pde.ui/icons/view16/error_log.gif
deleted file mode 100644
index 58873a1..0000000
--- a/ui/org.eclipse.pde.ui/icons/view16/error_log.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/view16/plugin_persp.gif b/ui/org.eclipse.pde.ui/icons/view16/plugin_persp.gif
deleted file mode 100644
index 8493df4..0000000
--- a/ui/org.eclipse.pde.ui/icons/view16/plugin_persp.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/view16/plugins.gif b/ui/org.eclipse.pde.ui/icons/view16/plugins.gif
deleted file mode 100644
index 8493df4..0000000
--- a/ui/org.eclipse.pde.ui/icons/view16/plugins.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/view16/registry.gif b/ui/org.eclipse.pde.ui/icons/view16/registry.gif
deleted file mode 100644
index 7d96fe6..0000000
--- a/ui/org.eclipse.pde.ui/icons/view16/registry.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/view16/variable_tab.gif b/ui/org.eclipse.pde.ui/icons/view16/variable_tab.gif
deleted file mode 100644
index 4b95e5a..0000000
--- a/ui/org.eclipse.pde.ui/icons/view16/variable_tab.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/wizban/convjpprj_wiz.gif b/ui/org.eclipse.pde.ui/icons/wizban/convjpprj_wiz.gif
deleted file mode 100644
index 8f96219..0000000
--- a/ui/org.eclipse.pde.ui/icons/wizban/convjpprj_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/wizban/defcon_wiz.gif b/ui/org.eclipse.pde.ui/icons/wizban/defcon_wiz.gif
deleted file mode 100644
index 060561f..0000000
--- a/ui/org.eclipse.pde.ui/icons/wizban/defcon_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/wizban/exp_deployfeat_wiz.gif b/ui/org.eclipse.pde.ui/icons/wizban/exp_deployfeat_wiz.gif
deleted file mode 100644
index 321a576..0000000
--- a/ui/org.eclipse.pde.ui/icons/wizban/exp_deployfeat_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/wizban/exp_deployplug_wiz.gif b/ui/org.eclipse.pde.ui/icons/wizban/exp_deployplug_wiz.gif
deleted file mode 100644
index 613d4a2..0000000
--- a/ui/org.eclipse.pde.ui/icons/wizban/exp_deployplug_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/wizban/exp_product.gif b/ui/org.eclipse.pde.ui/icons/wizban/exp_product.gif
deleted file mode 100644
index f735999..0000000
--- a/ui/org.eclipse.pde.ui/icons/wizban/exp_product.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/wizban/extstr_wiz.gif b/ui/org.eclipse.pde.ui/icons/wizban/extstr_wiz.gif
deleted file mode 100644
index e2357cf..0000000
--- a/ui/org.eclipse.pde.ui/icons/wizban/extstr_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/wizban/imp_extfeat_wiz.gif b/ui/org.eclipse.pde.ui/icons/wizban/imp_extfeat_wiz.gif
deleted file mode 100644
index ac3ba8e..0000000
--- a/ui/org.eclipse.pde.ui/icons/wizban/imp_extfeat_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/wizban/imp_extplug_wiz.gif b/ui/org.eclipse.pde.ui/icons/wizban/imp_extplug_wiz.gif
deleted file mode 100644
index fea532c..0000000
--- a/ui/org.eclipse.pde.ui/icons/wizban/imp_extplug_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/wizban/jarToPlugin_wiz.gif b/ui/org.eclipse.pde.ui/icons/wizban/jarToPlugin_wiz.gif
deleted file mode 100644
index 0b1ce49..0000000
--- a/ui/org.eclipse.pde.ui/icons/wizban/jarToPlugin_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/wizban/migrate_30_wiz.gif b/ui/org.eclipse.pde.ui/icons/wizban/migrate_30_wiz.gif
deleted file mode 100644
index a035a75..0000000
--- a/ui/org.eclipse.pde.ui/icons/wizban/migrate_30_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/wizban/newefix_wizban.gif b/ui/org.eclipse.pde.ui/icons/wizban/newefix_wizban.gif
deleted file mode 100644
index 9a4c74b..0000000
--- a/ui/org.eclipse.pde.ui/icons/wizban/newefix_wizban.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/wizban/newex_wiz.gif b/ui/org.eclipse.pde.ui/icons/wizban/newex_wiz.gif
deleted file mode 100644
index 9580b49..0000000
--- a/ui/org.eclipse.pde.ui/icons/wizban/newex_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/wizban/newexp_wiz.gif b/ui/org.eclipse.pde.ui/icons/wizban/newexp_wiz.gif
deleted file mode 100644
index cb2e165..0000000
--- a/ui/org.eclipse.pde.ui/icons/wizban/newexp_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/wizban/newexprj_wiz.gif b/ui/org.eclipse.pde.ui/icons/wizban/newexprj_wiz.gif
deleted file mode 100644
index 7f1f57b..0000000
--- a/ui/org.eclipse.pde.ui/icons/wizban/newexprj_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/wizban/newfprj_wiz.gif b/ui/org.eclipse.pde.ui/icons/wizban/newfprj_wiz.gif
deleted file mode 100644
index 26444c4..0000000
--- a/ui/org.eclipse.pde.ui/icons/wizban/newfprj_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/wizban/newftrprj_wiz.gif b/ui/org.eclipse.pde.ui/icons/wizban/newftrprj_wiz.gif
deleted file mode 100644
index 179df37..0000000
--- a/ui/org.eclipse.pde.ui/icons/wizban/newftrprj_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/wizban/newpprj_wiz.gif b/ui/org.eclipse.pde.ui/icons/wizban/newpprj_wiz.gif
deleted file mode 100644
index 61e8ddf..0000000
--- a/ui/org.eclipse.pde.ui/icons/wizban/newpprj_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/wizban/newsiteprj_wiz.gif b/ui/org.eclipse.pde.ui/icons/wizban/newsiteprj_wiz.gif
deleted file mode 100644
index 749b718..0000000
--- a/ui/org.eclipse.pde.ui/icons/wizban/newsiteprj_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/wizban/product_wiz.gif b/ui/org.eclipse.pde.ui/icons/wizban/product_wiz.gif
deleted file mode 100644
index 76bd2e7..0000000
--- a/ui/org.eclipse.pde.ui/icons/wizban/product_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/icons/wizban/schema_wiz.gif b/ui/org.eclipse.pde.ui/icons/wizban/schema_wiz.gif
deleted file mode 100644
index 9658b4d..0000000
--- a/ui/org.eclipse.pde.ui/icons/wizban/schema_wiz.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/macosx/Info.plist b/ui/org.eclipse.pde.ui/macosx/Info.plist
deleted file mode 100644
index 7ef116a..0000000
--- a/ui/org.eclipse.pde.ui/macosx/Info.plist
+++ /dev/null

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

-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">

-<plist version="1.0">

-<dict>

-		 <key>CFBundleExecutable</key>

-		 <string>%EXECUTABLE_NAME%</string>

-		 <key>CFBundleIconFile</key>

-		 <string>%ICON_NAME%</string>

-		 <key>CFBundleInfoDictionaryVersion</key>

-		 <string>6.0</string>

-		 <key>CFBundleName</key>

-		 <string>%BUNDLE_NAME%</string>

-		 <key>CFBundlePackageType</key>

-		 <string>APPL</string>

-		 <key>CFBundleSignature</key>

-		 <string>????</string>

-		 <key>Eclipse</key>

-		 <array>

-		 		 <string>-startup</string>

-		 		 <string>../../../startup.jar</string>

-		 		 <string>-vmargs</string>

-		 		 <string>-XstartOnFirstThread</string>

-		 		 <string>-Xms30M</string>

-		 		 <string>-Xmx150M</string>

-		 		 <string>-Dorg.eclipse.swt.internal.carbon.smallFonts</string>

-		 		 <string>-Dorg.eclipse.swt.internal.carbon.noFocusRing</string>

-		 </array>

-		 <key>LSUIElement</key>

-		 <string>1</string>

-</dict>

-</plist>


diff --git a/ui/org.eclipse.pde.ui/pdeuiant.jar b/ui/org.eclipse.pde.ui/pdeuiant.jar
deleted file mode 100644
index 14d6ef1..0000000
--- a/ui/org.eclipse.pde.ui/pdeuiant.jar
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/plugin.properties b/ui/org.eclipse.pde.ui/plugin.properties
deleted file mode 100644
index 809741b..0000000
--- a/ui/org.eclipse.pde.ui/plugin.properties
+++ /dev/null

@@ -1,436 +0,0 @@
-###############################################################################

-# Copyright (c) 2000, 2005 IBM Corporation and others.

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#

-# Contributors:

-#     IBM Corporation - initial API and implementation

-###############################################################################

-#

-# PDE plugin.xml resources

-#

-name = Plug-in Development UI

-provider-name = Eclipse.org

-expoint.pluginContent.name=Plug-in content wizards

-expoint.newExtension.name=Extension wizards

-expoint.newExtensionPoint.name=Extension point wizards

-expoint.templates.name = Extension Templates

-expoint.schemaMap.name=Schema mappings

-expoint.source.name = Source Locations

-expoint.samples.name = Code Samples

-

-perspective.name=Plug-in Development

-

-preferences.main.name= Plug-in Development

-preferences.target.name = Target Platform

-preferences.compilers.name = Compilers

-preferences.editor.name = Editors

-

-preferenceKeywords.PDE=Plug-in plugin Development PDE

-preferenceKeywords.MainPreferencePage=ID Label

-preferenceKeywords.TargetPlatformPreferencePage=external target plugin fragment

-preferenceKeywords.EditorPreferencePage=editor colors source page

-preferenceKeywords.CompilersPreferencePage=error warning ignore marker schema

-

-binaryFilter.name = Binary plug-in and feature projects

-binaryFilter.desc = Hides Java projects created by importing Eclipse plug-ins \

-as binary (no source code)

-

-new.category.name=Plug-in Development

-new.pluginProject.name=Plug-in Project

-new.pluginProject.description=Create a Plug-in Project

-new.pluginWithJarsProject.name=Plug-in from existing JAR archives

-new.pluginWithJarsProject.description=Create a plug-in project from existing JAR archives.

-new.fragmentProject.name=Fragment Project

-new.fragmentProject.description=Create a Plug-in Fragment Project

-new.schemaFile.name = Extension Point Schema

-new.schemaFile.description = Create an Extension Point Schema File

-new.convert.name= Convert Projects to Plug-in Projects...

-new.convert.description=Create a Plug-in project by converting an existing project.

-new.feature.name=Feature Project

-new.feature.description=Create a Feature project

-new.patch.name=Feature Patch

-new.patch.description=Create a Feature Patch

-new.site.name=Update Site Project

-new.site.description=Create an Update Site project

-

-PluginImportWizard.label=External Plug-ins and Fragments

-PluginImportWizard.description=Create projects from plug-ins and fragments in the file system.

-

-FeatureImportWizard.label=External Features

-FeatureImportWizard.description=Create projects from features in the file system as part of \

-in conjunction with the feature-based launching.

-

-PluginSearchPage.label = Plug-in Search

-PluginSearch.references = Find References

-

-PluginExportWizard.label=Deployable plug-ins and fragments

-PluginExportWizard.description=Export the selected plug-ins and/or fragments \

-in a form suitable for deploying in an Eclipse product.

-

-FeatureExportWizard.label=Deployable features

-FeatureExportWizard.description=Export the selected features \

-in a form suitable for deploying in an Eclipse product.

-

-ProductExportWizard.label=Eclipse product

-ProductExportWizard.description=Export an Eclipse product.

-DependencyExtent.type = &Type

-

-PluginImportExport.category = Plug-in Development

-

-### Individual extension templates ############

-template.helloWorld.name = "Hello world" Action Set

-template.helloWorld.desc = This template creates a simple action set \

-that adds <b>Sample Menu</b> to the menu bar and a button to \

-the tool bar. Both the menu item in the new menu and the button \

-invoke the same <b>Sample Action</b>. Its role is to open a \

-simple message dialog with a message of your choice.

-

-template.intro.name = Intro

-template.intro.desc = This wizard creates a minimal standalone RCP application with an intro. \

-Sample intro consists of three static pages, and optionally \

-a page with content created dynamically.

-

-template.propertyPages.name = Property Page

-template.propertyPages.desc = This template adds a property page to a resource and will \

-appear in the Properties Dialog for that resource.  This property page can be used to view \

-and set application-specific properties of a resource.

-

-template.editor.name = XML Editor

-template.editor.desc = This template creates a basic XML editor.  It has all the basic functions \

-of an editor, such as cut, copy, paste, find, etc.  It also has syntax highlighting and supports double-clicking.

-

-

-template.popupMenus.name = Popup Menu

-template.popupMenus.desc = This template adds a submenu and a new action to a target object's \

-popup menu.  This contribution will appear in all viewers where an object of the specified type \

-is selected.

-

-template.view.name = View

-template.view.desc = This template creates a workbench view. \

-The view is contributed to the workbench by \

-creating a category. The view can be opened by selecting \

-<b>Window</b>, <b>Show View</b> and then <b>Other...</b> \

-on the menu bar. The template offers several choices including \

-pop-up menu support, local tool bar, double-click, sorting and \

-filtering.

-

-template.multiPageEditor.name = Multi-page Editor

-template.multiPageEditor.desc = This template creates a \

-multi-page editor. It works on text files with the chosen extension. \

-The editor has three pages: <b>Edit</b> where you enter text, \

-<b>Properties</b> that allows you to change font of the result \

-and <b>Preview</b> that shows sorted words from the <b>Edit</b> page \

-using the font set in <b>Properties</b>. To open the editor, choose \

-<b>File</b>, <b>New</b> then <b>Other...</b> from the menu bar. \

-In the "Simple" category, choose to create a new file. Use any file \

-name, but use the extension the editor is registered for (*.mpe by \

-default).

-

-template.newWizard.name = New File Wizard

-template.newWizard.desc = This template creates a \

-wizard that can create a new file in the workspace. It is designed to \

-generate files that can be opened by a <b>Multi-Page Editor</b>. \

-To test the wizard, select <b>File</b>, \

-<b>New</b> then <b>Other...</b> from the menu bar. When the master \

-wizard opens, select the created category and the new wizard registered \

-for that category. Make sure that the chosen extension matches \

-the extension the multi-page editor is registered for (*.mpe by \

-default).

-

-template.preferences.name = Preference Page

-template.preferences.desc = This template creates a \

-page that is contributed to the Preferences. It demonstrates how \

-to create common preference fields and how to save and restore \

-values between invocations. To see the result, select \

-<b>Window</b> then <b>Preferences...</b> from the menu bar.

-

-template.help.name = Help Table of Contents

-template.help.desc = This template creates a Help table of contents. \

-If this table is set to primary, it can be standalone, or integrated \

-into pre-set categories. If the table is not set to primary, it can \

-optionally be integrated into a primary table of contents for testing. 

-

-template.builder.name = Sample Incremental Project Builder and Project Nature

-

-pluginContent.defaultPlugin.name= Default Plug-In Structure

-pluginContent.defaultPlugin.description=Generates plug-in \

-manifest (plugin.xml) and plug-in top-level Java class. \

-When finished, the wizard will open plug-in manifest editor. \

-The plug-in will be ready to work, compile and run, but will \

-contain no extensions.

-

-

-pluginContent.helloWorld.name = Hello, World

-pluginContent.helloWorld.description=\

-<p>This wizard creates standard plug-in directory structure and \

-adds the following:</p>\

-<li><b>Action set</b>. %template.helloWorld.desc%</li>\

-<p><b>Extensions Used</b></p>\

-<li>org.eclipse.ui.actionSets</li>

-

-pluginContent.intro.name = RCP application with an intro

-pluginContent.intro.description=\

-<p>%template.intro.desc%</p>\

-<p><b>Extensions Used</b></p>\

-<li>org.eclipse.core.runtime.products</li>\

-<li>org.eclipse.ui.intro</li>\

-<li>org.eclipse.ui.intro.config</li>\

-<li>org.eclipse.core.runtime.applications</li>\

-<li>org.eclipse.ui.perspectives</li>\

-<li>org.eclipse.ui.intro.configExtension (if dynamic content selected)</li>

-

-pluginContent.propertyPages.name = Plug-in with a property page

-pluginContent.propertyPages.description=\

-<p>This wizard creates standard plug-in directory structure and \

-adds the following:</p>\

-<li><b>Property Page</b>. %template.propertyPages.desc%</li>\

-<p><b>Extension Used</b></p>\

-<li>org.eclipse.ui.propertyPages</li>

-

-pluginContent.popupMenus.name = Plug-in with a popup menu

-pluginContent.popupMenus.description=\

-<p>This wizard creates a standard plug-in directory structure and \

-adds the following:</p>\

-<li><b>Popup Menu</b>. %template.popupMenus.desc%</li>\

-<p><b>Extension Used</b></p>\

-<li>org.eclipse.ui.popupMenus</li>

-

-pluginContent.editor.name = Plug-in with an editor

-pluginContent.editor.description=\

-<p>This wizard creates standard plug-in directory structure and \

-adds the following:</p>\

-<li><b>Editor</b>. %template.editor.desc%</li>\

-<p><b>Extension Used</b></p>\

-<li>org.eclipse.ui.editors</li>

-

-pluginContent.view.name = Plug-in with a view

-pluginContent.view.description=\

-<p>This wizard creates standard plug-in directory structure and \

-adds the following:</p>\

-<li><b>Sample view</b>. %template.view.desc%</li>\

-<p><b>Extensions Used</b></p>\

-<li>org.eclipse.ui.views</li>

-

-pluginContent.multiPageEditor.name = Plug-in with a multi-page editor

-pluginContent.multiPageEditor.description=\

-<p>This wizard creates standard plug-in directory structure and \

-adds the following:</p>\

-<li><b>Sample Multi-page Editor</b>. %template.multiPageEditor.desc%</li>\

-<li><b>Sample New Wizard</b>. %template.newWizard.desc%</li>\

-<p><b>Extensions Used</b></p>\

-<li>org.eclipse.ui.editors</li>\

-<li>org.eclipse.ui.newWizards</li>

-

-pluginContent.builder.name = Plug-in with a incremental project builder

-pluginContent.builder.description=\

-<p>This wizard creates standard plug-in directory structure and \

-adds the following:</p>\

-<li><b>Sample Incremental Project Builder</b>. The sample builder checks XML files in the project \

-and adds a problem marker to not well formed files.</li>\

-<li><b>Sample Project Nature</b>. This nature owns the builder.  Builder runs for projects \

-of this nature.</li>\

-<li><b>Sample Problem Marker</b>. The builder uses this sub-type of a problem marker to mark errors.</li>\

-<li><b>Sample Popup Menu Action</b>. An action in a project context menu allows adding or removing \

-the sample nature to or from a workspace project.</li>\

-<p><b>Extensions Used</b></p>\

-<li>org.eclipse.core.resources.builders</li>\

-<li>org.eclipse.core.resources.markers</li>\

-<li>org.eclipse.core.resources.natures</li>\

-<li>org.eclipse.ui.popupMenus</li>

-

-pluginContent.mail.name = RCP Mail Template

-pluginContent.mail.description=\

-<p>This wizard creates a standalone RCP application that shows how to:</p>\

-<li>add top-level menu and toolbar with actions</li>\

-<li>add keybindings to actions</li>\

-<li>create views that can't be closed and multiple instances of the same view</li>\

-<li>create perspectives with placeholders for new views</li>\

-<li>use the default About dialog</li>\

-<li>create a product definition</li>\

-<p><b>Extensions Used</b></p>\

-<li>org.eclipse.core.runtime.applications</li>\

-<li>org.eclipse.core.runtime.products</li>\

-<li>org.eclipse.ui.commands</li>\

-<li>org.eclipse.ui.perspectives</li>\

-<li>org.eclipse.ui.views</li>

-

-pluginContent.helloRCP.name = Hello RCP

-pluginContent.helloRCP.description=\

-<p>This wizard creates a minimal standalone RCP application that consists of an application window with a title.</p>\

-<p><b>Extensions Used</b></p>\

-<li>org.eclipse.core.runtime.applications</li>\

-<li>org.eclipse.ui.perspectives</li>\

-

-pluginContent.helloNonUIRCP.name = Headless Hello RCP

-pluginContent.helloNonUIRCP.description=\

-<p>This wizard creates a minimal standalone headless RCP application that prints "Hello RCP" to the console.</p>\

-<p><b>Extensions Used</b></p>\

-<li>org.eclipse.core.runtime.applications</li>\

-

-pluginContent.helloOSGi.name = Hello OSGi Bundle

-pluginContent.helloOSGi.description=\

-<p>This wizard creates a pure OSGi Bundle that prints to the console when it starts and stops.</p>\

-<p><b>Imports Used</b></p>\

-<li>org.osgi.framework</li>\

-

-pluginContent.viewRCP.name = RCP application with a view

-pluginContent.viewRCP.description=\

-<p>This wizard creates a standalone RCP application that consists of an application window with a single view.</p>\

-<p><b>Extensions Used</b></p>\

-<li>org.eclipse.core.runtime.applications</li>\

-<li>org.eclipse.ui.perspectives</li>\

-<li>org.eclipse.ui.views</li>\

-

-pluginContent.choice.name = Custom plug-in wizard

-pluginContent.choice.description=This wizard creates standard \

-plug-in directory structure and provides for choosing additional \

-content from a list of templates.

-

-editors.pluginManifest.name = Plug-in Manifest Editor

-editors.schema.name = Extension Point Schema Editor

-editors.buildProperties.name = Build Properties Editor

-editors.featureManifest.name = Feature Manifest Editor

-editors.siteManifest.name = Site Manifest Editor

-editors.sample.name = Code Sample Editor

-

-views.category.name = PDE

-views.plugins.name = Plug-ins

-views.dependencies.name = Plug-in Dependencies

-ViewCommand.pluginsView.name = Plug-ins

-ViewCommand.pluginsView.description = Show the Plug-ins view

-ViewCommand.dependenciesView.name = Plug-in Dependencies

-ViewCommand.dependenciesView.description = Show the Plug-in Dependencies view

-

-natures.pluginNature.name= Plug-in Development

-natures.featureNature.name= Feature Development

-

-builders.manifestBuilder.name = Plug-in Manifest Builder

-builders.schemaBuilder.name = Extension Point Schema Builder

-builders.featureBuilder.name = Feature Manifest Builder

-

-newExtension.templates = Extension Templates

-newExtension.templates.hello.name = "Hello, World" action set

-newExtension.templates.hello.desc = <p>%template.helloWorld.desc%</p>

-

-newExtension.templates.intro.name = Eclipse Intro 

-newExtension.templates.intro.desc = <p>%template.intro.desc%</p>

-

-newExtension.templates.view.name = Sample View

-newExtension.templates.view.desc = <p>%template.view.desc%</p>

-

-newExtension.templates.multiPageEditor.name = Multi-page Editor

-newExtension.templates.multiPageEditor.desc = <p>%template.multiPageEditor.desc%</p>

-

-newExtension.templates.newWizard.name = New File Wizard

-newExtension.templates.newWizard.desc = <p>%template.newWizard.desc%</p>

-

-newExtension.templates.preferences.name = Preference Page

-newExtension.templates.preferences.desc = <p>%template.preferences.desc%</p>

-

-newExtension.templates.propertyPages.name = Property Page

-newExtension.templates.propertyPages.desc = <p>%template.propertyPages.desc%</p>

-

-newExtension.templates.editor.name = Editor

-newExtension.templates.editor.desc = <p>%template.editor.desc%</p>

-

-newExtension.templates.popupMenus.name = Popup Menu

-newExtension.templates.popupMenus.desc = <p>%template.popupMenus.desc%</p>

-

-newExtension.templates.help.name = Help Content

-newExtension.templates.help.desc = <p>%template.help.desc%</p>

-

-newExtension.templates.builder.name = New plug-in project with a sample project builder and nature

-

-newExtension.templates.builder.name = Project Builder and Nature

-newExtension.templates.builder.desc = <p>This template creates an incremental \

-project builder and a project nature. The sample builder checks XML files in the project \

-and adds a problem marker to not well formed files. The builder runs for projects \

-of the sample nature.</p><p>Select <b>Add/Remove Sample Nature</b> action from \

-a project context menu, to toggle the nature on a project.</p>

-

-newExtension.generic = Generic Wizards

-newExtension.generic.name = Schema-based Extension

-newExtension.generic.desc = <p>Adds a new extension based \

-on its schema information. If the extension point schema (definition) \

-can be found, you will be able to create the correct child elements \

-by choosing <b>New</b> on the pop-up menu while the parent element \

-is selected. The property sheet will show expected attributes for \

-each element and will use cell editor appropriate for the attribute \

-type.</p>\

-<p>If the extension point definition cannot be found, you will still \

-be able to add or remove attributes but they will all be treated as \

-text and there will be no constraints on their names or number.</p>

-

-

-org.eclipse.pde.ui.tools = &PDE Tools

-MigrationAction.label = Migrate to 3.0...

-popupMenus.createJar.label = Create Ant &Build File

-popupMenus.buildFragment.label = Create Ant &Build File

-popupMenus.buildPlugin.label = Create Ant &Build File

-popupMenus.createHelpIndex.label = Create &Help Index

-popupMenus.buildSite.label = Build &Site

-

-UpdateClasspathAction.label= &Update Classpath...

-UpdateClasspathAction.description=Updates classpath with the settings specified in the manifest files

-

-OpenDependenciesAction.label= Ope&n Dependencies

-OpenDependenciesAction.description=Show plug-in dependencies in the Plug-in Dependencies view

-

-launcher.shortcut.label= Eclipse Application

-EclipseApplicationShortcut.description.debug = Debug Eclipse Application

-EclipseApplicationShortcut.description.run = Run Eclipse Application

-Equinox.shortcut.label = Equinox Framework

-EquinoxShortcut.description.debug = Debug Equinox Framework

-EquinoxShortcut.description.run = Run Equinox Framework

-launcher.junit.name = JUnit Plug-in Test

-JUnitApplicationShortcut.description.debug = Debug JUnit Plug-in Test

-JUnitApplicationShortcut.description.run = Run JUnit Plug-in Test

-SWTApplicationShortcut.description.debug = Debug SWT Application

-SWTApplicationShortcut.description.run = Run SWT Application

-

-launchConfigurationType.name = Eclipse Application

-launcher.framework.name = Equinox OSGi Framework

-launchConfigurationTab.firstTab.name = Arguments

-launchConfigurationTab.advancedTab.name = Plug-ins and Fragments

-launchConfigurationTab.tracingTab.name = Tracing Options

-launcher.swt.name = SWT Application

-

-equinoxLauncherTabGroup.description.debug=Create a configuration to launch the Equinox OSGi framework in debug mode.

-equinoxLauncherTabGroup.description.run=Create a configuration to launch the Equinox OSGi framework.

-workbenchLauncherTabGroup.description.debug=Create a configuration to launch an Eclipse application in debug mode.

-workbenchLauncherTabGroup.description.run=Create a configuration to launch an Eclipse application.

-jUnitTabGroup.description.debug=Create a configuration that will launch a JUnit plug-in test in debug mode.

-jUnitTabGroup.description.run=Create a configuration that will launch a JUnit plug-in test.

-swtLauncherTabGroup.description.debug=Create a configuration to launch an SWT application in debug mode.

-swtLauncherTabGroup.description.run=Create a configuration to launch an SWT application.

-

-decorator.label = Binary Plug-in Projects

-decorator.desc = Decorates plug-in projects imported using \

-'External Plug-ins and Fragments' wizard, allowing you to \

-differentiate between binary and source projects.

-

-AddTask.label = Add Task...

-AddTask.tooltip = Add Task

-AddBookmark.label = Add Bookmark...

-AddBookmark.tooltip = Add Bookmark

-

-PreviewReference.label = &Preview Reference Document

-PropertyPage.pluginDevelopment = Plug-in Development

-PropertyPage.selfHosting = Runtime Classpath

-PropertyPage.compilers = Plug-in Manifest Compiler

-Plugin.dependencies.container = Plug-in Dependencies

-

-Plugin.WorkingSet = Plug-ins and Fragments

-new.product.config = Product Configuration

-new.product.desc = Create a new Eclipse product configuration

-product.editor = Product Configuration Editor

-

-rename.type.participant = Manifest Rename Type Participant

-rename.package.participant = Manifest Rename Package Participant

-move.type.participant = Manifest Move Type Participant

-move.package.participant = Manifest Move Package Participant

-

-ExternalizeStrings.label = Externalize Strings...


diff --git a/ui/org.eclipse.pde.ui/plugin.xml b/ui/org.eclipse.pde.ui/plugin.xml
deleted file mode 100644
index e111437..0000000
--- a/ui/org.eclipse.pde.ui/plugin.xml
+++ /dev/null

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

-<?eclipse version="3.0"?>

-<plugin>

-

-    

-<!-- Extension points -->

-   <extension-point id="pluginContent" name="%expoint.pluginContent.name" schema="schema/pluginContent.exsd"/>

-   <extension-point id="newExtension" name="%expoint.newExtension.name" schema="schema/newExtension.exsd"/>

-   <extension-point id="templates" name="%expoint.templates.name" schema="schema/templates.exsd"/>

-   <extension-point id="samples" name="%expoint.samples.name" schema="schema/samples.exsd"/>

-

-<!-- Extensions -->

-   <extension

-         point="org.eclipse.ui.perspectives">

-      <perspective

-            name="%perspective.name"

-            icon="$nl$/icons/eview16/plugins.gif"

-            class="org.eclipse.pde.internal.ui.PDEPerspective"

-            id="org.eclipse.pde.ui.PDEPerspective">

-      </perspective>

-   </extension>

-   <extension

-         point="org.eclipse.ui.preferencePages">

-      <page

-            name="%preferences.main.name"

-            class="org.eclipse.pde.internal.ui.preferences.MainPreferencePage"

-            id="org.eclipse.pde.ui.MainPreferencePage">

-            <keywordReference id="org.eclipse.pde.ui.pde"/>

-            <keywordReference id="org.eclipse.pde.ui.MainPreferencePage"/>

-      </page>

-      <page

-            name="%preferences.target.name"

-            category="org.eclipse.pde.ui.MainPreferencePage"

-            class="org.eclipse.pde.internal.ui.preferences.TargetPlatformPreferencePage"

-            id="org.eclipse.pde.ui.TargetPlatformPreferencePage">

-            <keywordReference id="org.eclipse.pde.ui.pde"/>

-            <keywordReference id="org.eclipse.pde.ui.TargetPlatformPreferencePage"/>

-      </page>

-      <page

-            name="%preferences.editor.name"

-            category="org.eclipse.pde.ui.MainPreferencePage"

-            class="org.eclipse.pde.internal.ui.preferences.EditorPreferencePage"

-            id="org.eclipse.pde.ui.EditorPreferencePage">

-            <keywordReference id="org.eclipse.pde.ui.pde"/>

-            <keywordReference id="org.eclipse.pde.ui.EditorPreferencePage"/>

-      </page>

-      <page

-            name="%preferences.compilers.name"

-            category="org.eclipse.pde.ui.MainPreferencePage"

-            class="org.eclipse.pde.internal.ui.preferences.CompilersPreferencePage"

-            id="org.eclipse.pde.ui.CompilersPreferencePage">

-            <keywordReference id="org.eclipse.pde.ui.pde"/>

-            <keywordReference id="org.eclipse.pde.ui.CompilersPreferencePage"/>

-      </page>

-   </extension>

-   <extension

-   		point="org.eclipse.ui.keywords">

-      <keyword

-            label="%preferenceKeywords.PDE"

-            id="org.eclipse.pde.ui.pde"/>

-      <keyword

-            label="%preferenceKeywords.MainPreferencePage"

-            id="org.eclipse.pde.ui.MainPreferencePage"/>

-      <keyword

-            label="%preferenceKeywords.TargetPlatformPreferencePage"

-            id="org.eclipse.pde.ui.TargetPlatformPreferencePage"/>

-      <keyword

-            label="%preferenceKeywords.EditorPreferencePage"

-            id="org.eclipse.pde.ui.EditorPreferencePage"/>

-      <keyword

-            label="%preferenceKeywords.CompilersPreferencePage"

-            id="org.eclipse.pde.ui.CompilersPreferencePage"/>

-   </extension>

-   <extension

-         point="org.eclipse.ui.newWizards">

-      <category

-            name="%new.category.name"

-            id="org.eclipse.pde.PDE">

-      </category>

-      <wizard

-            name="%new.pluginProject.name"

-            icon="$nl$/icons/etool16/newpprj_wiz.gif"

-            category="org.eclipse.pde.PDE"

-            class="org.eclipse.pde.internal.ui.wizards.plugin.NewPluginProjectWizard"

-            project="true"

-            finalPerspective="org.eclipse.pde.ui.PDEPerspective"

-            id="org.eclipse.pde.ui.NewProjectWizard">

-         <description>

-            %new.pluginProject.description

-         </description>

-      </wizard>

-      <wizard

-            name="%new.pluginWithJarsProject.name"

-            icon="$nl$/icons/etool16/jarToPlugin.gif"

-            category="org.eclipse.pde.PDE"

-            class="org.eclipse.pde.internal.ui.wizards.plugin.NewLibraryPluginProjectWizard"

-            project="true"

-            finalPerspective="org.eclipse.pde.ui.PDEPerspective"

-            id="org.eclipse.pde.ui.NewLibraryPluginProjectWizard">

-         <description>

-            %new.pluginWithJarsProject.description

-         </description>

-      </wizard>

-      <wizard

-            name="%new.fragmentProject.name"

-            icon="$nl$/icons/etool16/newfprj_wiz.gif"

-            category="org.eclipse.pde.PDE"

-            class="org.eclipse.pde.internal.ui.wizards.plugin.NewFragmentProjectWizard"

-            project="true"

-            finalPerspective="org.eclipse.pde.ui.PDEPerspective"

-            id="org.eclipse.pde.ui.NewFragmentWizard">

-         <description>

-            %new.fragmentProject.description

-         </description>

-      </wizard>

-      <wizard

-            name="%new.schemaFile.name"

-            icon="$nl$/icons/obj16/schema_obj.gif"

-            category="org.eclipse.pde.PDE"

-            class="org.eclipse.pde.internal.ui.wizards.extension.NewSchemaFileWizard"

-            finalPerspective="org.eclipse.pde.ui.PDEPerspective"

-            id="org.eclipse.pde.ui.NewSchemaFileWizard">

-         <description>

-            %new.schemaFile.description

-         </description>

-      </wizard>

-      <wizard

-            name="%new.feature.name"

-            icon="$nl$/icons/etool16/newftrprj_wiz.gif"

-            category="org.eclipse.pde.PDE"

-            class="org.eclipse.pde.internal.ui.wizards.feature.NewFeatureProjectWizard"

-            project="true"

-            finalPerspective="org.eclipse.pde.ui.PDEPerspective"

-            id="org.eclipse.pde.ui.NewFeatureProjectWizard">

-         <description>

-            %new.feature.description

-         </description>

-      </wizard>

-            <wizard

-            name="%new.patch.name"

-            icon="$nl$/icons/etool16/newefix_wiz.gif"

-            category="org.eclipse.pde.PDE"

-            class="org.eclipse.pde.internal.ui.wizards.feature.NewFeaturePatchWizard"

-            finalPerspective="org.eclipse.pde.ui.PDEPerspective"

-            project="true"

-            id="org.eclipse.pde.ui.NewFeaturePatchWizard">

-         <description>

-            %new.patch.description

-         </description>

-      </wizard>

-      <wizard

-            name="%new.site.name"

-            icon="$nl$/icons/etool16/newsiteprj_wiz.gif"

-            category="org.eclipse.pde.PDE"

-            class="org.eclipse.pde.internal.ui.wizards.site.NewSiteProjectWizard"

-            project="true"

-            id="org.eclipse.pde.ui.NewSiteProjectWizard">

-         <description>

-            %new.site.description

-         </description>

-      </wizard>

-      <wizard

-            icon="$nl$/icons/etool16/prd_config_wiz.gif"

-            class="org.eclipse.pde.internal.ui.wizards.product.NewProductFileWizard"

-            category="org.eclipse.pde.PDE"

-            name="%new.product.config"

-            id="org.eclipse.pde.ui.NewProductConfigurationWizard">

-         <description>

-            %new.product.desc

-         </description>

-      </wizard>

-   </extension>

-   <extension

-         id="selfhosting.import"

-         point="org.eclipse.ui.importWizards">

-      <wizard

-            category="org.eclipse.pde.ui.PluginDevelopment"

-            class="org.eclipse.pde.internal.ui.wizards.imports.PluginImportWizard"

-            icon="$nl$/icons/etool16/imp_extplug.gif"

-            id="org.eclipse.pde.ui.PluginImportWizard"

-            name="%PluginImportWizard.label">

-         <description>

-            %PluginImportWizard.description

-         </description>

-      </wizard>

-      <wizard

-            category="org.eclipse.pde.ui.PluginDevelopment"

-            class="org.eclipse.pde.internal.ui.wizards.imports.FeatureImportWizard"

-            icon="$nl$/icons/etool16/imp_extfeat.gif"

-            id="org.eclipse.pde.ui.FeatureImportWizard"

-            name="%FeatureImportWizard.label">

-         <description>

-            %FeatureImportWizard.description

-         </description>

-      </wizard>

-      <category

-            id="org.eclipse.pde.ui.PluginDevelopment"

-            name="%PluginImportExport.category"/>

-   </extension>

-   <extension

-         point="org.eclipse.ui.exportWizards">

-      <wizard

-            category="org.eclipse.pde.ui.PluginDevelopment"

-            class="org.eclipse.pde.internal.ui.wizards.exports.PluginExportWizard"

-            icon="$nl$/icons/etool16/exp_deployplug.gif"

-            id="org.eclipse.pde.ui.pluginExportWizard"

-            name="%PluginExportWizard.label">

-         <description>

-            %PluginExportWizard.description

-         </description>

-         <selection

-               name="plugin.xml"

-               class="org.eclipse.core.resources.IFile">

-         </selection>

-         <selection

-               name="fragment.xml"

-               class="org.eclipse.core.resources.IFile">

-         </selection>

-         <selection

-               class="org.eclipse.core.resources.IProject">

-         </selection>

-      </wizard>

-      <wizard

-            category="org.eclipse.pde.ui.PluginDevelopment"

-            class="org.eclipse.pde.internal.ui.wizards.exports.FeatureExportWizard"

-            icon="$nl$/icons/etool16/exp_deployfeat.gif"

-            id="org.eclipse.pde.ui.featureExportWizard"

-            name="%FeatureExportWizard.label">

-         <description>

-            %FeatureExportWizard.description

-         </description>

-         <selection

-               name="feature.xml"

-               class="org.eclipse.core.resources.IFile">

-         </selection>

-         <selection

-               class="org.eclipse.core.resources.IProject">

-         </selection>

-      </wizard>

-      <wizard

-            category="org.eclipse.pde.ui.PluginDevelopment"

-            class="org.eclipse.pde.internal.ui.wizards.exports.ProductExportWizard"

-            icon="$nl$/icons/etool16/exp_product.gif"

-            id="org.eclipse.pde.ui.productExportWizard"

-            name="%ProductExportWizard.label">

-         <description>

-            %ProductExportWizard.description

-         </description>

-         <selection

-               name="*.product"

-               class="org.eclipse.core.resources.IFile">

-         </selection>

-      </wizard>

-      <category

-            id="org.eclipse.pde.ui.PluginDevelopment"

-            name="%PluginImportExport.category"/>

-   </extension>

-   <extension

-         point="org.eclipse.pde.ui.pluginContent">

-      <wizard

-            name="%pluginContent.helloWorld.name"

-            icon="$nl$/icons/etool16/newexprj_wiz.gif"

-            class="org.eclipse.pde.internal.ui.wizards.templates.HelloWorldNewWizard"

-            id="org.eclipse.pde.ui.pluginContent.helloWorld">

-         <description>

-            %pluginContent.helloWorld.description

-         </description>

-      </wizard>

-      <wizard

-            name="%pluginContent.intro.name"

-            icon="$nl$/icons/etool16/newexprj_wiz.gif"

-            class="org.eclipse.pde.internal.ui.wizards.templates.IntroNewWizard"

-            id="org.eclipse.pde.ui.pluginContent.intro"

-            rcp="true">

-         <description>

-            %pluginContent.intro.description

-         </description>

-      </wizard>

-      <wizard

-            name="%pluginContent.mail.name"

-            icon="$nl$/icons/etool16/newexprj_wiz.gif"

-            class="org.eclipse.pde.internal.ui.wizards.templates.MailNewWizard"

-            id="org.eclipse.pde.ui.pluginContent.rcpmail"

-            rcp="true">

-         <description>

-            %pluginContent.mail.description

-         </description>

-      </wizard>

-      <wizard

-            name="%pluginContent.helloRCP.name"

-            icon="$nl$/icons/etool16/newexprj_wiz.gif"

-            class="org.eclipse.pde.internal.ui.wizards.templates.HelloRCPNewWizard"

-            id="org.eclipse.pde.ui.pluginContent.helloRCP"

-            rcp="true">

-         <description>

-            %pluginContent.helloRCP.description

-         </description>

-      </wizard>

-      <wizard

-            class="org.eclipse.pde.internal.ui.wizards.templates.HelloNonUIRCPNewWizard"

-            icon="$nl$/icons/etool16/newexprj_wiz.gif"

-            id="org.eclipse.pde.ui.pluginContent.helloNonUIRCP"

-            name="%pluginContent.helloNonUIRCP.name"

-            rcp="true"

-            ui-content="false">

-         <description>

-         	%pluginContent.helloNonUIRCP.description

-         </description>

-      </wizard>

-      <wizard

-            class="org.eclipse.pde.internal.ui.wizards.templates.HelloOSGiNewWizard"

-            icon="$nl$/icons/etool16/newexprj_wiz.gif"

-            id="org.eclipse.pde.ui.pluginContent.helloOSGi"

-            name="%pluginContent.helloOSGi.name"

-            pureOSGi="true"

-            requiresActivator="true"

-            ui-content="false">

-         <description>

-         	%pluginContent.helloOSGi.description

-         </description>

-      </wizard>

-      <wizard

-            name="%pluginContent.viewRCP.name"

-            icon="$nl$/icons/etool16/newexprj_wiz.gif"

-            class="org.eclipse.pde.internal.ui.wizards.templates.ViewRCPNewWizard"

-            id="org.eclipse.pde.ui.pluginContent.viewRCP"

-            rcp="true">

-         <description>

-            %pluginContent.viewRCP.description

-         </description>

-      </wizard>

-      <wizard

-            name="%pluginContent.view.name"

-            icon="$nl$/icons/etool16/newexprj_wiz.gif"

-            class="org.eclipse.pde.internal.ui.wizards.templates.ViewNewWizard"

-            id="org.eclipse.pde.ui.pluginContent.view">

-         <description>

-            %pluginContent.view.description

-         </description>

-      </wizard>

-      <wizard

-            name="%pluginContent.multiPageEditor.name"

-            icon="$nl$/icons/etool16/newexprj_wiz.gif"

-            class="org.eclipse.pde.internal.ui.wizards.templates.MultiPageEditorNewWizard"

-            id="org.eclipse.pde.ui.pluginContent.multiPageEditor">

-         <description>

-            %pluginContent.multiPageEditor.description

-         </description>

-      </wizard>

-      <wizard

-            name="%pluginContent.choice.name"

-            icon="$nl$/icons/etool16/script_wiz.gif"

-            class="org.eclipse.pde.internal.ui.wizards.templates.NewPluginTemplateChoiceWizard"

-            id="org.eclipse.pde.ui.pluginContent.choice">

-         <description>

-            %pluginContent.choice.description

-         </description>

-      </wizard>

-      <wizard

-            name="%pluginContent.propertyPages.name"

-            icon="$nl$/icons/etool16/newexprj_wiz.gif"

-            class="org.eclipse.pde.internal.ui.wizards.templates.PropertyPageNewWizard"

-            id="org.eclipse.pde.ui.pluginContent.propertyPages">

-         <description>

-            %pluginContent.propertyPages.description

-         </description>

-      </wizard>

-      <wizard

-            name="%pluginContent.popupMenus.name"

-            icon="$nl$/icons/etool16/newexprj_wiz.gif"

-            class="org.eclipse.pde.internal.ui.wizards.templates.PopupMenuNewWizard"

-            id="org.eclipse.pde.ui.pluginContent.popupMenus">

-         <description>

-            %pluginContent.popupMenus.description

-         </description>

-      </wizard>

-      <wizard

-            name="%pluginContent.editor.name"

-            icon="$nl$/icons/etool16/newexprj_wiz.gif"

-            class="org.eclipse.pde.internal.ui.wizards.templates.EditorNewWizard"

-            id="org.eclipse.pde.ui.pluginContent.editor">

-         <description>

-            %pluginContent.editor.description

-         </description>

-      </wizard>

-      <wizard

-            name="%pluginContent.builder.name"

-            icon="$nl$/icons/etool16/newexprj_wiz.gif"

-            class="org.eclipse.pde.internal.ui.wizards.templates.BuilderNewWizard"

-            id="org.eclipse.pde.ui.pluginContent.builder">

-         <description>

-            %pluginContent.builder.description

-         </description>

-      </wizard>

-   </extension>

-   <extension

-         point="org.eclipse.pde.ui.newExtension">

-      <category

-            name="%newExtension.templates"

-            id="templates">

-      </category>

-      <wizard

-            name="%newExtension.templates.hello.name"

-            template="org.eclipse.pde.ui.templates.helloWorld"

-            icon="$nl$/icons/etool16/newex_wiz.gif"

-            category="templates"

-            id="org.eclipse.pde.ui.newExtension.hello">

-         <description>

-            %newExtension.templates.hello.desc

-         </description>

-      </wizard>

-      <wizard

-            name="%newExtension.templates.view.name"

-            template="org.eclipse.pde.ui.templates.view"

-            icon="$nl$/icons/etool16/newex_wiz.gif"

-            category="templates"

-            id="org.eclipse.pde.ui.newExtension.view">

-         <description>

-            %newExtension.templates.view.desc

-         </description>

-      </wizard>

-      <wizard

-            name="%newExtension.templates.multiPageEditor.name"

-            template="org.eclipse.pde.ui.templates.multiPageEditor"

-            icon="$nl$/icons/etool16/newex_wiz.gif"

-            category="templates"

-            id="org.eclipse.pde.ui.newExtension.multiPageEditor">

-         <description>

-            %newExtension.templates.multiPageEditor.desc

-         </description>

-      </wizard>

-      <wizard

-            availableAsShortcut="true"

-            name="%newExtension.templates.newWizard.name"

-            template="org.eclipse.pde.ui.templates.new"

-            icon="$nl$/icons/etool16/newex_wiz.gif"

-            category="templates"

-            id="org.eclipse.pde.ui.newExtension.newWizard">

-         <description>

-            %newExtension.templates.newWizard.desc

-         </description>

-      </wizard>

-      <wizard

-            availableAsShortcut="true"

-            name="%newExtension.templates.preferences.name"

-            template="org.eclipse.pde.ui.templates.preferences"

-            icon="$nl$/icons/etool16/newex_wiz.gif"

-            category="templates"

-            id="org.eclipse.pde.ui.newExtension.preferences">

-         <description>

-            %newExtension.templates.preferences.desc

-         </description>

-      </wizard>

-      <wizard

-            availableAsShortcut="true"

-            name="%newExtension.templates.propertyPages.name"

-            template="org.eclipse.pde.ui.templates.propertyPage"

-            icon="$nl$/icons/etool16/newex_wiz.gif"

-            category="templates"

-            id="org.eclipse.pde.ui.newExtension.propertyPages">

-         <description>

-            %newExtension.templates.propertyPages.desc

-         </description>

-      </wizard>

-      <wizard

-            availableAsShortcut="true"

-            name="%newExtension.templates.popupMenus.name"

-            template="org.eclipse.pde.ui.templates.popup"

-            icon="$nl$/icons/etool16/newex_wiz.gif"

-            category="templates"

-            id="org.eclipse.pde.ui.newExtension.popupMenus">

-         <description>

-            %newExtension.templates.popupMenus.desc

-         </description>

-      </wizard>

-      <wizard

-            availableAsShortcut="true"

-            name="%newExtension.templates.editor.name"

-            template="org.eclipse.pde.ui.templates.editor"

-            icon="$nl$/icons/etool16/newex_wiz.gif"

-            category="templates"

-            id="org.eclipse.pde.ui.newExtension.editor">

-         <description>

-            %newExtension.templates.editor.desc

-         </description>

-      </wizard>

-      <wizard

-            availableAsShortcut="true"

-            name="%newExtension.templates.help.name"

-            template="org.eclipse.pde.ui.templates.help"

-            icon="$nl$/icons/etool16/newex_wiz.gif"

-            category="templates"

-            id="org.eclipse.pde.ui.newExtension.help">

-         <description>

-            %newExtension.templates.help.desc

-         </description>

-      </wizard>

-      <wizard

-            class="org.eclipse.pde.internal.ui.wizards.templates.BuilderNewExtensionWizard"

-            icon="$nl$/icons/etool16/newex_wiz.gif"

-            category="templates"

-            availableAsShortcut="true"

-            name="%newExtension.templates.builder.name"

-            id="org.eclipse.pde.ui.newExtension.builder">

-         <description>

-            %newExtension.templates.builder.desc

-         </description>

-      </wizard>

-   </extension>

-   <extension

-         point="org.eclipse.ui.editors">

-      <editor

-            default="true"

-            name="%editors.pluginManifest.name"

-            icon="$nl$/icons/obj16/plugin_mf_obj.gif"

-            class="org.eclipse.pde.internal.ui.editor.plugin.ManifestEditor"

-            contributorClass="org.eclipse.pde.internal.ui.editor.plugin.ManifestEditorContributor"

-			matchingStrategy="org.eclipse.pde.internal.ui.editor.plugin.ManifestEditorMatchingStrategy"

-            id="org.eclipse.pde.ui.manifestEditor">

-            <contentTypeBinding contentTypeId="org.eclipse.pde.pluginManifest"/>

-            <contentTypeBinding contentTypeId="org.eclipse.pde.fragmentManifest"/>

-            <contentTypeBinding contentTypeId="org.eclipse.pde.bundleManifest"/>            

-      </editor>

-      <editor

-            default="true"

-            name="%editors.schema.name"

-            icon="$nl$/icons/obj16/schema_obj.gif"

-            class="org.eclipse.pde.internal.ui.editor.schema.SchemaEditor"

-            contributorClass="org.eclipse.pde.internal.ui.editor.schema.SchemaEditorContributor"

-            id="org.eclipse.pde.ui.schemaEditor">

-            <contentTypeBinding contentTypeId="org.eclipse.pde.schema"/>

-      </editor>

-	  <editor

-	        default="true"

-			name="%editors.buildProperties.name"

-			icon="$nl$/icons/obj16/build_exec.gif"

-			contributorClass="org.eclipse.pde.internal.ui.editor.build.BuildEditorContributor"

-			class="org.eclipse.pde.internal.ui.editor.build.BuildEditor"

-			id="org.eclipse.pde.ui.buildEditor">

-			<contentTypeBinding contentTypeId="org.eclipse.pde.buildProperties"/>

-	  </editor>

-      <editor

-            default="true"

-            name="%editors.featureManifest.name"

-            icon="$nl$/icons/obj16/ftr_xml_obj.gif"

-            class="org.eclipse.pde.internal.ui.editor.feature.FeatureEditor"

-            contributorClass="org.eclipse.pde.internal.ui.editor.feature.FeatureEditorContributor"

-			matchingStrategy="org.eclipse.pde.internal.ui.editor.feature.FeatureEditorMatchingStrategy"

-            id="org.eclipse.pde.ui.featureEditor">

-            <contentTypeBinding contentTypeId="org.eclipse.pde.featureManifest"/>

-      </editor>

-      <editor

-            default="true"

-            name="%editors.siteManifest.name"

-            icon="$nl$/icons/obj16/site_xml_obj.gif"

-            class="org.eclipse.pde.internal.ui.editor.site.SiteEditor"

-            contributorClass="org.eclipse.pde.internal.ui.editor.site.SiteEditorContributor"

-            id="org.eclipse.pde.ui.siteEditor">

-            <contentTypeBinding contentTypeId="org.eclipse.pde.siteManifest"/>

-     </editor>

-      <editor

-            default="true"

-            name="%product.editor"

-            icon="$nl$/icons/obj16/product_xml_obj.gif"

-            class="org.eclipse.pde.internal.ui.editor.product.ProductEditor"

-            contributorClass="org.eclipse.pde.internal.ui.editor.product.ProductEditorContributor"

-            id="org.eclipse.pde.ui.productEditor">

-            <contentTypeBinding contentTypeId="org.eclipse.pde.productFile"/>

-      </editor>

-      <editor

-            name="%editors.sample.name"

-            default="true"

-            icon="$nl$/icons/obj16/build_exec.gif"

-            filenames="sample.properties"

-            class="org.eclipse.pde.ui.internal.samples.SampleEditor"

-            id="org.eclipse.pde.ui.sampleEditor">

-      </editor>

-   </extension>

-   <extension

-         point="org.eclipse.ui.views">

-      <category

-            name="%views.category.name"

-            id="org.eclipse.pde.ui">

-      </category>

-      <view

-            name="%views.plugins.name"

-            icon="$nl$/icons/eview16/plugin_depend.gif"

-            category="org.eclipse.pde.ui"

-            class="org.eclipse.pde.internal.ui.view.PluginsView"

-            id="org.eclipse.pde.ui.PluginsView">

-      </view>

-      <view

-            name="%views.dependencies.name"

-            icon="$nl$/icons/obj16/req_plugins_obj.gif"

-            category="org.eclipse.pde.ui"

-            class="org.eclipse.pde.internal.ui.view.DependenciesView"

-            id="org.eclipse.pde.ui.DependenciesView">

-      </view>

-   </extension>

-   <extension

-         point="org.eclipse.ui.commands">

-      <command

-            name="%ViewCommand.pluginsView.name"

-            description="%ViewCommand.pluginsView.description"

-            categoryId="org.eclipse.ui.category.views"

-            id="org.eclipse.pde.ui.PluginsView">

-      </command>

-      <command

-            name="%ViewCommand.dependenciesView.name"

-            description="%ViewCommand.dependenciesView.description"

-            categoryId="org.eclipse.ui.category.views"

-            id="org.eclipse.pde.ui.DependenciesView">

-      </command>

-<!-- launch shortcuts -->

-      <command

-            name="%EclipseApplicationShortcut.description.debug"

-            description="%EclipseApplicationShortcut.description.debug"

-            categoryId="org.eclipse.debug.ui.category.run"

-            id="org.eclipse.pde.ui.runtimeWorkbenchShortcut.debug">

-      </command>    

-      <command

-            name="%EclipseApplicationShortcut.description.run"

-            description="%EclipseApplicationShortcut.description.run"

-            categoryId="org.eclipse.debug.ui.category.run"

-            id="org.eclipse.pde.ui.runtimeWorkbenchShortcut.run">

-      </command>    

-      <command

-            name="%EquinoxShortcut.description.debug"

-            description="%EquinoxShortcut.description.debug"

-            categoryId="org.eclipse.debug.ui.category.run"

-            id="org.eclipse.pde.ui.EquinoxLaunchShortcut.debug">

-      </command>    

-      <command

-            name="%EquinoxShortcut.description.run"

-            description="%EquinoxShortcut.description.run"

-            categoryId="org.eclipse.debug.ui.category.run"

-            id="org.eclipse.pde.ui.EquinoxLaunchShortcut.run">

-      </command>    

-      <command

-            name="%JUnitApplicationShortcut.description.debug"

-            description="%JUnitApplicationShortcut.description.debug"

-            categoryId="org.eclipse.debug.ui.category.run"

-            id="org.eclipse.pde.ui.junitWorkbenchShortcut.debug">

-      </command>    

-      <command

-            name="%JUnitApplicationShortcut.description.run"

-            description="%JUnitApplicationShortcut.description.run"

-            categoryId="org.eclipse.debug.ui.category.run"

-            id="org.eclipse.pde.ui.junitWorkbenchShortcut.run">

-      </command>     

-      <command

-            name="%SWTApplicationShortcut.description.debug"

-            description="%SWTApplicationShortcut.description.debug"

-            categoryId="org.eclipse.debug.ui.category.run"

-            id="org.eclipse.pde.ui.swtLaunchShortcut.debug">

-      </command>    

-      <command

-            name="%SWTApplicationShortcut.description.run"

-            description="%SWTApplicationShortcut.description.run"

-            categoryId="org.eclipse.debug.ui.category.run"

-            id="org.eclipse.pde.ui.swtLaunchShortcut.run">

-      </command>    

-   </extension>

-   <extension

-         point="org.eclipse.ui.popupMenus">

-      <objectContribution

-            objectClass="org.eclipse.core.resources.IFile"

-            nameFilter="feature.xml"

-            id="org.eclipse.pde.ui.featureToolSet">

-         <menu

-               label="%org.eclipse.pde.ui.tools"

-               id="org.eclipse.pde.ui.feature.tools">

-            <separator

-                  name="group0">

-            </separator>

-         </menu>

-         <filter

-               name="projectNature"

-               value="org.eclipse.pde.FeatureNature">

-         </filter>

-         <action

-               label="%popupMenus.createJar.label"

-               helpContextId="org.eclipse.pde.doc.user.create_feature_jars"

-               class="org.eclipse.pde.internal.ui.build.BuildFeatureAction"

-               menubarPath="org.eclipse.pde.ui.feature.tools/group0"

-               enablesFor="1"

-               id="org.eclipse.pde.ui.BuildFeatureJar">

-         </action>

-      </objectContribution>

-      <objectContribution

-            objectClass="org.eclipse.core.resources.IFile"

-            nameFilter="plugin.xml"

-            id="org.eclipse.pde.ui.pluginToolSet">

-         <menu

-               label="%org.eclipse.pde.ui.tools"

-               id="org.eclipse.pde.ui.plugin.tools">

-            <separator

-                  name="group0">

-            </separator>

-            <separator

-                  name="group1">

-            </separator>

-            <separator

-                  name="group2">

-            </separator>

-         </menu>

-         <action

-               label="%PluginSearch.references"

-               helpContextId="org.eclipse.pde.doc.user.find_references"

-               class="org.eclipse.pde.internal.ui.search.FindPluginReferencesAction"

-               menubarPath="org.eclipse.pde.ui.plugin.tools/group0"

-               enablesFor="1"

-               id="org.eclipse.pde.ui.SearchReferences">

-         </action>

-         <action

-               label="%OpenDependenciesAction.label"

-               helpContextId="org.eclipse.pde.doc.user.open_dependencies"

-               class="org.eclipse.pde.internal.ui.view.OpenDependenciesAction"

-               menubarPath="org.eclipse.pde.ui.plugin.tools/group0"

-               enablesFor="+"

-               id="org.eclipse.pde.ui.OpenDependenciesAction1">

-         </action>

-         <action

-               label="%UpdateClasspathAction.label"

-               helpContextId="org.eclipse.pde.doc.user.update_classpath"

-               class="org.eclipse.pde.internal.ui.wizards.tools.UpdateClasspathAction"

-               menubarPath="org.eclipse.pde.ui.plugin.tools/group0"

-               enablesFor="+"

-               id="org.eclipse.pde.ui.UpdateClasspathAction1">

-         </action>

-         <action

-               label="%ExternalizeStrings.label"

-               helpContextId="org.eclipse.pde.doc.user.externalize_strings"

-               class="org.eclipse.pde.internal.ui.nls.GetNonExternalizedStringsAction"

-               menubarPath="org.eclipse.pde.ui.plugin.tools/group0"

-               enablesFor="+"

-               id="org.eclipse.pde.ui.ExternalizeStrings">

-         </action> 

-         <action

-               label="%MigrationAction.label"

-               class="org.eclipse.pde.internal.ui.wizards.tools.MigrationAction"

-               helpContextId="org.eclipse.pde.doc.user.migrate_action"

-               menubarPath="org.eclipse.pde.ui.plugin.tools/group1"

-               enablesFor="+"

-               id="org.eclipse.pde.ui.MigrationAction1">

-         </action>

-         <action

-               label="%popupMenus.buildPlugin.label"

-               helpContextId="org.eclipse.pde.doc.user.create_plugin_jars"

-               class="org.eclipse.pde.internal.ui.build.BuildPluginAction"

-               menubarPath="org.eclipse.pde.ui.plugin.tools/group2"

-               enablesFor="1"

-               id="org.eclipse.pde.ui.BuildPluginAction">

-         </action>

-         <action

-               label="%popupMenus.createHelpIndex.label"

-               helpContextId="org.eclipse.pde.doc.user.create_help_index"

-               class="org.eclipse.pde.internal.ui.wizards.tools.CreateHelpIndexAction"

-               menubarPath="org.eclipse.pde.ui.plugin.tools/group2"

-               enablesFor="1"

-               id="org.eclipse.pde.ui.CreateHelpIndexAction">

-         </action>         

-      </objectContribution>

-      <objectContribution

-            objectClass="org.eclipse.core.resources.IFile"

-            nameFilter="manifest.mf"

-            id="org.eclipse.pde.ui.manifestToolSet">

-         <menu

-               label="%org.eclipse.pde.ui.tools"

-               id="org.eclipse.pde.ui.manifest.tools">

-            <separator

-                  name="group0">

-            </separator>

-            <separator

-                  name="group1">

-            </separator>

-         </menu>

-         <action

-               label="%PluginSearch.references"

-               helpContextId="org.eclipse.pde.doc.user.find_references"

-               class="org.eclipse.pde.internal.ui.search.FindPluginReferencesAction"

-               menubarPath="org.eclipse.pde.ui.manifest.tools/group0"

-               enablesFor="1"

-               id="org.eclipse.pde.ui.SearchReferences">

-         </action>

-         <action

-               label="%OpenDependenciesAction.label"

-               helpContextId="org.eclipse.pde.doc.user.open_dependencies"

-               class="org.eclipse.pde.internal.ui.view.OpenDependenciesAction"

-               menubarPath="org.eclipse.pde.ui.manifest.tools/group0"

-               enablesFor="+"

-               id="org.eclipse.pde.ui.OpenDependenciesAction3">

-         </action>

-         <action

-               label="%UpdateClasspathAction.label"

-               helpContextId="org.eclipse.pde.doc.user.update_classpath"

-               class="org.eclipse.pde.internal.ui.wizards.tools.UpdateClasspathAction"

-               menubarPath="org.eclipse.pde.ui.manifest.tools/group0"

-               enablesFor="+"

-               id="org.eclipse.pde.ui.UpdateClasspathAction3">

-         </action>

-         <action

-               label="%ExternalizeStrings.label"

-               helpContextId="org.eclipse.pde.doc.user.externalize_strings"

-               class="org.eclipse.pde.internal.ui.nls.GetNonExternalizedStringsAction"

-               menubarPath="org.eclipse.pde.ui.manifest.tools/group0"

-               enablesFor="+"

-               id="org.eclipse.pde.ui.ExternalizeStrings">

-         </action> 

-         <action

-               label="%popupMenus.buildPlugin.label"

-               helpContextId="org.eclipse.pde.doc.user.create_plugin_jars"

-               class="org.eclipse.pde.internal.ui.build.BuildPluginAction"

-               menubarPath="org.eclipse.pde.ui.manifest.tools/group1"

-               enablesFor="1"

-               id="org.eclipse.pde.ui.BuildPluginAction2">

-         </action>

-         <action

-               label="%popupMenus.createHelpIndex.label"

-               helpContextId="org.eclipse.pde.doc.user.create_help_index"

-               class="org.eclipse.pde.internal.ui.wizards.tools.CreateHelpIndexAction"

-               menubarPath="org.eclipse.pde.ui.manifest.tools/group1"

-               enablesFor="1"

-               id="org.eclipse.pde.ui.CreateHelpIndexAction">

-         </action>         

-      </objectContribution>

-      <objectContribution

-            objectClass="org.eclipse.core.resources.IFile"

-            nameFilter="fragment.xml"

-            id="org.eclipse.pde.ui.fragmentToolSet">

-         <menu

-               label="%org.eclipse.pde.ui.tools"

-               id="org.eclipse.pde.ui.fragment.tools">

-            <separator

-                  name="group0">

-            </separator>

-            <separator

-                  name="group1">

-            </separator>

-            <separator

-                  name="group2">

-            </separator>

-         </menu>

-         <action

-               label="%OpenDependenciesAction.label"

-               helpContextId="org.eclipse.pde.doc.user.open_dependencies"

-               class="org.eclipse.pde.internal.ui.view.OpenDependenciesAction"

-               menubarPath="org.eclipse.pde.ui.fragment.tools/group0"

-               enablesFor="+"

-               id="org.eclipse.pde.ui.OpenDependenciesAction2">

-         </action>

-         <action

-               label="%UpdateClasspathAction.label"

-               helpContextId="org.eclipse.pde.doc.user.update_classpath"

-               class="org.eclipse.pde.internal.ui.wizards.tools.UpdateClasspathAction"

-               menubarPath="org.eclipse.pde.ui.fragment.tools/group0"

-               enablesFor="+"

-               id="org.eclipse.pde.ui.UpdateClasspathAction2">

-         </action>

-         <action

-               label="%ExternalizeStrings.label"

-               helpContextId="org.eclipse.pde.doc.user.externalize_strings"

-               class="org.eclipse.pde.internal.ui.nls.GetNonExternalizedStringsAction"

-               menubarPath="org.eclipse.pde.ui.fragment.tools/group0"

-               enablesFor="+"

-               id="org.eclipse.pde.ui.ExternalizeStrings">

-         </action> 

-         <action

-               label="%MigrationAction.label"

-               class="org.eclipse.pde.internal.ui.wizards.tools.MigrationAction"

-               helpContextId="org.eclipse.pde.doc.user.migrate_action"

-               menubarPath="org.eclipse.pde.ui.fragment.tools/group1"

-               enablesFor="+"

-               id="org.eclipse.pde.ui.MigrationAction2">

-         </action>

-         <action

-               label="%popupMenus.buildFragment.label"

-               helpContextId="org.eclipse.pde.doc.user.create_fragment_jars"

-               class="org.eclipse.pde.internal.ui.build.BuildPluginAction"

-               menubarPath="org.eclipse.pde.ui.fragment.tools/group2"

-               enablesFor="1"

-               id="org.eclipse.pde.ui.BuildFragmentAction">

-         </action>

-         <action

-               label="%popupMenus.createHelpIndex.label"

-               helpContextId="org.eclipse.pde.doc.user.create_help_index"

-               class="org.eclipse.pde.internal.ui.wizards.tools.CreateHelpIndexAction"

-               menubarPath="org.eclipse.pde.ui.fragment.tools/group2"

-               enablesFor="1"

-               id="org.eclipse.pde.ui.CreateHelpIndexAction">

-         </action>         

-      </objectContribution>

-      <objectContribution

-            objectClass="org.eclipse.core.resources.IFile"

-            nameFilter="site.xml"

-            id="org.eclipse.pde.ui.siteToolSet">

-         <menu

-               label="%org.eclipse.pde.ui.tools"

-               id="org.eclipse.pde.ui.site.tools">

-            <separator

-                  name="group0">

-            </separator>

-         </menu>

-         <action

-               label="%popupMenus.buildSite.label"

-               helpContextId="org.eclipse.pde.doc.user.build_site"

-               class="org.eclipse.pde.internal.ui.build.BuildSiteAction"

-               menubarPath="org.eclipse.pde.ui.site.tools/group0"

-               enablesFor="1"

-               id="org.eclipse.pde.ui.BuildSiteAction">

-         </action>

-      </objectContribution>

-      <objectContribution

-            objectClass="org.eclipse.core.resources.IProject"

-            adaptable="true"

-            id="org.eclipse.pde.ui.pluginProjectToolSet">

-         <menu

-               label="%org.eclipse.pde.ui.tools"

-               id="org.eclipse.pde.ui.project.tools">

-            <separator

-               name="group0">

-            </separator>

-         </menu>

-       	 <visibility>

-        	<not>

-        	<or>

-            <objectState 

-	            name="projectNature" 

-	            value="org.eclipse.pde.PluginNature"/>

-            <objectState 

-	            name="projectNature" 

-	            value="org.eclipse.pde.FeatureNature"/>

-            <objectState 

-	            name="projectNature" 

-	            value="org.eclipse.pde.UpdateSiteNature"/>

-	        <objectState

-	        	name="open"

-	        	value="false"/>

-            </or>

-            </not>

-       	 </visibility>

-

-         <action

-            label="%new.convert.name"

-            class="org.eclipse.pde.internal.ui.wizards.tools.ConvertProjectsAction"

-            menubarPath="org.eclipse.pde.ui.project.tools/group0"

-            enablesFor="+"

-            id="org.eclipse.pde.ui.ConvertedProjectWizard">

-      	</action>

-      </objectContribution>

-      <objectContribution

-            objectClass="org.eclipse.core.resources.IProject"

-            adaptable="true"

-            id="org.eclipse.pde.ui.pluginProjectToolSet">

-         <menu

-               label="%org.eclipse.pde.ui.tools"

-               id="org.eclipse.pde.ui.project.tools">

-            <separator

-                  name="group0">

-            </separator>

-            <separator

-                  name="group1">

-            </separator>

-         </menu>

-         <filter

-               name="projectNature"

-		       value="org.eclipse.pde.PluginNature">

-         </filter>

-         <action

-               label="%OpenDependenciesAction.label"

-               helpContextId="org.eclipse.pde.doc.user.open_dependencies"

-               class="org.eclipse.pde.internal.ui.view.OpenDependenciesAction"

-               menubarPath="org.eclipse.pde.ui.project.tools/group0"

-               enablesFor="+"

-               id="org.eclipse.pde.ui.OpenDependenciesAction3">

-         </action>

-         <action

-               label="%UpdateClasspathAction.label"

-               helpContextId="org.eclipse.pde.doc.user.update_classpath"

-               class="org.eclipse.pde.internal.ui.wizards.tools.UpdateClasspathAction"

-               menubarPath="org.eclipse.pde.ui.project.tools/group0"

-               enablesFor="*"

-               id="org.eclipse.pde.ui.UpdateClasspathAction3">

-         </action>

-         <action

-               label="%ExternalizeStrings.label"

-               helpContextId="org.eclipse.pde.doc.user.externalize_strings"

-               class="org.eclipse.pde.internal.ui.nls.GetNonExternalizedStringsAction"

-               menubarPath="org.eclipse.pde.ui.project.tools/group0"

-               enablesFor="+"

-               id="org.eclipse.pde.ui.ExternalizeStrings">

-         </action> 

-         <action

-               label="%MigrationAction.label"

-               class="org.eclipse.pde.internal.ui.wizards.tools.MigrationAction"

-               helpContextId="org.eclipse.pde.doc.user.migrate_action"

-               menubarPath="org.eclipse.pde.ui.project.tools/group1"

-               enablesFor="+"

-               id="org.eclipse.pde.ui.MigrationAction3">

-         </action>

-      </objectContribution>

-      <objectContribution

-            objectClass="org.eclipse.core.resources.IFile"

-            nameFilter="*.mxsd"

-            id="org.eclipse.pde.ui.PreviewReference1">

-         <menu

-               label="%org.eclipse.pde.ui.tools"

-               id="org.eclipse.pde.ui.schema.mxsd.tools">

-            <separator

-                  name="group0">

-            </separator>

-         </menu>

-         <action

-               label="%PreviewReference.label"

-               helpContextId="org.eclipse.pde.doc.user.preview_schema"

-               class="org.eclipse.pde.internal.ui.search.PreviewReferenceAction"

-               menubarPath="org.eclipse.pde.ui.schema.mxsd.tools/group0"

-               enablesFor="1"

-               id="org.eclipse.pde.ui.PreviewReference">

-         </action>

-      </objectContribution>

-      <objectContribution

-            objectClass="org.eclipse.core.resources.IFile"

-            nameFilter="*.exsd"

-            id="org.eclipse.pde.ui.schema.exsd.tools">

-         <menu

-               label="%org.eclipse.pde.ui.tools"

-               id="org.eclipse.pde.ui.schema.exsd.tools">

-            <separator

-                  name="group0">

-            </separator>

-         </menu>

-         <action

-               label="%PreviewReference.label"

-               helpContextId="org.eclipse.pde.doc.user.preview_schema"

-               class="org.eclipse.pde.internal.ui.search.PreviewReferenceAction"

-               menubarPath="org.eclipse.pde.ui.schema.exsd.tools/group0"

-               enablesFor="1"

-               id="org.eclipse.pde.ui.PreviewReference2">

-         </action>

-      </objectContribution>

-   </extension>

-   <extension

-         point="org.eclipse.debug.core.launchConfigurationTypes">

-      <launchConfigurationType

-            sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"

-            name="%launchConfigurationType.name"

-            sourcePathComputerId="org.eclipse.jdt.launching.sourceLookup.javaSourcePathComputer"

-            delegate="org.eclipse.pde.ui.launcher.EclipseApplicationLaunchConfiguration"

-            modes="run, debug"

-            id="org.eclipse.pde.ui.RuntimeWorkbench">

-      </launchConfigurationType>

-      <launchConfigurationType

-            sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"

-            name="%launcher.framework.name"

-            sourcePathComputerId="org.eclipse.jdt.launching.sourceLookup.javaSourcePathComputer"

-            delegate="org.eclipse.pde.ui.launcher.EquinoxLaunchConfiguration"

-            modes="run, debug"

-            id="org.eclipse.pde.ui.EquinoxLauncher">

-      </launchConfigurationType>

-      <launchConfigurationType

-            sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"

-            name="%launcher.swt.name"

-            sourcePathComputerId="org.eclipse.pde.ui.swtSourcePathComputer"

-            delegate="org.eclipse.pde.internal.ui.launcher.SWTLaunchConfiguration"

-            modes="run, debug"

-            id="org.eclipse.pde.ui.swtLaunchConfig">

-      </launchConfigurationType>

-      <launchConfigurationType

-            sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"

-            name="%launcher.junit.name"

-            sourcePathComputerId="org.eclipse.jdt.launching.sourceLookup.javaSourcePathComputer"

-            delegate="org.eclipse.pde.internal.ui.launcher.JUnitLaunchConfiguration"

-            modes="run, debug"

-            id="org.eclipse.pde.ui.JunitLaunchConfig">

-         <fileExtension

-               default="false"

-               extension="java">

-         </fileExtension>

-         <fileExtension

-               default="false"

-               extension="class">

-         </fileExtension>

-      </launchConfigurationType>

-   </extension>

-   <extension

-         point="org.eclipse.debug.ui.launchConfigurationTypeImages">

-      <launchConfigurationTypeImage

-            icon="$nl$/icons/etool16/eclipse_launcher.gif"

-            configTypeID="org.eclipse.pde.ui.RuntimeWorkbench"

-            id="org.eclipse.pde.ui.runtimeWorkbenchLaunchImage">

-      </launchConfigurationTypeImage>

-      <launchConfigurationTypeImage

-            icon="$nl$/icons/obj16/bundle_obj.gif"

-            configTypeID="org.eclipse.pde.ui.EquinoxLauncher"

-            id="org.eclipse.pde.ui.equinoxFrameworkImage">

-      </launchConfigurationTypeImage>

-      <launchConfigurationTypeImage

-            icon="$nl$/icons/obj16/swt_launcher.gif"

-            configTypeID="org.eclipse.pde.ui.swtLaunchConfig"

-            id="org.eclipse.pde.ui.swtLaunchImage">

-      </launchConfigurationTypeImage>

-      <launchConfigurationTypeImage

-            icon="$nl$/icons/obj16/julaunchpgn.gif"

-            configTypeID="org.eclipse.pde.ui.JunitLaunchConfig"

-            id="org.eclipse.pde.ui.JunitLaunchImage">

-      </launchConfigurationTypeImage>

-   </extension>

-   <extension

-         point="org.eclipse.debug.ui.launchConfigurationTabGroups">

-      <launchConfigurationTabGroup

-            type="org.eclipse.pde.ui.RuntimeWorkbench"

-            class="org.eclipse.pde.internal.ui.launcher.EclipseApplicationLauncherTabGroup"

-            id="org.eclipse.pde.ui.launcher.WorkbenchLauncherTabGroup">

-         <launchMode

-               description="%workbenchLauncherTabGroup.description.debug"

-               perspective="org.eclipse.debug.ui.DebugPerspective"

-               mode="debug">

-         </launchMode>

-         <launchMode

-               description="%workbenchLauncherTabGroup.description.run"

-               mode="run">

-         </launchMode>

-      </launchConfigurationTabGroup>

-      <launchConfigurationTabGroup

-            type="org.eclipse.pde.ui.EquinoxLauncher"

-            class="org.eclipse.pde.internal.ui.launcher.EquinoxLauncherTabGroup"

-            id="org.eclipse.pde.ui.launcher.EquinoxLauncherTabGroup">

-         <launchMode

-               description="%equinoxLauncherTabGroup.description.debug"

-               perspective="org.eclipse.debug.ui.DebugPerspective"

-               mode="debug">

-         </launchMode>

-         <launchMode

-               description="%equinoxLauncherTabGroup.description.run"

-               mode="run">

-         </launchMode>

-      </launchConfigurationTabGroup>

-      <launchConfigurationTabGroup

-            type="org.eclipse.pde.ui.swtLaunchConfig"

-            class="org.eclipse.pde.internal.ui.launcher.SWTLauncherTabGroup"

-            id="org.eclipse.pde.ui.launcher.swtLauncherTabGroup">

-         <launchMode

-               description="%swtLauncherTabGroup.description.debug"

-               perspective="org.eclipse.debug.ui.DebugPerspective"

-               mode="debug">

-         </launchMode>

-         <launchMode

-               description="%swtLauncherTabGroup.description.run"

-               mode="run">

-         </launchMode>

-      </launchConfigurationTabGroup>

-      <launchConfigurationTabGroup

-            type="org.eclipse.pde.ui.JunitLaunchConfig"

-            class="org.eclipse.pde.internal.ui.launcher.JUnitTabGroup"

-            id="org.eclipse.pde.ui.launcher.JUnitTabGroup">

-         <launchMode

-               description="%jUnitTabGroup.description.debug"

-               perspective="org.eclipse.debug.ui.DebugPerspective"

-               mode="debug">

-         </launchMode>

-         <launchMode

-               description="%jUnitTabGroup.description.run"

-               mode="run">

-         </launchMode>

-      </launchConfigurationTabGroup>

-   </extension>

-   <extension

-         point="org.eclipse.jdt.junit.junitLaunchConfigs">

-      <launchConfigType

-            configTypeID="org.eclipse.pde.ui.JunitLaunchConfig">

-      </launchConfigType>

-   </extension>

-   <extension

-         point="org.eclipse.debug.ui.launchShortcuts">

-      <shortcut

-            label="%launcher.junit.name"

-            icon="$nl$/icons/obj16/julaunchpgn.gif"

-            modes="run, debug"

-            class="org.eclipse.pde.internal.ui.launcher.JUnitWorkbenchShortcut"

-            id="org.eclipse.pde.ui.junitWorkbenchShortcut">

-         <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"/>

-                   			<adapt type="org.eclipse.jdt.core.IJavaElement"/>

-                 		</or>

-                 		<test property="org.eclipse.pde.core.PluginNature"/>

-                 		<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>

-         <perspective

-               id="org.eclipse.pde.PDEPerspective">

-         </perspective>

-      </shortcut>

-      <shortcut

-            label="%launcher.shortcut.label"

-            icon="$nl$/icons/etool16/eclipse_launcher.gif"

-            modes="run, debug"

-            class="org.eclipse.pde.internal.ui.launcher.RuntimeWorkbenchShortcut"

-            id="org.eclipse.pde.ui.runtimeWorkbenchShortcut">

-         <enablement>

-           <with variable="selection">

-             <count value="*"/>

-           </with>

-         </enablement>

-         <contextualLaunch>

-            <enablement>

-               <with variable="selection">

-                  <or>

-                  	<and>

-	                  <count value="1"/>

-	                  <iterate>

-		                  <test property="org.eclipse.debug.ui.projectNature" value="org.eclipse.pde.PluginNature"/>

-                   		  <adapt type="org.eclipse.core.resources.IProject"/>

-		              </iterate>

-		            </and>

-		            <count value="0"/>

-		          </or>

-               </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>

-         <perspective

-               id="org.eclipse.pde.PDEPerspective">

-         </perspective>

-      </shortcut>

-      <shortcut

-            label="%Equinox.shortcut.label"

-            icon="$nl$/icons/obj16/bundle_obj.gif"

-            modes="run, debug"

-            class="org.eclipse.pde.internal.ui.launcher.EquinoxLaunchShortcut"

-            id="org.eclipse.pde.ui.EquinoxLaunchShortcut">

-         <enablement>

-           <with variable="selection">

-             <count value="*"/>

-           </with>

-         </enablement>

-         <contextualLaunch>

-            <enablement>

-               <with variable="selection">

-                  <or>

-                  	<and>

-	                  <count value="1"/>

-	                  <iterate>

-		                  <test property="org.eclipse.debug.ui.projectNature" value="org.eclipse.pde.PluginNature"/>

-                   		  <adapt type="org.eclipse.core.resources.IProject"/>

-		              </iterate>

-		            </and>

-		            <count value="0"/>

-		          </or>

-               </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>

-         <perspective

-               id="org.eclipse.pde.PDEPerspective">

-         </perspective>

-      </shortcut>

-      <shortcut

-            label="%launcher.swt.name"

-            icon="$nl$/icons/obj16/swt_launcher.gif"

-            modes="run, debug"

-            class="org.eclipse.pde.internal.ui.launcher.SWTApplicationLaunchShortcut"

-            id="org.eclipse.pde.ui.swtLaunchShortcut">

-         <contextualLaunch>

-           <enablement>

-             <with variable="selection">

-               <count value="1"/>

-               <iterate>

-                 <or>

-                   <test property="org.eclipse.debug.ui.matchesPattern" value="*.java"/>

-                   <test property="org.eclipse.debug.ui.matchesPattern" value="*.class"/>

-                   <adapt type="org.eclipse.jdt.core.IJavaElement"/>

-                 </or>

-                 <test property="org.eclipse.jdt.debug.ui.hasMainType"/>

-               </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.ui.decorators">

-      <decorator

-            lightweight="true"

-            location="TOP_LEFT"

-            adaptable="true"

-            label="%decorator.label"

-            icon="$nl$/icons/ovr16/binary_co.gif"

-            state="false"

-            id="org.eclipse.pde.ui.binaryProjectDecorator">

-         <description>

-            %decorator.desc

-         </description>

-        <enablement>

-            <and>

-               <objectClass

-                     name="org.eclipse.core.resources.IProject">

-               </objectClass>

-               <or>

-                  <and>

-                     <objectState

-                           name="persistentProperty"

-                           value="org.eclipse.pde.core.imported = binary">

-                     </objectState>

-                     <not>

-                        <objectState

-                              name="persistentProperty"

-                              value="org.eclipse.team.core.repository">

-                        </objectState>

-                     </not>

-                  </and>

-                  <objectState

-                        name="persistentProperty"

-                        value="org.eclipse.pde.core.imported = external">

-                  </objectState>

-               </or>

-            </and>

-         </enablement>

-      </decorator>

-   </extension>

-   <extension

-         point="org.eclipse.ui.elementFactories">

-      <factory

-            class="org.eclipse.pde.internal.ui.editor.SystemFileEditorInputFactory"

-            id="org.eclipse.pde.ui.systemFileEditorInputFactory">

-      </factory>

-   </extension>

-   <extension

-         point="org.eclipse.pde.ui.templates">

-      <template

-            contributingId="org.eclipse.ui.actionSets"

-            name="%template.helloWorld.name"

-            class="org.eclipse.pde.internal.ui.wizards.templates.HelloWorldTemplate"

-            id="org.eclipse.pde.ui.templates.helloWorld">

-      </template>

-      <template

-            contributingId="org.eclipse.ui.propertyPages"

-            name="%template.propertyPages.name"

-            class="org.eclipse.pde.internal.ui.wizards.templates.PropertyPageTemplate"

-            id="org.eclipse.pde.ui.templates.propertyPage">

-      </template>

-      <template

-            contributingId="org.eclipse.ui.editors"

-            name="%template.editor.name"

-            class="org.eclipse.pde.internal.ui.wizards.templates.EditorTemplate"

-            id="org.eclipse.pde.ui.templates.editor">

-      </template>

-      <template

-            contributingId="org.eclipse.ui.popupMenus"

-            name="%template.popupMenus.name"

-            class="org.eclipse.pde.internal.ui.wizards.templates.PopupMenuTemplate"

-            id="org.eclipse.pde.ui.templates.popup">

-      </template>

-      <template

-            contributingId="org.eclipse.ui.views"

-            name="%template.view.name"

-            class="org.eclipse.pde.internal.ui.wizards.templates.ViewTemplate"

-            id="org.eclipse.pde.ui.templates.view">

-      </template>

-      <template

-            contributingId="org.eclipse.ui.editors"

-            name="%template.multiPageEditor.name"

-            class="org.eclipse.pde.internal.ui.wizards.templates.MultiPageEditorTemplate"

-            id="org.eclipse.pde.ui.templates.multiPageEditor">

-      </template>

-      <template

-            contributingId="org.eclipse.ui.newWizards"

-            name="%template.newWizard.name"

-            class="org.eclipse.pde.internal.ui.wizards.templates.NewWizardTemplate"

-            id="org.eclipse.pde.ui.templates.new">

-      </template>

-      <template

-            contributingId="org.eclipse.ui.preferencePages"

-            name="%template.preferences.name"

-            class="org.eclipse.pde.internal.ui.wizards.templates.PreferencePageTemplate"

-            id="org.eclipse.pde.ui.templates.preferences">

-      </template>

-      <template

-            contributingId="org.eclipse.help.toc"

-            name="%template.help.name"

-            class="org.eclipse.pde.internal.ui.wizards.templates.HelpTemplate"

-            id="org.eclipse.pde.ui.templates.help">

-      </template>

-   </extension>

-   <extension

-         point="org.eclipse.jdt.ui.javaElementFilters">

-      <filter

-            targetId="org.eclipse.jdt.ui.PackageExplorer"

-            name="%binaryFilter.name"

-            enabled="false"

-            description="%binaryFilter.desc"

-            class="org.eclipse.pde.internal.ui.wizards.imports.BinaryProjectFilter"

-            id="org.eclipse.pde.ui.BinaryProjectFilter1">

-      </filter>

-      <filter

-            targetId="org.eclipse.jdt.ui.ProjectsView"

-            name="%binaryFilter.name"

-            enabled="false"

-            description="%binaryFilter.desc"

-            class="org.eclipse.pde.internal.ui.wizards.imports.BinaryProjectFilter"

-            id="org.eclipse.pde.ui.BinaryProjectFilter2">

-      </filter>

-   </extension>

-   <extension

-         point="org.eclipse.jdt.ui.classpathContainerPage">

-      <classpathContainerPage

-            name="%Plugin.dependencies.container"

-            class="org.eclipse.pde.internal.ui.wizards.RequiredPluginsContainerPage"

-            id="org.eclipse.pde.core.requiredPlugins">

-      </classpathContainerPage>

-   </extension>

-   <extension

-         point="org.eclipse.search.searchPages">

-      <page

-            showScopeSection="true"

-            canSearchEnclosingProjects="true"

-            label="%PluginSearchPage.label"

-            enabled="true"

-            icon="$nl$/icons/obj16/psearch_obj.gif"

-            extensions="xml:90"

-            class="org.eclipse.pde.internal.ui.search.PluginSearchPage"

-            id="org.eclipse.pde.internal.ui.search.SearchPage">

-      </page>

-   </extension>

-   <extension

-         point="org.eclipse.search.searchResultViewPages">

-      <viewPage

-            class="org.eclipse.pde.internal.ui.search.PluginSearchResultPage"

-            searchResultClass="org.eclipse.pde.internal.ui.search.SearchResult"

-            id="org.eclipse.pde.ui.searchResultPage"/>

-      <viewPage

-            class="org.eclipse.pde.internal.ui.search.dependencies.DependencyExtentSearchResultPage"

-            searchResultClass="org.eclipse.pde.internal.ui.search.dependencies.DependencyExtentSearchResult"

-            id="org.eclipse.pde.ui.dependencyExtentResultPage"/>

-   </extension>

-   <extension

-         point="org.eclipse.ant.core.antTasks">

-      <antTask

-            library="pdeuiant.jar"

-            name="pde.exportPlugins"

-            class="org.eclipse.pde.internal.ui.ant.PluginExportTask">

-      </antTask>

-      <antTask

-            library="pdeuiant.jar"

-            name="pde.exportFeatures"

-            class="org.eclipse.pde.internal.ui.ant.FeatureExportTask">

-      </antTask>

-   </extension>

-   <extension

-         point="org.eclipse.ant.core.extraClasspathEntries">

-      <extraClasspathEntry

-            library="pdeuiant.jar">

-      </extraClasspathEntry>

-   </extension>

-   <extension

-         point="org.eclipse.jdt.launching.classpathProviders">

-      <classpathProvider

-            class="org.eclipse.pde.internal.ui.launcher.WorkbenchSourcePathProvider"

-            id="org.eclipse.pde.ui.workbenchClasspathProvider">

-      </classpathProvider>

-   </extension>

-   <extension point="org.eclipse.debug.core.sourcePathComputers">

-   		<sourcePathComputer

-   			id="org.eclipse.pde.ui.swtSourcePathComputer"

-   			class="org.eclipse.pde.internal.ui.launcher.SWTSourcePathComputer">

-   		</sourcePathComputer>

-   </extension>

-   <extension

-         point="org.eclipse.ui.intro.configExtension">

-      <standbyContentPart

-            pluginId="org.eclipse.pde.ui"

-            class="org.eclipse.pde.ui.internal.samples.SampleStandbyContent"

-            id="org.eclipse.pde.ui.sampleStandbyPart">

-      </standbyContentPart>

-   </extension>

-   <extension

-         point="org.eclipse.ui.propertyPages">

-      <page

-            adaptable="true"

-            class="org.eclipse.pde.internal.ui.properties.PluginDevelopmentPage"

-            id="org.eclipse.pde.internal.ui.properties.pluginDevelopmentPage"

-            name="%PropertyPage.pluginDevelopment"

-            objectClass="org.eclipse.core.resources.IProject">

-         <filter

-               name="projectNature"

-               value="org.eclipse.pde.PluginNature"/>

-      </page> 

-      <page

-            objectClass="org.eclipse.core.resources.IProject"

-            adaptable="true"

-            class="org.eclipse.pde.internal.ui.properties.SelfHostingPropertyPage"

-            name="%PropertyPage.selfHosting"

-            category="org.eclipse.pde.internal.ui.properties.pluginDevelopmentPage"

-            id="org.eclipse.pde.internal.ui.properties.selfHostingPropertyPage">

-         <filter

-               name="projectNature"

-               value="org.eclipse.pde.PluginNature">

-         </filter>

-      </page>      

-      <page

-            objectClass="org.eclipse.core.resources.IProject"

-            adaptable="true"

-            class="org.eclipse.pde.internal.ui.properties.CompilersPropertyPage"

-            name="%PropertyPage.compilers"

-            category="org.eclipse.pde.internal.ui.properties.pluginDevelopmentPage"

-            id="org.eclipse.pde.internal.ui.properties.compilersPropertyPage">

-         <filter

-               name="projectNature"

-               value="org.eclipse.pde.PluginNature"/>

-      </page>      

-   </extension>

-   <extension

-         point="org.eclipse.ui.workingSets">

-      <workingSet

-            icon="$nl$/icons/obj16/plugin_obj.gif"

-            name="%Plugin.WorkingSet"

-            pageClass="org.eclipse.pde.internal.ui.util.PluginWorkingSet"

-            id="org.eclipse.pde.ui.pluginWorkingSet"/>

-   </extension>

-   <extension

-         point="org.eclipse.ui.elementFactories">

-      <factory

-            class="org.eclipse.pde.internal.ui.util.PersistablePluginObject"

-            id="org.eclipse.pde.ui.elementFactory"/>

-   </extension>

-   <extension

-         point="org.eclipse.core.runtime.preferences">

-      <initializer class="org.eclipse.pde.internal.ui.preferences.PreferenceInitializer"/>

-   </extension>

-   <extension

-         point="org.eclipse.ui.bindings">

-      <key

-            sequence="M3+M2+D E"

-            commandId="org.eclipse.pde.ui.runtimeWorkbenchShortcut.debug"

-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">

-      </key>      

-      <key

-            sequence="M3+M2+X E"

-            commandId="org.eclipse.pde.ui.runtimeWorkbenchShortcut.run"

-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">

-      </key>      

-      <key

-            sequence="M3+M2+D X"

-            commandId="org.eclipse.pde.ui.EquinoxLaunchShortcut.debug"

-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">

-      </key>      

-      <key

-            sequence="M3+M2+X X"

-            commandId="org.eclipse.pde.ui.EquinoxLaunchShortcut.run"

-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">

-      </key>      

-      <key

-            sequence="M3+M2+D P"

-            commandId="org.eclipse.pde.ui.junitWorkbenchShortcut.debug"

-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">

-      </key>      

-      <key

-            sequence="M3+M2+X P"

-            commandId="org.eclipse.pde.ui.junitWorkbenchShortcut.run"

-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">

-      </key>      

-      <key

-            sequence="M3+M2+D S"

-            commandId="org.eclipse.pde.ui.swtLaunchShortcut.debug"

-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">

-      </key>      

-      <key

-            sequence="M3+M2+X S"

-            commandId="org.eclipse.pde.ui.swtLaunchShortcut.run"

-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">

-      </key>   

-   </extension>

-   <extension

-         point="org.eclipse.ltk.core.refactoring.renameParticipants">

-      <renameParticipant

-            class="org.eclipse.pde.internal.ui.refactoring.ManifestTypeRenameParticipant"

-            id="org.eclipse.pde.ui.manifestTypeRenameParticipant"

-            name="%rename.type.participant">

-         <enablement>

-            <with

-                  variable="element">

-               <instanceof

-                     value="org.eclipse.jdt.core.IType">

-               </instanceof>

-            </with>

-         </enablement>        

-      </renameParticipant>

-      <renameParticipant

-            class="org.eclipse.pde.internal.ui.refactoring.ManifestPackageRenameParticipant"

-            id="org.eclipse.pde.ui.manifestPackageRenameParticipant"

-            name="%rename.package.participant">

-         <enablement>

-            <with

-                  variable="element">

-               <instanceof

-                     value="org.eclipse.jdt.core.IPackageFragment">

-               </instanceof>

-            </with>

-         </enablement>        

-      </renameParticipant>

-   </extension>

-   <extension

-         point="org.eclipse.ltk.core.refactoring.moveParticipants">

-      <moveParticipant

-            class="org.eclipse.pde.internal.ui.refactoring.ManifestTypeMoveParticipant"

-            id="org.eclipse.pde.ui.manifestTypeMoveParticipant"

-            name="%move.type.participant">

-         <enablement>

-            <with

-                  variable="element">

-               <instanceof

-                     value="org.eclipse.jdt.core.IType">

-               </instanceof>

-            </with>

-         </enablement>        

-      </moveParticipant>

-      <moveParticipant

-            class="org.eclipse.pde.internal.ui.refactoring.ManifestPackageMoveParticipant"

-            id="org.eclipse.pde.ui.manifestPackageMoveParticipant"

-            name="%move.package.participant">

-         <enablement>

-            <with

-                  variable="element">

-               <instanceof

-                     value="org.eclipse.jdt.core.IPackageFragment">

-               </instanceof>

-            </with>

-         </enablement>        

-      </moveParticipant>

-   </extension>

-   <extension

-         point="org.eclipse.ui.ide.markerResolution">

-      <markerResolutionGenerator

-            markerType="org.eclipse.pde.validation-marker"

-            class="org.eclipse.pde.internal.ui.correction.ResolutionGenerator">

-      </markerResolutionGenerator>

-   </extension>

-    <extension

-         point="org.eclipse.jdt.ui.queryParticipants">

-      <queryParticipant

-            class="org.eclipse.pde.internal.ui.search.javaparticipant.ClassSearchParticipant"

-            id="org.eclipse.pde.ui.queryParticipant"

-            name="PDE Java Search Participant"

-            nature="org.eclipse.pde.PluginNature"/>

-   </extension>

-</plugin>


diff --git a/ui/org.eclipse.pde.ui/schema/newExtension.exsd b/ui/org.eclipse.pde.ui/schema/newExtension.exsd
deleted file mode 100644
index 9057a9a..0000000
--- a/ui/org.eclipse.pde.ui/schema/newExtension.exsd
+++ /dev/null

@@ -1,303 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.pde.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.pde.ui" id="newExtension" name="Extension Wizards"/>
-      </appInfo>
-      <documentation>
-         This extension point should be used to contribute wizards
-that will be used to create and edit new extensions in 
-PDE plug-in manifest editor. Wizards can create on
-or more extensions at the same time, as well
-as the code needed to implement those extensions. If a contributed wizard is specifically created for a particular extension point, it is advisable to also register a matching editor wizard. This wizard will be used to edit the extension point in the manifest editor after it has been created in the manifest file.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <choice minOccurs="0" maxOccurs="unbounded">
-            <element ref="wizard"/>
-            <element ref="category"/>
-            <element ref="editorWizard"/>
-         </choice>
-         <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="wizard">
-      <annotation>
-         <appInfo>
-            <meta.element labelAttribute="name" icon="icon"/>
-         </appInfo>
-         <documentation>
-            a wizard that can be used to create a new extension from within the plug-in manifest editor
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="description" minOccurs="0" maxOccurs="1"/>
-         </sequence>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a unique name that will be used to identify this wizard.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a translatable name that will be used in UI representation
-of this wizard.
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="icon" type="string">
-            <annotation>
-               <documentation>
-                  a relative path of an icon that will be used to visually 
-represent the wizard.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string">
-            <annotation>
-               <documentation>
-                  a fully qualified name of a class which implements 
-&lt;samp&gt;org.eclipse.pde.ui.IExtensionWizard&lt;/samp&gt; 
-interface. This attribute is mutually exclusive with the &lt;code&gt;template&lt;/code&gt; attribute.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.pde.IExtensionWizard"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="availableAsShortcut" type="boolean">
-            <annotation>
-               <documentation>
-                  If &lt;samp&gt;true&lt;/samp&gt;, this wizard will appear in the
-short cut menu on the menu bar and the tool bar.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="category" type="string">
-            <annotation>
-               <documentation>
-                  an optional id that makes this wizard a member of the
-previously defined category. If category is hierarchical,
-full path to the parent category should be specified
-using &apos;/&apos; as a delimiter.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="template" type="string">
-            <annotation>
-               <documentation>
-                  an identifier of a template declared elsewhere using the extension point &lt;code&gt;org.eclipse.pde.ui.templates&lt;/code&gt;. If defined, the template with the specified id will be located and the extension wizard will be created using the template. This attribute is mutually exclusive with the &lt;code&gt;class&lt;/code&gt; attribute.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="editorWizard">
-      <annotation>
-         <appInfo>
-            <meta.element labelAttribute="name" icon="icon"/>
-         </appInfo>
-         <documentation>
-            a wizard that can be used to edit an existing extension from within the plug-in manifest editor
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="description" minOccurs="0" maxOccurs="1"/>
-         </sequence>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a unique name that will be used to identify this wizard.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a translatable name that will be used in UI representation
-of this wizard.
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="icon" type="string">
-            <annotation>
-               <documentation>
-                  a relative path of an icon that will be used to visually 
-represent the wizard.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified name of a class which implements 
-&lt;samp&gt;org.eclipse.pde.ui.IExtensionEditorWizard&lt;/samp&gt; 
-interface.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.pde.IExtensionEditorWizard"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the extension point that this wizard is capable of editing
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="category">
-      <annotation>
-         <appInfo>
-            <meta.element labelAttribute="name"/>
-         </appInfo>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a unique name that will be used to reference this category
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a translatable name that will be used for UI presentation
-of this category
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="parentCategory" type="string">
-            <annotation>
-               <documentation>
-                  an optional attribute that can be used to create category hierarchy
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="description" type="string">
-      <annotation>
-         <appInfo>
-            <meta.element translatable="true"/>
-         </appInfo>
-         <documentation>
-            A short description of this wizard.
-         </documentation>
-      </annotation>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of the extension:
-
-&lt;p&gt;
-&lt;pre&gt;
-&lt;extension
-      point=&quot;org.eclipse.pde.ui.newExtension&quot;&gt;
-   &lt;category
-         name=&quot;Custom Extensions&quot;
-         id=&quot;custom&quot;&gt;
-   &lt;/category&gt;
-   &lt;wizard
-         availableAsShortcut=&quot;true&quot;
-         name=&quot;Simple Java Editor Extension&quot;
-         icon=&quot;icons/java_edit.gif&quot;
-         category=&quot;generic&quot;
-         class=&quot;com.example.xyz.SimpleJavaEditorExtension&quot;
-         id=&quot;com.example.xyz.simple&quot;&gt;
-      &lt;description&gt;
-         This wizard creates a simple Java editor with
-         all the required classes and manifest markup.
-      &lt;/description&gt;
-   &lt;/wizard&gt;
-&lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         This extension point requires that a class that
-implements  
-&lt;samp&gt;org.eclipse.pde.ui.IExtensionWizard&lt;/samp&gt;
-interface.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         PDE provides a generic wizard that creates extension
-points based on the extension point schema information. In addition, all templates registered using &lt;code&gt;org.eclipse.pde.ui.templates&lt;/code&gt; extension point in PDE UI are also hooked as individual extension wizards.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 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 Eclipse Public License v1.0 which 
-accompanies this distribution, and is available at 
-&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;.
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/ui/org.eclipse.pde.ui/schema/pluginContent.exsd b/ui/org.eclipse.pde.ui/schema/pluginContent.exsd
deleted file mode 100644
index 0bafe80..0000000
--- a/ui/org.eclipse.pde.ui/schema/pluginContent.exsd
+++ /dev/null

@@ -1,215 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.pde.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.pde.ui" id="pluginContent" name="Plug-in Content Wizards"/>
-      </appInfo>
-      <documentation>
-         This extension point provides for contributing wizards that create additional content of the PDE plug-in
-projects. After the plug-in manifest and key files have been
-created, these wizards can be used to add more files and
-extensions to the initial structure. A typical implementation
-of this wizard would add content based on a parametrized
-template customized based on the user choices in the wizard.
-The goal is to arrive at a plug-in that is does something
-useful right after the creation (e.g. contributes a view, 
-an editor etc.).
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="wizard" 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>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="wizard">
-      <annotation>
-         <appInfo>
-            <meta.element labelAttribute="name" icon="icon"/>
-         </appInfo>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="description" minOccurs="0" maxOccurs="1"/>
-         </sequence>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a unique name that will be used to identify this wizard.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a translatable name that will be used in UI representation
-of this wizard.
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="icon" type="string">
-            <annotation>
-               <documentation>
-                  a relative path of an icon that will be used to visually 
-represent the wizard.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="resource"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified name of a class which implements 
-&lt;samp&gt;org.eclipse.pde.ui.IPluginContentWizard&lt;/samp&gt;.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.jface.Wizard:org.eclipse.pde.IPluginContentWizard"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="category" type="string">
-            <annotation>
-               <documentation>
-                  an optional tag that can be used to associate content wizards with different target projects.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="ui-content" type="boolean" use="default" value="true">
-            <annotation>
-               <documentation>
-                  a flag that indicates if the wizard will contribute code with user interface content. This flag will affect which plug-in class will be picked since (UI plug-ins extend &lt;code&gt;AbstractUIPlugin&lt;/code&gt; class, while non-UI plug-ins extends &lt;code&gt;Plugin&lt;/code&gt; base class). Since many contributions to Eclipse have UI content, this attribute is &lt;code&gt;true&lt;/code&gt; by default.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="java" type="boolean" use="default" value="true">
-            <annotation>
-               <documentation>
-                  a flag that indicates that the wizard will contribute Java content. Since most of the Eclipse plug-ins have Java code, the attribute is &lt;code&gt;true&lt;/code&gt; by default. Set it to &lt;code&gt;false&lt;/code&gt; if the plug-in will not have Java code (for example, documentation files only).
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="rcp" type="boolean" use="default" value="false">
-            <annotation>
-               <documentation>
-                  Since 3.1.  A boolean flag indicating whether the wizard contributes a standalone fully-functioning rich client application.  If set to &lt;code&gt;true&lt;/code&gt;, the wizard will appear in the New Plug-in Project wizard only when the user chooses the Rich Client Application option.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="pureOSGi" type="boolean" use="default" value="false">
-            <annotation>
-               <documentation>
-                  Since 3.2.  A boolean flag indicating whether the wizard contributes a pure OSGi bundle.  If set to &lt;code&gt;true&lt;/code&gt;, the wizard will appear in the New Plug-in Project wizard only when the user chooses to create a pure OSGi bundle.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="requiresActivator" type="boolean" use="default" value="false">
-            <annotation>
-               <documentation>
-                  Since 3.2.  A boolean flag indicating whether the wizard contributes an activator class.  If set to &lt;code&gt;true&lt;/code&gt;, the wizard will appear in the New Plug-in Project wizard only when the user chooses to generate a java class to control the plug-in&apos;s life cycle.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="description" type="string">
-      <annotation>
-         <appInfo>
-            <meta.element translatable="true"/>
-         </appInfo>
-         <documentation>
-            Short description of this wizard.
-         </documentation>
-      </annotation>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of this extension point:
-&lt;pre&gt;   
-   &lt;extension point=&quot;org.eclipse.pde.ui.pluginContent&quot;&gt;
-      &lt;wizard
-         name=&quot;Example Plug-in Content Generator&quot;
-         icon=&quot;icons/content_wizard.gif&quot;
-         class=&quot;com.example.xyz.ContentGeneratorWizard&quot;
-         id=&quot;com.example.xyz.ExampleContentGenerator&quot;&gt;
-         &lt;description&gt;
-            Adds a view and a preference page.
-         &lt;/description&gt;
-      &lt;/wizard&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         Wizards that plug into this extension point must
-implement &lt;samp&gt;org.eclipse.pde.ui.IPluginContentWizard&lt;/samp&gt;
-interface and is expected to extend &lt;code&gt;org.eclipse.jface.wizard.Wizard&lt;/code&gt;.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         PDE provides APIs for contributing content wizards based on customizable templates. A number of concrete wizards based on these templates is contributed by PDE UI itself.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 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 Eclipse Public License v1.0 which 
-accompanies this distribution, and is available at 
-&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;.
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/ui/org.eclipse.pde.ui/schema/samples.exsd b/ui/org.eclipse.pde.ui/schema/samples.exsd
deleted file mode 100644
index e818da6..0000000
--- a/ui/org.eclipse.pde.ui/schema/samples.exsd
+++ /dev/null

@@ -1,246 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ui.intro">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.ui.intro" id="samples" name="Samples"/>
-      </appInfo>
-      <documentation>
-         &lt;p&gt;
-This extension point should be used to register Eclipse code samples. A sample is one or more Eclipse projects that are packaged in a way suitable for subsequent import into the workspace. 
-&lt;p&gt;
-Each sample has a name, one or more project elements and a final perspective. The sample wizard will create a project for each &lt;code&gt;project&lt;/code&gt; element, import the content from the archive, and open the final perspective if specified. Projects must be complete i.e. have correct nature and classpath (if Java or plug-in projects).
-&lt;p&gt;If target view is specified and contains resource elements, it will be used to select and reveal those resources in the view after the sample has been created.
-&lt;/p&gt;
-&lt;p&gt;&lt;b&gt;This extension point is currently provided for internal Eclipse SDK usage only. It should not be used for anything else except Eclipse SDK examples.&lt;/b&gt;
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="sample" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  extension point attribute - in this case &lt;code&gt;org.eclipse.pde.ui.samples&lt;/code&gt;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  not used.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  not used.
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="sample">
-      <annotation>
-         <documentation>
-            an element that represents a single sample to be imported into the workspace.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="description"/>
-            <element ref="project" minOccurs="1" maxOccurs="unbounded"/>
-            <element ref="activity" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a unique identifier of the sample
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a translatable name of the sample
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="perspectiveId" type="string">
-            <annotation>
-               <documentation>
-                  if specified, the sample wizard will switch to the perspective with the provided id at the end of the operation.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="launcher" type="string">
-            <annotation>
-               <documentation>
-                  an optional launch shortcut to be used to run the sample. If not specified, it will be assumed that a new Eclipse instance needs to be launched in order to see the sample. If specified, it needs to be the fully qualified name of the Java class that implements &lt;code&gt;org.eclipse.debug.ui.ILaunchShortcut&lt;/code&gt; interface.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.debug.ui.ILaunchShortcut"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="targetViewId" type="string">
-            <annotation>
-               <documentation>
-                  an optional attribute that indicates that target view in the workbench that contains resources to select and reveal after the sample has been created. The view must implement &lt;code&gt;org.eclipse.ui.part.ISetSelectionTarget&lt;/code&gt; interface. Resources listed in &lt;code&gt;project&lt;/code&gt; elements will be selected and revealed in the target view.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="project">
-      <annotation>
-         <documentation>
-            each project element will result in a workspace project being created with the content imported from the associated archive.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  name of the project to be created in the workspace for this sample
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="archive" type="string" use="required">
-            <annotation>
-               <documentation>
-                  relative path to the ZIP file containing the content of the project to import
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="shared" type="string">
-            <annotation>
-               <documentation>
-                  shared projects may be listed in more than one sample. When this attribute is &lt;code&gt;true&lt;/code&gt;, and the project with the same name already exists in the workspace, it will be silently skipped. Otherwise, users will be prompted for overwrite permition.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="selectReveal" type="string">
-            <annotation>
-               <documentation>
-                  a project-relative path of the resource to select and reveal in the target view after creation.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="description">
-      <annotation>
-         <documentation>
-            body text of this element should contain description of the sample.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="helpHref" type="string">
-            <annotation>
-               <documentation>
-                  an optional reference to the topic in Help that provides more information about the sample.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="activity">
-      <annotation>
-         <documentation>
-            specifies an activity that needs to be enabled for this sample
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  activity identifier to be used to enable the activity for this sample
-               </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>
-         &lt;p&gt;
-The following is an example of the extension point:
-&lt;pre&gt;
-   &lt;extension point=&quot;org.eclipse.pde.ui.samples&quot;&gt;
-      &lt;sample
-           id=&quot;com.example.xyz.sample&quot;
-           name=&quot;My Sample&quot;&gt;
-         &lt;description helpHref=&quot;/com.example.xyz.doc/samples/com.example.xyz.sample1/doc-html/doc.html&quot;&gt;
-             A short description of the sample.
-         &lt;/description&gt;
-         &lt;project name=&quot;com.example.xyz.sample1&quot;
-                  archive=&quot;samples/sample1.zip&quot;/&gt;
-      &lt;/sample&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         &lt;p&gt;
-If specified, the value of the attribute &lt;code&gt;launcher&lt;/code&gt; must represent a fully qualified name of the Java class that implements &lt;code&gt;org.eclipse.debug.ui.ILaunchShortcut&lt;/code&gt; interface.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         &lt;p&gt;
-PDE UI supplies Runtime Workbench launcher for launching another instance of Eclipse.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 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 Eclipse Public License v1.0 which 
-accompanies this distribution, and is available at 
-&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;.
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/ui/org.eclipse.pde.ui/schema/templates.exsd b/ui/org.eclipse.pde.ui/schema/templates.exsd
deleted file mode 100644
index c206abd..0000000
--- a/ui/org.eclipse.pde.ui/schema/templates.exsd
+++ /dev/null

@@ -1,169 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.pde.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.pde.ui" id="templates" name="Extension Templates"/>
-      </appInfo>
-      <documentation>
-         This extension point registers plug-in project content templates that are used to generate code for the new extensions. Templates are used in two contexts:
-&lt;p&gt;
-&lt;ul&gt;
-&lt;li&gt;One or more templates are combined in a wizard that is contributed as plug-in content wizard using &lt;code&gt;org.eclipse.pde.ui.pluginContent&lt;/code&gt; extension point. These templates create interesting content for newly created plug-in projects. In addition, all the templates contributed using this extension point can be seen in a spectial version of the plug-in content wizard that lists the templates and allows users to freely combine the templates by checking them in the list.&lt;/li&gt;
-&lt;li&gt;New extension can be added to an existing plug-in using a template.
-&lt;/li&gt;
-&lt;/ul&gt;
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="template" minOccurs="1" 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>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="template">
-      <annotation>
-         <appInfo>
-            <meta.element labelAttribute="name" icon="icon"/>
-         </appInfo>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a unique name that will be used to identify this template.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a translatable name that will be used in UI representation
-of this template.
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="icon" type="string">
-            <annotation>
-               <documentation>
-                  a relative path of an icon that will be used to visually 
-represent the template.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="resource"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified name of the class that implements &lt;code&gt;org.eclipse.pde.ui.templates.ITemplateSection&lt;/code&gt; interface.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.pde.ui.templates.ITemplateSection"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="contributingId" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the identifier of the extension point that this template will contribute into.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         2.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of the template registration:
-&lt;p&gt;
-&lt;pre&gt;
-   &lt;extension
-         point=&quot;org.eclipse.pde.ui.templates&quot;&gt;
-      &lt;template
-            contributingId=&quot;org.eclipse.ui.actionSets&quot;
-            name=&quot;XYZ Action Set Generator&quot;
-   class=&quot;com.example.xyz.XYZActionSetTemplate&quot;
-            id=&quot;com.example.xyz.ActionSetTemplate&quot;&gt;
-      &lt;/template&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         Each template must provide a class that implements &lt;code&gt;org.eclipse.pde.ui.templates.ITemplateSection&lt;/code&gt; interface. However, abstract classes that implement the interface and can be extended are available.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         PDE UI contributes a number of templates that create extensions for the most popular extension points like editors, views, preferences etc.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 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 Eclipse Public License v1.0 which 
-accompanies this distribution, and is available at 
-&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;.
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/IHelpContextIds.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/IHelpContextIds.java
deleted file mode 100644
index a98bdd8..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/IHelpContextIds.java
+++ /dev/null

@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui;
-
-/**
- *
- */
-public interface IHelpContextIds {
-	public static final String PREFIX = "org.eclipse.pde.doc.user."; //$NON-NLS-1$
-	
-	// Preference pages
-	public static final String MAIN_PREFERENCE_PAGE = PREFIX + "main_preference_page"; //$NON-NLS-1$
-    public static final String BUILD_OPTIONS_PREFERENCE_PAGE = PREFIX + "build_options_preference_page"; //$NON-NLS-1$
-    public static final String EDITOR_PREFERENCE_PAGE = PREFIX + "editor_preference_page"; //$NON-NLS-1$
-	public static final String SOURCE_PREFERENCE_PAGE = PREFIX + "source_preference_page"; //$NON-NLS-1$
-	public static final String COMPILERS_PREFERENCE_PAGE = PREFIX + "compilers_preference_page"; //$NON-NLS-1$
-	public static final String TARGET_ENVIRONMENT_PREFERENCE_PAGE = PREFIX + "target_environment_preference_page"; //$NON-NLS-1$
- 	public static final String TARGET_PLATFORM_PREFERENCE_PAGE = PREFIX + "target_platform_preference_page"; //$NON-NLS-1$
- 	
- 	// Property Pages
- 	public static final String SELFHOSTING_PROPERTY_PAGE = PREFIX + "selfhosting_property_page"; //$NON-NLS-1$
-	public static final String COMPILERS_PROPERTY_PAGE = PREFIX + "compilers_property_page"; //$NON-NLS-1$
-
- 	// Views
- 	public static final String PLUGINS_VIEW = PREFIX + "plugins_view";	 //$NON-NLS-1$
-
- 	public static final String DEPENDENCIES_VIEW = PREFIX + "dependencies_view"; //$NON-NLS-1$
-	public static final String HISTORY_ACTION = PREFIX + "history_action"; //$NON-NLS-1$
-	public static final String HISTORY_LIST_ACTION = PREFIX + "history_list_action"; //$NON-NLS-1$
-	public static final String HISTORY_LIST_DIALOG = PREFIX + "history_list_dialog"; //$NON-NLS-1$
-	
- 	// Wizard Pages
- 	public static final String NEW_PROJECT_STRUCTURE_PAGE = PREFIX + "new_project_structure_page"; //$NON-NLS-1$
- 	public static final String NEW_PROJECT_REQUIRED_DATA = PREFIX + "new_project_required_data"; //$NON-NLS-1$
- 	public static final String NEW_PROJECT_CODE_GEN_PAGE = PREFIX + "new_project_code_gen_page"; //$NON-NLS-1$
-
- 	
-	public static final String ADVANCED_PLUGIN_EXPORT = PREFIX + "advanced_plugin_export_page"; //$NON-NLS-1$
-	public static final String CROSS_PLATFORM_EXPORT = PREFIX + "cross_platform_export_page"; //$NON-NLS-1$
-	public static final String LIBRARY_PLUGIN_JARS = PREFIX + "library_plugin_jars"; //$NON-NLS-1$
-	public static final String PLUGIN_WORKING_SET = PREFIX + "plugin_working_set"; //$NON-NLS-1$
-	public static final String PRODUCT_DEFINITIONS_WIZARD = PREFIX + "product_definitions_wizard_page"; //$NON-NLS-1$
-	public static final String PROJECT_NAMES = PREFIX + "project_names_page"; //$NON-NLS-1$
-	public static final String REQUIRED_PLUINGS_CONTAINER = PREFIX + "required_plugins_container_page"; //$NON-NLS-1$
-	public static final String REVIEW = PREFIX + "review_page"; //$NON-NLS-1$
-	public static final String SELECTION = PREFIX + "selection_page"; //$NON-NLS-1$
-	
-	
-	
- 	public static final String NEW_FRAGMENT_STRUCTURE_PAGE = PREFIX + "new_fragment_structure_page"; //$NON-NLS-1$
- 	public static final String NEW_FRAGMENT_REQUIRED_DATA = PREFIX + "new_fragment_required_data"; //$NON-NLS-1$
-	
- 	public static final String NEW_LIBRARY_PROJECT_STRUCTURE_PAGE = PREFIX + "new_library_plugin_structure_page"; //$NON-NLS-1$
- 	public static final String NEW_LIBRARY_PROJECT_JAR_PAGE = PREFIX + "new_library_plugin_jar_page"; //$NON-NLS-1$
- 	
- 	public static final String NEW_FEATURE_MAIN = PREFIX + "new_feature_main"; //$NON-NLS-1$
- 	public static final String NEW_FEATURE_DATA = PREFIX + "new_feature_data"; //$NON-NLS-1$
- 	public static final String NEW_FEATURE_REFERENCED_PLUGINS = PREFIX + "new_feature_referenced_plugins"; //$NON-NLS-1$
- 	
- 	public static final String NEW_PATCH_MAIN = PREFIX + "new_patch_main"; //$NON-NLS-1$
- 	public static final String NEW_PATCH_REQUIRED_DATA = PREFIX + "new_patch_data"; //$NON-NLS-1$
- 	public static final String NEW_PATCH_REFERENCED_PLUGINS = PREFIX + "new_patch_referenced_plugins"; //$NON-NLS-1$
- 
- 	public static final String NEW_SITE_MAIN = PREFIX + "new_site_main"; //$NON-NLS-1$
- 	
- 	public static final String MIGRATE_3_0 = PREFIX + "migrate_3_0"; //$NON-NLS-1$
- 	public static final String CONVERTED_PROJECTS = PREFIX + "converted_projects"; //$NON-NLS-1$
- 	public static final String NEW_SCHEMA = PREFIX + "new_schema"; //$NON-NLS-1$
- 	
- 	public static final String PLUGIN_IMPORT_FIRST_PAGE = PREFIX + "plugin_import_first_page"; //$NON-NLS-1$
- 	public static final String PLUGIN_IMPORT_SECOND_PAGE = PREFIX + "plugin_import_second_page"; //$NON-NLS-1$
- 	public static final String PLUGIN_IMPORT_EXPRESS_PAGE = PREFIX + "plugin_import_express_page"; //$NON-NLS-1$
- 	
-	public static final String FEATURE_IMPORT_FIRST_PAGE = PREFIX + "feature_import_first_page"; //$NON-NLS-1$
-	public static final String FEATURE_IMPORT_SECOND_PAGE = PREFIX + "feature_import_second_page"; //$NON-NLS-1$
-	
-	public static final String PLUGIN_EXPORT_WIZARD = PREFIX + "plugin_export_wizard"; //$NON-NLS-1$
-	public static final String FEATURE_EXPORT_WIZARD = PREFIX + "feature_export_wizard";	 //$NON-NLS-1$
- 	
- 	public static final String TEMPLATE_SELECTION = PREFIX + "template_selection"; //$NON-NLS-1$
- 	public static final String TEMPLATE_EDITOR = PREFIX + "template_editor"; //$NON-NLS-1$
- 	public static final String TEMPLATE_HELLO_WORLD = PREFIX + "template_hello_world"; //$NON-NLS-1$
-    public static final String TEMPLATE_INTRO = PREFIX + "template_intro"; //$NON-NLS-1$
- 	public static final String TEMPLATE_HELP = PREFIX + "template_help"; //$NON-NLS-1$
- 	public static final String TEMPLATE_MULTIPAGE_EDITOR = PREFIX + "template_multipage_editor"; //$NON-NLS-1$
- 	public static final String TEMPLATE_NEW_WIZARD = PREFIX + "template_new_wizard"; //$NON-NLS-1$
- 	public static final String TEMPLATE_POPUP_MENU = PREFIX + "template_popup_menu"; //$NON-NLS-1$
- 	public static final String TEMPLATE_PREFERENCE_PAGE = PREFIX + "template_preference_page"; //$NON-NLS-1$
- 	public static final String TEMPLATE_PROPERTY_PAGE = PREFIX + "template_property_page"; //$NON-NLS-1$
- 	public static final String TEMPLATE_VIEW = PREFIX + "template_view"; //$NON-NLS-1$
- 	public static final String TEMPLATE_BUILDER = PREFIX + "template_builder"; //$NON-NLS-1$
- 	public static final String TEMPLATE_RCP_MAIL = PREFIX + "rcp_mail"; //$NON-NLS-1$
- 	
- 	public static final String MANIFEST_ADD_DEPENDENCIES = PREFIX + "manifest_add_dependencies"; //$NON-NLS-1$
- 	public static final String ADD_EXTENSIONS_MAIN = PREFIX + "add_extensions_main"; //$NON-NLS-1$
- 	public static final String ADD_EXTENSIONS_SCHEMA_BASED = PREFIX + "add_extensions_schema_based"; //$NON-NLS-1$
- 	public static final String JAVA_ATTRIBUTE_WIZARD_PAGE = PREFIX + "java_attribute_wizard_page"; //$NON-NLS-1$
-	public static final String UPDATE_CLASSPATH = PREFIX + "update_classpath"; //$NON-NLS-1$
-	public static final String FEATURE_PORTABILITY_WIZARD = PREFIX + "feature_portability_wizard"; //$NON-NLS-1$
-
-	public static final String PLUGINS_CONTAINER_PAGE = PREFIX + "plugins_container_page"; //$NON-NLS-1$
-	
-	// dialogs
-	public static final String FRAGMENT_ADD_TARGET = PREFIX + "fragment_add_target"; //$NON-NLS-1$
-	public static final String SCHEMA_TYPE_RESTRICTION = PREFIX + "schema_type_restriction"; //$NON-NLS-1$
-	public static final String SEARCH_PAGE = PREFIX + "search_page"; //$NON-NLS-1$
-	public static final String LAUNCHER_BASIC = PREFIX + "launcher_basic"; //$NON-NLS-1$
-	public static final String LAUNCHER_ADVANCED = PREFIX + "launcher_advanced"; //$NON-NLS-1$
-	public static final String LAUNCHER_TRACING = PREFIX + "launcher_tracing"; //$NON-NLS-1$
-	public static final String LAUNCHER_CONFIGURATION = PREFIX + "launcher_configuration"; //$NON-NLS-1$
-	
-	// Generic source page
-	public static final String MANIFEST_SOURCE_PAGE = PREFIX + "manifest_source_page"; //$NON-NLS-1$
-	
- 	// Manifest Editor
- 	public static final String MANIFEST_WELCOME = PREFIX + "manifest_welcome"; //$NON-NLS-1$
- 	public static final String MANIFEST_PLUGIN_OVERVIEW = PREFIX + "manifest_plugin_overview"; //$NON-NLS-1$
- 	public static final String MANIFEST_PLUGIN_DEPENDENCIES = PREFIX + "manifest_plugin_dependencies"; //$NON-NLS-1$
- 	public static final String MANIFEST_PLUGIN_RUNTIME = PREFIX + "manifest_plugin_runtime"; //$NON-NLS-1$
- 	public static final String MANIFEST_PLUGIN_EXTENSIONS = PREFIX + "manifest_plugin_extensions"; //$NON-NLS-1$
- 	public static final String MANIFEST_PLUGIN_EXT_POINTS = PREFIX + "manifest_plugin_ext_points"; //$NON-NLS-1$
- 	
- 	public static final String MANIFEST_FRAGMENT_OVERVIEW = PREFIX + "manifest_fragment_overview"; //$NON-NLS-1$
- 	public static final String MANIFEST_FRAGMENT_DEPENDENCIES = PREFIX + "manifest_fragment_dependencies"; //$NON-NLS-1$
- 	public static final String MANIFEST_FRAGMENT_RUNTIME = PREFIX + "manifest_fragment_runtime"; //$NON-NLS-1$
- 	public static final String MANIFEST_FRAGMENT_EXTENSIONS = PREFIX + "manifest_fragment_extensions"; //$NON-NLS-1$
- 	public static final String MANIFEST_FRAGMENT_EXT_POINTS = PREFIX + "manifest_fragment_ext_points"; //$NON-NLS-1$
- 
- 	// Build Properties Editor
- 	public static final String BUILD_PAGE = PREFIX + "build_page"; //$NON-NLS-1$
- 	
- 	// Schema Editor
- 	public static final String SCHEMA_EDITOR_MAIN = PREFIX + "schema_editor_main"; //$NON-NLS-1$
- 	public static final String SCHEMA_EDITOR_DOC = PREFIX + "schema_editor_doc"; //$NON-NLS-1$
- 	
- 	// Feature Editor
- 	public static final String MANIFEST_FEATURE_OVERVIEW = PREFIX + "manifest_feature_overview"; //$NON-NLS-1$
- 	public static final String MANIFEST_FEATURE_INFO = PREFIX + "manifest_feature_info"; //$NON-NLS-1$
- 	public static final String MANIFEST_FEATURE_CONTENT = PREFIX + "manifest_feature_content"; //$NON-NLS-1$
- 	public static final String MANIFEST_FEATURE_ADVANCED = PREFIX + "manifest_feature_advanced"; //$NON-NLS-1$
- 	public static final String MANIFEST_FEATURE_DEPENDENCIES = PREFIX + "manifest_feature_dependencies"; //$NON-NLS-1$
- 	public static final String MANIFEST_FEATURE_INSTALLATION = PREFIX + "manifest_feature_installation"; //$NON-NLS-1$
- 	
- 	public static final String FEATURE_SYNCHRONIZE_VERSIONS = PREFIX + "feature_synchronize_versions"; //$NON-NLS-1$
-
-	// Site Editor
-	public static final String MANIFEST_SITE_OVERVIEW = PREFIX + "manifest_site_overview"; //$NON-NLS-1$
-	public static final String MANIFEST_SITE_BUILD = PREFIX + "manifest_sute_build"; //$NON-NLS-1$
-	public static final String MANIFEST_SITE_FEATURES = PREFIX + "manifest_site_features"; //$NON-NLS-1$
-	public static final String MANIFEST_SITE_ARCHIVES = PREFIX + "manifest_site_archives";	 //$NON-NLS-1$
-	public static final String NEW_CATEGORY_DEF_DIALOG = PREFIX + "new_category_def_dialog";	 //$NON-NLS-1$
-	public static final String NEW_FEATURE_DIALOG = PREFIX + "new_feature_dialog";	 //$NON-NLS-1$
-	public static final String NEW_ARCHIVE_DIALOG = PREFIX + "new_archive_dialog";	 //$NON-NLS-1$
-	
-	// Editor Outline
-	public static final String OUTLINE_SORT_ACTION = PREFIX + "outline_sort_action";	 //$NON-NLS-1$
-	
-	
-	// Used by PDEFormPage children
-	public static final String BRANDING_PAGE = PREFIX + "branding_page"; //$NON-NLS-1$
-	public static final String CONFIGURATION_PAGE = PREFIX + "configuration_page"; //$NON-NLS-1$
-	public static final String OVERVIEW_PAGE = PREFIX + "overview_page"; //$NON-NLS-1$
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/IPDEUIConstants.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/IPDEUIConstants.java
deleted file mode 100644
index 0ff9e69..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/IPDEUIConstants.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui;
-
-import org.eclipse.core.runtime.QualifiedName;
-
-public interface IPDEUIConstants {
-	String PLUGIN_ID = "org.eclipse.pde.ui"; //$NON-NLS-1$
-
-	String MANIFEST_EDITOR_ID = PLUGIN_ID + ".manifestEditor"; //$NON-NLS-1$
-	String FEATURE_EDITOR_ID = PLUGIN_ID + ".featureEditor"; //$NON-NLS-1$
-	String SITE_EDITOR_ID = PLUGIN_ID + ".siteEditor"; //$NON-NLS-1$
-	String BUILD_EDITOR_ID = PLUGIN_ID + ".buildEditor"; //$NON-NLS-1$
-	String SCHEMA_EDITOR_ID = PLUGIN_ID + ".schemaEditor"; //$NON-NLS-1$
-	String PRODUCT_EDITOR_ID = PLUGIN_ID + ".productEditor"; //$NON-NLS-1$
-	String PLUGINS_VIEW_ID = "org.eclipse.pde.ui.PluginsView"; //$NON-NLS-1$
-	String DEPENDENCIES_VIEW_ID = "org.eclipse.pde.ui.DependenciesView"; //$NON-NLS-1$
-	String PERSPECTIVE_ID = "org.eclipse.pde.ui.PDEPerspective"; //$NON-NLS-1$
-	
-	String RUN_LAUNCHER_ID = PLUGIN_ID + "." + "WorkbenchRunLauncher"; //$NON-NLS-1$ //$NON-NLS-2$
-	String DEBUG_LAUNCHER_ID = PLUGIN_ID + "." + "WorkbenchDebugLauncher"; //$NON-NLS-1$ //$NON-NLS-2$
-	String MARKER_SYSTEM_FILE_PATH = PLUGIN_ID + "."+ "systemFilePath"; //$NON-NLS-1$ //$NON-NLS-2$
-
-	QualifiedName DEFAULT_EDITOR_PAGE_KEY =
-		new QualifiedName(PLUGIN_ID, "default-editor-page");	 //$NON-NLS-1$
-	QualifiedName DEFAULT_EDITOR_PAGE_KEY_NEW =
-		new QualifiedName(PLUGIN_ID, "default-editor-page-new");	 //$NON-NLS-1$
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/IPreferenceConstants.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/IPreferenceConstants.java
deleted file mode 100644
index 3d51652..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/IPreferenceConstants.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui;
-
-public interface IPreferenceConstants {
-	
-	// editor preference page
-	public static final String P_USE_SOURCE_PAGE = "useSourcePage"; //$NON-NLS-1$
-
-	// Main preference page
-	public static final String PROP_SHOW_OBJECTS =
-		"Preferences.MainPage.showObjects"; //$NON-NLS-1$
-	public static final String VALUE_USE_IDS = "useIds"; //$NON-NLS-1$
-	public static final String VALUE_USE_NAMES = "useNames"; //$NON-NLS-1$
-	
-	// Editor Outline
-	public static final String PROP_OUTLINE_SORTING = "PDEMultiPageContentOutline.SortingAction.isChecked"; //$NON-NLS-1$
-
-	// Dependencies view
-	public static final String DEPS_VIEW_SHOW_CALLERS = "DependenciesView.show.callers"; //$NON-NLS-1$
-	public static final String DEPS_VIEW_SHOW_LIST = "DependenciesView.show.list"; //$NON-NLS-1$
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/OpenPDEPerspectiveAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/OpenPDEPerspectiveAction.java
deleted file mode 100644
index e022d84..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/OpenPDEPerspectiveAction.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.action.Action;
-import org.eclipse.ui.*;
-
-public class OpenPDEPerspectiveAction extends Action {
-	public OpenPDEPerspectiveAction() {
-	}
-
-	public void run() {
-		IWorkbenchWindow window = PDEPlugin.getActiveWorkbenchWindow();
-		IWorkbenchPage page = window.getActivePage();
-		IAdaptable input;
-		if (page != null)
-			input = page.getInput();
-		else
-			input = ResourcesPlugin.getWorkspace().getRoot();
-		try {
-			PlatformUI.getWorkbench().showPerspective(
-				"org.eclipse.pde.ui.PDEPerspective", //$NON-NLS-1$
-				window,
-				input);
-			notifyResult(true);
-			
-		} catch (WorkbenchException e) {
-			PDEPlugin.logException(e);
-			notifyResult(false);
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDELabelProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDELabelProvider.java
deleted file mode 100644
index 5dd4141..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDELabelProvider.java
+++ /dev/null

@@ -1,621 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.ui.*;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.osgi.service.resolver.BundleDescription;
-import org.eclipse.pde.core.build.IBuildEntry;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.builders.CompilerFlags;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.core.feature.*;
-import org.eclipse.pde.internal.core.ifeature.*;
-import org.eclipse.pde.internal.core.iproduct.*;
-import org.eclipse.pde.internal.core.ischema.*;
-import org.eclipse.pde.internal.core.isite.*;
-import org.eclipse.pde.internal.core.plugin.ImportObject;
-import org.eclipse.pde.internal.ui.elements.NamedElement;
-import org.eclipse.pde.internal.ui.model.bundle.*;
-import org.eclipse.pde.internal.ui.util.SharedLabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.PlatformUI;
-
-public class PDELabelProvider extends SharedLabelProvider {
-	public PDELabelProvider() {
-
-	}
-	public String getText(Object obj) {
-		if (obj instanceof IPluginModelBase) {
-			return getObjectText(((IPluginModelBase) obj).getPluginBase());
-		}
-		if (obj instanceof IPluginBase) {
-			return getObjectText((IPluginBase) obj);
-		}
-		if (obj instanceof ImportObject) {
-			return getObjectText((ImportObject) obj);
-		}
-		if (obj instanceof IProductPlugin) {
-			return getObjectText((IProductPlugin)obj);
-		}
-		if (obj instanceof BundleDescription) {
-			return getObjectText((BundleDescription)obj);
-		}
-		if (obj instanceof IPluginImport) {
-			return getObjectText((IPluginImport)obj);
-		}
-		if (obj instanceof IPluginLibrary) {
-			return getObjectText((IPluginLibrary) obj);
-		}
-		if (obj instanceof IPluginExtension) {
-			return getObjectText((IPluginExtension)obj);
-		}
-		if (obj instanceof IPluginExtensionPoint) {
-			return getObjectText((IPluginExtensionPoint) obj);
-		}
-		if (obj instanceof NamedElement) {
-			return ((NamedElement) obj).getLabel();
-		}
-		if (obj instanceof ISchemaObject) {
-			return getObjectText((ISchemaObject) obj);
-		}
-		if (obj instanceof FeaturePlugin) {
-			return getObjectText((FeaturePlugin) obj);
-		}
-		if (obj instanceof FeatureImport) {
-			return getObjectText((FeatureImport) obj);
-		}
-		if (obj instanceof IFeatureModel) {
-			return getObjectText((IFeatureModel) obj);
-		}
-		if (obj instanceof FeatureChild) {
-			return getObjectText((FeatureChild) obj);
-		}
-		if (obj instanceof IProductFeature) {
-			return getObjectText((IProductFeature)obj);
-		}
-		if (obj instanceof ISiteFeature) {
-			return getObjectText((ISiteFeature) obj);
-		}
-		if (obj instanceof ISiteArchive) {
-			return getObjectText((ISiteArchive) obj);
-		}
-		if (obj instanceof ISiteCategoryDefinition) {
-			return getObjectText((ISiteCategoryDefinition) obj);
-		}
-		if (obj instanceof ISiteCategory) {
-			return getObjectText((ISiteCategory) obj);
-		}
-		if (obj instanceof IBuildEntry) {
-			return getObjectText((IBuildEntry)obj);
-		}
-		if (obj instanceof PackageObject) {
-			return getObjectText((PackageObject)obj);
-		}
-		return super.getText(obj);
-	}
-
-	public String getObjectText(IPluginBase pluginBase) {
-		String name =
-			isFullNameModeEnabled()
-				? pluginBase.getTranslatedName()
-				: pluginBase.getId();
-		name = preventNull(name);
-		String version = pluginBase.getVersion();
-
-		String text;
-
-		if (version != null && version.length() > 0)
-			text = name + " (" + pluginBase.getVersion() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-		else
-			text = name;
-		if (pluginBase.getModel() != null && !pluginBase.getModel().isInSync())
-			text += " " + PDEUIMessages.PluginModelManager_outOfSync; //$NON-NLS-1$
-		return text;
-	}
-	
-	private String preventNull(String text) {
-		return text!=null?text:""; //$NON-NLS-1$
-	}
-
-	public String getObjectText(IPluginExtension extension) {
-		return preventNull(isFullNameModeEnabled()
-			? extension.getTranslatedName()
-			: extension.getPoint());
-	}
-
-	public String getObjectText(IPluginExtensionPoint point) {
-		return preventNull(isFullNameModeEnabled()
-			? point.getTranslatedName()
-			: point.getId());
-	}
-
-	public String getObjectText(ImportObject obj) {
-        String version = obj.getImport().getVersion();
-        if (version != null && version.length() > 0 && Character.isDigit(version.charAt(0)))
-            version = "(" + version + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-       
-        String text = isFullNameModeEnabled() ? obj.toString() : preventNull(obj.getId());
-        return version == null || version.length() == 0 ? text : text + " " + version; //$NON-NLS-1$
-    }
-	
-	public String getObjectText(IProductPlugin obj) {
-		return obj.getId();
-	}
-	
-	public String getObjectText(BundleDescription bundle) {
-		return bundle.getSymbolicName();
-	}
-	
-	public String getObjectText(IPluginImport obj) {
-		if (isFullNameModeEnabled()) {
-			String id = obj.getId();
-			IPlugin plugin = PDECore.getDefault().findPlugin(obj.getId());
-			if (plugin != null) {
-				return plugin.getTranslatedName();
-			}
-			return id != null ? id : "?"; //$NON-NLS-1$
-		}
-		return preventNull(obj.getId());
-	}
-	public String getObjectText(IBuildEntry obj) {
-		return obj.getName();
-	}
-
-	public String getObjectText(IPluginLibrary obj) {
-		return preventNull(obj.getName());
-	}
-
-	public String getObjectText(ISchemaObject obj) {
-		String text = obj.getName();
-		if (obj instanceof ISchemaRepeatable) {
-			ISchemaRepeatable rso = (ISchemaRepeatable) obj;
-			boolean unbounded = rso.getMaxOccurs() == Integer.MAX_VALUE;
-			int maxOccurs = rso.getMaxOccurs();
-			int minOccurs = rso.getMinOccurs();
-			if (maxOccurs != 1 || minOccurs != 1) {
-				text += " (" + minOccurs + " - "; //$NON-NLS-1$ //$NON-NLS-2$
-				if (unbounded)
-					text += "*)"; //$NON-NLS-1$
-				else
-					text += maxOccurs + ")"; //$NON-NLS-1$
-			}
-		}
-		return text;
-	}
-
-	public String getObjectText(FeaturePlugin obj) {
-		String name =
-			isFullNameModeEnabled() ? obj.getTranslatableLabel() : obj.getId();
-		String version = obj.getVersion();
-
-		String text;
-
-		if (version != null && version.length() > 0)
-			text = name + " (" + version + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-		else
-			text = name;
-		return preventNull(text);
-	}
-
-	public String getObjectText(FeatureImport obj) {
-		int type = obj.getType();
-		if (type == IFeatureImport.PLUGIN) {
-			IPlugin plugin = obj.getPlugin();
-			if (plugin != null && isFullNameModeEnabled()) {
-				return preventNull(plugin.getTranslatedName());
-			}
-		} else if (type == IFeatureImport.FEATURE) {
-			IFeature feature = obj.getFeature();
-			if (feature != null && isFullNameModeEnabled()) {
-				return preventNull(feature.getLabel());
-			}
-		}
-		return preventNull(obj.getId());
-	}
-
-	public String getObjectText(IFeatureModel obj) {
-		IFeature feature = obj.getFeature();
-		return preventNull(feature.getId()) + " (" + preventNull(feature.getVersion()) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-
-	}
-
-	public String getObjectText(FeatureChild obj) {
-		return preventNull(obj.getId()) + " (" + preventNull(obj.getVersion()) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public String getObjectText(IProductFeature obj) {
-		return preventNull(obj.getId()) + " (" + preventNull(obj.getVersion()) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public String getObjectText(ISiteFeature obj) {
-		return preventNull(obj.getURL());
-	}
-
-	public String getObjectText(ISiteArchive obj) {
-		return preventNull(obj.getPath());
-	}
-	public String getObjectText(ISiteCategoryDefinition obj) {
-		return preventNull(obj.getLabel());
-	}
-	public String getObjectText(PackageObject obj) {
-		return preventNull(obj.toString());
-	}
-	public String getObjectText(ISiteCategory obj) {
-		ISiteCategoryDefinition def = obj.getDefinition();
-		if (def != null)
-			return preventNull(def.getLabel());
-		return preventNull(obj.getName());
-	}
-
-	public Image getImage(Object obj) {
-		if (obj instanceof IPlugin) {
-			return getObjectImage((IPlugin) obj);
-		}
-		if (obj instanceof IFragment) {
-			return getObjectImage((IFragment) obj);
-		}
-		if (obj instanceof IPluginModel) {
-			return getObjectImage(((IPluginModel) obj).getPlugin());
-		}
-		if (obj instanceof IFragmentModel) {
-			return getObjectImage(((IFragmentModel) obj).getFragment());
-		}
-		if (obj instanceof ImportObject) {
-			return getObjectImage((ImportObject) obj);
-		}
-		if (obj instanceof IPluginImport) {
-			return getObjectImage((IPluginImport) obj);
-		}
-		if (obj instanceof IProductPlugin) {
-			return getObjectImage((IProductPlugin)obj);
-		}
-		if (obj instanceof BundleDescription) {
-			return getObjectImage((BundleDescription)obj);
-		}
-		
-		if (obj instanceof IPluginLibrary) {
-			return getObjectImage((IPluginLibrary) obj);
-		}
-		if (obj instanceof IPluginExtension) {
-			return getObjectImage((IPluginExtension) obj);
-		}
-		if (obj instanceof IPluginExtensionPoint) {
-			return getObjectImage((IPluginExtensionPoint) obj);
-		}
-		if (obj instanceof NamedElement) {
-			return ((NamedElement) obj).getImage();
-		}
-		if (obj instanceof ISchemaElement) {
-			return getObjectImage((ISchemaElement) obj);
-		}
-		if (obj instanceof ISchemaAttribute) {
-			return getObjectImage((ISchemaAttribute) obj);
-		}
-		if (obj instanceof IDocumentSection || obj instanceof ISchema) {
-			int flags = getSchemaObjectFlags((ISchemaObject) obj);
-			return get(PDEPluginImages.DESC_DOC_SECTION_OBJ, flags);
-		}
-		if (obj instanceof ISchemaCompositor) {
-			return getObjectImage((ISchemaCompositor) obj);
-		}
-		if (obj instanceof IFeatureURLElement) {
-			return getObjectImage((IFeatureURLElement) obj);
-		}
-		if (obj instanceof IFeatureModel) {
-			int flags = 0;
-			if (((IFeatureModel)obj).getUnderlyingResource() == null) 
-				flags |= F_EXTERNAL;
-			return get(PDEPluginImages.DESC_FEATURE_OBJ, flags);
-		}
-		if (obj instanceof IFeatureChild) {
-			return getObjectImage((IFeatureChild) obj);
-		}
-		if (obj instanceof IProductFeature) {
-			return getObjectImage((IProductFeature)obj);
-		}
-		if (obj instanceof IFeaturePlugin) {
-			return getObjectImage((IFeaturePlugin) obj);
-		}
-		if (obj instanceof IFeatureData) {
-			return getObjectImage((IFeatureData) obj);
-		}
-		if (obj instanceof IFeatureImport) {
-			return getObjectImage((IFeatureImport) obj);
-		}
-		if (obj instanceof IFeatureInfo) {
-			return getObjectImage((IFeatureInfo) obj);
-		}
-		if (obj instanceof IBuildEntry) {
-			return get(PDEPluginImages.DESC_BUILD_VAR_OBJ);
-		}
-		if (obj instanceof ISiteFeature) {
-			return getObjectImage((ISiteFeature) obj);
-		}
-		if (obj instanceof ISiteArchive) {
-			return getObjectImage((ISiteArchive) obj);
-		}
-		if (obj instanceof ISiteCategoryDefinition) {
-			return getObjectImage((ISiteCategoryDefinition) obj);
-		}
-		if (obj instanceof ISiteCategory) {
-			return getObjectImage((ISiteCategory) obj);
-		}
-		if (obj instanceof PackageObject) {
-			return getObjectImage((PackageObject) obj);
-		}
-		return super.getImage(obj);
-	}
-
-	private Image getObjectImage(IPlugin plugin) {
-		return getObjectImage(plugin, false, false);
-	}
-	
-	private Image getObjectImage(BundleDescription bundle) {
-		return bundle.getHost() == null 
-			? get(PDEPluginImages.DESC_PLUGIN_OBJ)
-			: get(PDEPluginImages.DESC_FRAGMENT_OBJ);
-	}
-
-	public Image getObjectImage(
-		IPlugin plugin,
-		boolean checkEnabled,
-		boolean javaSearch) {
-		IPluginModelBase model = plugin.getPluginModel();
-		int flags = getModelFlags(model);
-
-		if (javaSearch)
-			flags |= F_JAVA;
-		ImageDescriptor desc = PDEPluginImages.DESC_PLUGIN_OBJ;
-		if (checkEnabled && model.isEnabled() == false)
-			desc = PDEPluginImages.DESC_EXT_PLUGIN_OBJ;
-		return get(desc, flags);
-	}
-
-	private int getModelFlags(IPluginModelBase model) {
-		int flags = 0;
-		if (!(model.isLoaded() && model.isInSync()))
-			flags = F_ERROR;
-		IResource resource = model.getUnderlyingResource();
-		if (resource == null) {
-			flags |= F_EXTERNAL;
-		} else {
-			IProject project = resource.getProject();
-			try {
-				if (WorkspaceModelManager.isBinaryPluginProject(project)) {
-					String property =
-						project.getPersistentProperty(
-							PDECore.EXTERNAL_PROJECT_PROPERTY);
-					if (property != null) {
-						/*
-						if (property.equals(PDECore.EXTERNAL_PROJECT_VALUE))
-							flags |= F_EXTERNAL;
-						else if (property.equals(PDECore.BINARY_PROJECT_VALUE))
-						*/
-						flags |= F_BINARY;
-					}
-				}
-			} catch (CoreException e) {
-			}
-		}
-		return flags;
-	}
-
-	private Image getObjectImage(IFragment fragment) {
-		return getObjectImage(fragment, false, false);
-	}
-
-	public Image getObjectImage(
-		IFragment fragment,
-		boolean checkEnabled,
-		boolean javaSearch) {
-		IPluginModelBase model = fragment.getPluginModel();
-		int flags = getModelFlags(model);
-		if (javaSearch)
-			flags |= F_JAVA;
-		ImageDescriptor desc = PDEPluginImages.DESC_FRAGMENT_OBJ;
-		if (checkEnabled && model.isEnabled() == false)
-			desc = PDEPluginImages.DESC_EXT_FRAGMENT_OBJ;
-		return get(desc, flags);
-	}
-
-	private Image getObjectImage(ImportObject iobj) {
-		int flags = 0;
-		if (iobj.isResolved() == false)
-			flags = F_ERROR;
-		else if (iobj.getImport().isReexported())
-			flags = F_EXPORT;
-		IPlugin plugin = iobj.getPlugin();
-		if (plugin != null) {
-			IPluginModelBase model = plugin.getPluginModel();
-			flags |= getModelFlags(model);
-		}
-		return get(getRequiredPluginImageDescriptor(iobj.getImport()), flags);
-	}
-	
-	protected ImageDescriptor getRequiredPluginImageDescriptor(IPluginImport iobj) {
-		return PDEPluginImages.DESC_REQ_PLUGIN_OBJ;
-	}
-
-	private Image getObjectImage(IPluginImport obj) {
-		int flags = 0;
-		if (obj.isReexported())
-			flags = F_EXPORT;
-		return get(getRequiredPluginImageDescriptor(obj), flags);
-	}
-	
-	private Image getObjectImage(IProductPlugin obj) {
-		BundleDescription desc = TargetPlatform.getState().getBundle(obj.getId(), null);
-		if (desc != null) {
-			return desc.getHost() == null 
-				? get(PDEPluginImages.DESC_PLUGIN_OBJ)
-				: get(PDEPluginImages.DESC_FRAGMENT_OBJ);
-		}
-		return get(PDEPluginImages.DESC_PLUGIN_OBJ, F_ERROR);
-	}
-
-	private Image getObjectImage(IPluginLibrary library) {
-		return get(PDEPluginImages.DESC_JAVA_LIB_OBJ);
-	}
-	private Image getObjectImage(IPluginExtension point) {
-		return get(PDEPluginImages.DESC_EXTENSION_OBJ);
-	}
-	private Image getObjectImage(IPluginExtensionPoint point) {
-		return get(PDEPluginImages.DESC_EXT_POINT_OBJ);
-	}
-
-	private Image getObjectImage(ISchemaElement element) {
-		int flags = getSchemaObjectFlags(element);
-		return get(PDEPluginImages.DESC_GEL_SC_OBJ, flags);
-	}
-	private Image getObjectImage(ISchemaAttribute att) {
-		int flags = getSchemaObjectFlags(att);
-		if (att.getKind() == IMetaAttribute.JAVA)
-			return get(PDEPluginImages.DESC_ATT_CLASS_OBJ, flags);
-		if (att.getKind() == IMetaAttribute.RESOURCE)
-			return get(PDEPluginImages.DESC_ATT_FILE_OBJ, flags);
-		if (att.getUse() == ISchemaAttribute.REQUIRED)
-			return get(PDEPluginImages.DESC_ATT_REQ_OBJ, flags);
-		return get(PDEPluginImages.DESC_ATT_IMPL_OBJ, flags);
-	}
-
-	private Image getObjectImage(ISchemaCompositor compositor) {
-		switch (compositor.getKind()) {
-			case ISchemaCompositor.ALL :
-				return get(PDEPluginImages.DESC_ALL_SC_OBJ);
-			case ISchemaCompositor.CHOICE :
-				return get(PDEPluginImages.DESC_CHOICE_SC_OBJ);
-			case ISchemaCompositor.SEQUENCE :
-				return get(PDEPluginImages.DESC_SEQ_SC_OBJ);
-			case ISchemaCompositor.GROUP :
-				return get(PDEPluginImages.DESC_GROUP_SC_OBJ);
-		}
-		return null;
-	}
-
-	private int getSchemaObjectFlags(ISchemaObject sobj) {
-		int flags = 0;
-		String text = sobj.getDescription();
-		if (text != null)
-			text = text.trim();
-		if (text != null && text.length() > 0 && text.charAt(0)!='[') {
-			// complete
-			flags = F_EDIT;
-		}
-		return flags;
-	}
-
-	private Image getObjectImage(IFeatureURLElement url) {
-		return get(PDEPluginImages.DESC_LINK_OBJ);
-	}
-
-	private Image getObjectImage(IFeaturePlugin plugin) {
-		int flags = 0;
-		if (((FeaturePlugin) plugin).getPluginBase() == null) {
-			int cflag = CompilerFlags.getFlag(null, CompilerFlags.F_UNRESOLVED_PLUGINS);
-			if (cflag==CompilerFlags.ERROR)
-				flags = F_ERROR;
-			else if (cflag==CompilerFlags.WARNING)
-				flags = F_WARNING;
-		}
-		if (plugin.isFragment())
-			return get(PDEPluginImages.DESC_FRAGMENT_OBJ, flags);
-		return get(PDEPluginImages.DESC_PLUGIN_OBJ, flags);
-	}
-
-	private Image getObjectImage(IFeatureChild feature) {
-		int flags = 0;
-		if (((FeatureChild) feature).getReferencedFeature() == null) {
-			int cflag = CompilerFlags.getFlag(null, CompilerFlags.F_UNRESOLVED_FEATURES);
-			if (cflag==CompilerFlags.ERROR)
-				flags = F_ERROR;
-			else if (cflag==CompilerFlags.WARNING)
-				flags = F_WARNING;
-		}
-		return get(PDEPluginImages.DESC_FEATURE_OBJ, flags);
-	}
-	
-	private Image getObjectImage(IProductFeature feature) {
-		return get(PDEPluginImages.DESC_FEATURE_OBJ, 0);
-	}
-
-	private Image getObjectImage(IFeatureData data) {
-		int flags = 0;
-		if (!data.exists())
-			flags = F_ERROR;
-		ImageDescriptor desc =
-			PlatformUI.getWorkbench().getEditorRegistry().getImageDescriptor(
-				data.getId());
-		return get(desc, flags);
-	}
-
-	private Image getObjectImage(IFeatureImport obj) {
-		FeatureImport iimport = (FeatureImport) obj;
-		int type = iimport.getType();
-		ImageDescriptor base;
-		int flags = 0;
-		
-		if (type==IFeatureImport.FEATURE) {
-			base = PDEPluginImages.DESC_FEATURE_OBJ;
-			IFeature feature = iimport.getFeature();
-			if (feature == null)
-				flags = F_ERROR;
-		}
-		else {
-			base = PDEPluginImages.DESC_REQ_PLUGIN_OBJ;
-			IPlugin plugin = iimport.getPlugin();
-			if (plugin == null)
-				flags = F_ERROR;
-		}
-
-		return get(base, flags);
-	}
-	private Image getObjectImage(IFeatureInfo info) {
-		int flags = 0;
-		String text = info.getDescription();
-		if (text != null)
-			text = text.trim();
-		if (text != null && text.length() > 0) {
-			// complete
-			flags = F_EDIT;
-		}
-		return get(PDEPluginImages.DESC_DOC_SECTION_OBJ, flags);
-	}
-
-	public Image getObjectImage(ISiteFeature obj) {
-		int flags = 0;
-		if (obj.getArchiveFile() != null) {
-			flags = F_BINARY;
-		}
-		return get(PDEPluginImages.DESC_JAVA_LIB_OBJ, flags);
-	}
-
-	public Image getObjectImage(ISiteArchive obj) {
-		return get(PDEPluginImages.DESC_JAVA_LIB_OBJ, 0);
-	}
-	public Image getObjectImage(ISiteCategoryDefinition obj) {
-		return get(PDEPluginImages.DESC_CATEGORY_OBJ);
-	}
-
-	public Image getObjectImage(ISiteCategory obj) {
-		int flags = obj.getDefinition() == null ? F_ERROR : 0;
-		return get(PDEPluginImages.DESC_CATEGORY_OBJ, flags);
-	}
-	public Image getObjectImage(PackageObject obj) {
-		return JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_PACKAGE);
-	}
-
-	public boolean isFullNameModeEnabled() {
-		return PDEPlugin.isFullNameModeEnabled();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEPerspective.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEPerspective.java
deleted file mode 100644
index 6610cab..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEPerspective.java
+++ /dev/null

@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui;
-
-import org.eclipse.ui.*;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.debug.ui.IDebugUIConstants;
-
-public class PDEPerspective implements IPerspectiveFactory {
-	
-	private IPageLayout factory;
-
-	public PDEPerspective() {
-		super();
-	}
-
-	public void createInitialLayout(IPageLayout factory) {
-		this.factory = factory;
-		addViews();
-		addActionSets();
-		addNewWizardShortcuts();
-		addPerspectiveShortcuts();
-		addViewShortcuts();
-	}
-	
-	private void addPerspectiveShortcuts() {
-		factory.addPerspectiveShortcut("org.eclipse.ui.resourcePerspective"); //$NON-NLS-1$
-		factory.addPerspectiveShortcut(JavaUI.ID_PERSPECTIVE);
-		factory.addPerspectiveShortcut(IDebugUIConstants.ID_DEBUG_PERSPECTIVE);		
-	}
-	
-	private void addViews() {
-		IFolderLayout topLeft =
-			factory.createFolder(
-				"topLeft", //$NON-NLS-1$
-				IPageLayout.LEFT,
-				0.25f,
-				factory.getEditorArea());
-		topLeft.addPlaceholder(IPageLayout.ID_RES_NAV);
-		topLeft.addView(JavaUI.ID_PACKAGES);
-		topLeft.addPlaceholder(JavaUI.ID_TYPE_HIERARCHY);
-		topLeft.addView(PDEPlugin.PLUGINS_VIEW_ID);
-
-		IFolderLayout bottom =
-			factory.createFolder(
-				"bottomRight", //$NON-NLS-1$
-				IPageLayout.BOTTOM,
-				0.75f,
-				factory.getEditorArea());
-		bottom.addView("org.eclipse.pde.runtime.LogView"); //$NON-NLS-1$
-		bottom.addView(IPageLayout.ID_TASK_LIST);
-		bottom.addView(IPageLayout.ID_PROBLEM_VIEW);
-		bottom.addView(IPageLayout.ID_PROP_SHEET);
-		
-		factory.addView(
-			IPageLayout.ID_OUTLINE,
-			IPageLayout.RIGHT,
-			0.75f,
-			factory.getEditorArea());		
-	}
-	
-	private void addActionSets() {
-		factory.addActionSet(IDebugUIConstants.LAUNCH_ACTION_SET);
-		factory.addActionSet(IDebugUIConstants.DEBUG_ACTION_SET);
-		factory.addActionSet(JavaUI.ID_ACTION_SET);
-		factory.addActionSet(JavaUI.ID_ELEMENT_CREATION_ACTION_SET);		
-	}
-	
-	private void addNewWizardShortcuts() {
-		factory.addNewWizardShortcut("org.eclipse.pde.ui.NewProductConfigurationWizard"); //$NON-NLS-1$
-		factory.addNewWizardShortcut("org.eclipse.jdt.ui.wizards.NewPackageCreationWizard"); //$NON-NLS-1$
-		factory.addNewWizardShortcut("org.eclipse.jdt.ui.wizards.NewClassCreationWizard"); //$NON-NLS-1$
-		factory.addNewWizardShortcut("org.eclipse.jdt.ui.wizards.NewInterfaceCreationWizard"); //$NON-NLS-1$
-		factory.addNewWizardShortcut("org.eclipse.jdt.ui.wizards.NewSourceFolderCreationWizard");	 //$NON-NLS-1$
-		factory.addNewWizardShortcut("org.eclipse.ui.wizards.new.folder");//$NON-NLS-1$
-		factory.addNewWizardShortcut("org.eclipse.ui.wizards.new.file");//$NON-NLS-1$
-	}
-	
-	private void addViewShortcuts() {
-		factory.addShowViewShortcut(JavaUI.ID_PACKAGES);
-		factory.addShowViewShortcut("org.eclipse.pde.runtime.LogView"); //$NON-NLS-1$
-		factory.addShowViewShortcut(PDEPlugin.PLUGINS_VIEW_ID);
-		factory.addShowViewShortcut(IPageLayout.ID_RES_NAV);
-		factory.addShowViewShortcut(IPageLayout.ID_PROBLEM_VIEW);
-		factory.addShowViewShortcut(IPageLayout.ID_TASK_LIST);
-		factory.addShowViewShortcut(IPageLayout.ID_OUTLINE);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEPlugin.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEPlugin.java
deleted file mode 100644
index d01dc0c..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEPlugin.java
+++ /dev/null

@@ -1,211 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui;
-
-import java.lang.reflect.*;
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.debug.core.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.preference.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.core.ischema.*;
-import org.eclipse.pde.internal.ui.editor.schema.*;
-import org.eclipse.pde.internal.ui.launcher.*;
-import org.eclipse.pde.internal.ui.util.*;
-import org.eclipse.pde.internal.ui.view.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.forms.*;
-import org.eclipse.ui.plugin.*;
-import org.osgi.framework.*;
-
-public class PDEPlugin extends AbstractUIPlugin implements IPDEUIConstants {
-
-	// Shared instance
-	private static PDEPlugin fInstance;
-	
-	// Launches listener
-	private LaunchListener fLaunchListener;
-	
-	private BundleContext fBundleContext;
-
-	private java.util.Hashtable fCounters;
-	
-	// Shared colors for all forms
-	private FormColors fFormColors;
-	private PDELabelProvider fLabelProvider;
-	private ILaunchConfigurationListener fLaunchConfigurationListener;
-
-	public PDEPlugin() {
-		fInstance = this;
-	}
-	
-	public URL getInstallURL() {
-		return getDefault().getBundle().getEntry("/"); //$NON-NLS-1$
-	}
-	
-	public static IWorkbenchPage getActivePage() {
-		return getDefault().internalGetActivePage();
-	}
-	public static Shell getActiveWorkbenchShell() {
-		IWorkbenchWindow window = getActiveWorkbenchWindow();
-		if (window != null) {
-			return window.getShell();
-		}
-		return null;
-	}
-	public static IWorkbenchWindow getActiveWorkbenchWindow() {
-		return getDefault().getWorkbench().getActiveWorkbenchWindow();
-	}
-	public static PDEPlugin getDefault() {
-		return fInstance;
-	}
-	public Hashtable getDefaultNameCounters() {
-		if (fCounters == null)
-			fCounters = new Hashtable();
-		return fCounters;
-	}
-	public static String getPluginId() {
-		return getDefault().getBundle().getSymbolicName();
-	}
-	
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-	
-	private IWorkbenchPage internalGetActivePage() {
-		return getWorkbench().getActiveWorkbenchWindow().getActivePage();
-	}
-
-	public static void log(IStatus status) {
-		ResourcesPlugin.getPlugin().getLog().log(status);
-	}
-
-	public static void logErrorMessage(String message) {
-		log(new Status(IStatus.ERROR, getPluginId(), IStatus.ERROR, message, null));
-	}
-
-	public static void logException(
-		Throwable e,
-		final String title,
-		String message) {
-		if (e instanceof InvocationTargetException) {
-			e = ((InvocationTargetException) e).getTargetException();
-		}
-		IStatus status = null;
-		if (e instanceof CoreException)
-			status = ((CoreException) e).getStatus();
-		else {
-			if (message == null)
-				message = e.getMessage();
-			if (message == null)
-				message = e.toString();
-			status = new Status(IStatus.ERROR, getPluginId(), IStatus.OK, message, e);
-		}
-		ResourcesPlugin.getPlugin().getLog().log(status);
-		Display display = SWTUtil.getStandardDisplay();
-		final IStatus fstatus = status;
-		display.asyncExec(new Runnable() {
-			public void run() {
-				ErrorDialog.openError(null, title, null, fstatus);
-			}
-		});
-	}
-
-	public static void logException(Throwable e) {
-		logException(e, null, null);
-	}
-
-	public static void log(Throwable e) {
-		if (e instanceof InvocationTargetException)
-			e = ((InvocationTargetException) e).getTargetException();
-		IStatus status = null;
-		if (e instanceof CoreException)
-			status = ((CoreException) e).getStatus();
-		else
-			status =
-				new Status(IStatus.ERROR, getPluginId(), IStatus.OK, e.getMessage(), e);
-		log(status);
-	}
-	
-	public FormColors getFormColors(Display display) {
-		if (fFormColors == null) {
-			fFormColors = new FormColors(display);
-			fFormColors.markShared();
-		}
-		return fFormColors;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		this.fBundleContext = context;
-		IAdapterManager manager = Platform.getAdapterManager();
-		SchemaAdapterFactory schemaFactory = new SchemaAdapterFactory();
-		manager.registerAdapters(schemaFactory, ISchemaObject.class);
-		manager.registerAdapters(schemaFactory, ISchemaObjectReference.class);
-		PluginsViewAdapterFactory factory = new PluginsViewAdapterFactory();
-		manager.registerAdapters(factory, ModelEntry.class);
-		manager.registerAdapters(factory, FileAdapter.class);
-
-		fLaunchConfigurationListener = new LaunchConfigurationListener();
-		DebugPlugin.getDefault().getLaunchManager().addLaunchConfigurationListener(fLaunchConfigurationListener);
-	}
-	
-	public BundleContext getBundleContext() {
-		return fBundleContext;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		if (fLaunchListener!=null)
-			fLaunchListener.shutdown();
-		if (fFormColors!=null) {
-			fFormColors.dispose();
-			fFormColors=null;
-		}
-		if (fLabelProvider != null) {
-			fLabelProvider.dispose();
-			fLabelProvider = null;
-		}
-		if (fLaunchConfigurationListener != null) {
-			DebugPlugin.getDefault().getLaunchManager().removeLaunchConfigurationListener(fLaunchConfigurationListener);
-			fLaunchConfigurationListener = null;
-		}
-		super.stop(context);
-	}
-
-	public PDELabelProvider getLabelProvider() {
-		if (fLabelProvider==null)
-			fLabelProvider = new PDELabelProvider();
-		return fLabelProvider;
-	}
-	
-	public LaunchListener getLaunchListener() {
-		if (fLaunchListener == null)
-			fLaunchListener = new LaunchListener();
-		return fLaunchListener;
-	}
-	
-	public static boolean isFullNameModeEnabled() {
-		IPreferenceStore store = getDefault().getPreferenceStore();
-		return store.getString(IPreferenceConstants.PROP_SHOW_OBJECTS).equals(IPreferenceConstants.VALUE_USE_NAMES);
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEPluginImages.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEPluginImages.java
deleted file mode 100644
index 64be9fc..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEPluginImages.java
+++ /dev/null

@@ -1,259 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui;
-
-import java.net.*;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.*;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Bundle of all images used by the PDE plugin.
- */
-public class PDEPluginImages {
-
-	private static final String NAME_PREFIX= PDEPlugin.getPluginId()+"."; //$NON-NLS-1$
-
-	private static ImageRegistry PLUGIN_REGISTRY;
-	
-	public final static String ICONS_PATH = "icons/"; //$NON-NLS-1$
-
-	/**
-	 * Set of predefined Image Descriptors.
-	 */
-	
-	private static final String PATH_OBJ= ICONS_PATH+"obj16/"; //$NON-NLS-1$
-	private static final String PATH_VIEW = ICONS_PATH+"view16/"; //$NON-NLS-1$
-	private static final String PATH_LCL= ICONS_PATH+"elcl16/"; //$NON-NLS-1$
-	private static final String PATH_LCL_DISABLED= ICONS_PATH+"dlcl16/"; //$NON-NLS-1$
-	private static final String PATH_TOOL = ICONS_PATH + "etool16/"; //$NON-NLS-1$
-	private static final String PATH_OVR = ICONS_PATH + "ovr16/"; //$NON-NLS-1$
-	private static final String PATH_WIZBAN = ICONS_PATH + "wizban/"; //$NON-NLS-1$
-
-	/**
-	 * Frequently used images
-	 */
-	public static final String IMG_FORM_WIZ = NAME_PREFIX+"FORM_WIZ"; //$NON-NLS-1$
-	public static final String IMG_FORM_BANNER = NAME_PREFIX+"FORM_BANNER"; //$NON-NLS-1$
-	public static final String IMG_ATT_CLASS_OBJ = NAME_PREFIX + "IMG_ATT_CLASS_OBJ"; //$NON-NLS-1$
-	public static final String IMG_ATT_FILE_OBJ  = NAME_PREFIX + "IMG_ATT_FILE_OBJ"; //$NON-NLS-1$
-	public static final String IMG_ATT_IMPL_OBJ  = NAME_PREFIX + "IMG_ATT_IMPL_OBJ"; //$NON-NLS-1$
-	public static final String IMG_ATT_REQ_OBJ   = NAME_PREFIX + "IMG_ATT_REQ_OBJ"; //$NON-NLS-1$
-	public static final String IMG_GENERIC_XML_OBJ  = NAME_PREFIX + "IMG_GENERIC_XML_OBJ"; //$NON-NLS-1$
-
-
-	/**
-	 * OBJ16
-	 */
-	public static final ImageDescriptor DESC_MAIN_TAB  = create(PATH_OBJ, "main_tab.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_ALL_SC_OBJ    = create(PATH_OBJ, "all_sc_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_ATT_CLASS_OBJ = create(PATH_OBJ, "att_class_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_ATT_FILE_OBJ  = create(PATH_OBJ, "att_file_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_ATT_IMPL_OBJ  = create(PATH_OBJ, "att_impl_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_ATT_REQ_OBJ   = create(PATH_OBJ, "att_req_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_ATT_URI_OBJ   = create(PATH_OBJ, "att_URI_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_CHOICE_SC_OBJ = create(PATH_OBJ, "choice_sc_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_FEATURE_JAR_OBJ  = create(PATH_OBJ, "ftr_jar_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_FEATURE_MF_OBJ   = create(PATH_OBJ, "ftr_mf_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_FEATURE_OBJ   = create(PATH_OBJ, "feature_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_NOREF_FEATURE_OBJ = create(PATH_OBJ, "noref_feature_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_ELREF_SC_OBJ  = create(PATH_OBJ, "elref_sc_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_EXTENSIONS_OBJ = create(PATH_OBJ, "extensions_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_EXTENSION_OBJ = create(PATH_OBJ, "extension_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_EXT_PLUGIN_OBJ   = create(PATH_OBJ, "ext_plugin_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_EXT_FRAGMENT_OBJ   = create(PATH_OBJ, "external_frgmt_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_EXT_POINTS_OBJ   = create(PATH_OBJ, "ext_points_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_EXT_POINT_OBJ   = create(PATH_OBJ, "ext_point_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_GEL_SC_OBJ    = create(PATH_OBJ, "gel_sc_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_GENERIC_XML_OBJ = create(PATH_OBJ, "generic_xml_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_GROUP_SC_OBJ   = create(PATH_OBJ, "group_sc_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_JAR_OBJ   = create(PATH_OBJ, "jar_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_JAR_LIB_OBJ   = create(PATH_OBJ, "jar_l_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_JAVA_LIB_OBJ   = create(PATH_OBJ, "java_lib_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_OVERVIEW_OBJ  = create(PATH_OBJ, "overview_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_PAGE_OBJ   = create(PATH_OBJ, "page_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_PLUGIN_MF_OBJ = create(PATH_OBJ, "plugin_mf_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_FRAGMENT_MF_OBJ = create(PATH_OBJ, "frgmt_mf_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_BUILD_VAR_OBJ = create(PATH_OBJ, "build_var_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_LOOP_OBJ = create(PATH_OBJ, "loop_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_LOOP_NODE_OBJ = create(PATH_OBJ, "loop_node_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_PROCESSING_INST_OBJ = create(PATH_OBJ, "processinginst.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_XML_ELEMENT_OBJ = create(PATH_OBJ, "element.gif"); //$NON-NLS-1$
-	
-	public static final ImageDescriptor DESC_PLUGIN_OBJ   = create(PATH_OBJ, "plugin_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_PLUGIN_DIS_OBJ   = create(PATH_OBJ, "plugin_dis_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_PLUGIN_CONFIGS_OBJ   = create(PATH_OBJ, "plugin_configs_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_PLUGIN_CONFIG_OBJ   = create(PATH_OBJ, "plugin_config_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_FRAGMENT_OBJ   = create(PATH_OBJ, "frgmt_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_FRAGMENT_DIS_OBJ   = create(PATH_OBJ, "frgmt_dis_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_REQ_PLUGINS_OBJ   = create(PATH_OBJ, "req_plugins_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_FRAGMENTS_OBJ   = create(PATH_OBJ, "frgmts_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_REQ_PLUGIN_OBJ   = create(PATH_OBJ, "req_plugin_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_RUNTIME_OBJ   = create(PATH_OBJ, "runtime_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_SCHEMA_OBJ   = create(PATH_OBJ, "schema_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_SCOMP_JAR_OBJ = create(PATH_OBJ, "scomp_jar_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_SEQ_SC_OBJ   = create(PATH_OBJ, "seq_sc_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_DOC_SECTION_OBJ = create(PATH_OBJ, "doc_section_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_ALERT_OBJ = create(PATH_OBJ, "alert_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_TSK_ALERT_OBJ = create(PATH_OBJ, "tsk_alert_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_LINK_OBJ = create(PATH_OBJ, "link_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_LINKS_OBJ = create(PATH_OBJ, "links_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_ERROR_ST_OBJ = create(PATH_OBJ, "error_st_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_WARNING_ST_OBJ = create(PATH_OBJ, "warning_st_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_INFO_ST_OBJ = create(PATH_OBJ, "info_st_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_CATEGORY_OBJ = create(PATH_OBJ, "category_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_PSEARCH_OBJ = create(PATH_OBJ, "psearch_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_SITE_OBJ = create(PATH_OBJ, "site_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_JUNIT_MAIN_TAB = create(PATH_OBJ, "test.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_OUTPUT_FOLDER_OBJ = create(PATH_OBJ, "output_folder_attrib.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_SOURCE_ATTACHMENT_OBJ = create(PATH_OBJ, "source_attach_attrib.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_FTR_XML_OBJ = create(PATH_OBJ, "ftr_xml_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_OK_TRANSLATE_OBJ = create(PATH_OBJ, "ok_st_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_NO_TRANSLATE_OBJ = create(PATH_OBJ, "incomplete_tsk.gif"); //$NON-NLS-1$
-	/**
-	 * OVR16
-	 */
-	public static final ImageDescriptor DESC_DOC_CO   = create(PATH_OVR, "doc_co.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_WARNING_CO   = create(PATH_OVR, "warning_co.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_ERROR_CO   = create(PATH_OVR, "error_co.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_EXPORT_CO   = create(PATH_OVR, "export_co.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_EXTERNAL_CO   = create(PATH_OVR, "external_co.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_BINARY_CO   = create(PATH_OVR, "binary_co.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_JAVA_CO   = create(PATH_OVR, "java_co.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_JAR_CO   = create(PATH_OVR, "jar_co.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_PROJECT_CO   = create(PATH_OVR, "project_co.gif"); //$NON-NLS-1$
-
-	/**
-	 * TOOL16
-	 */
-	public static final ImageDescriptor DESC_DEFCON_TOOL = create(PATH_TOOL, "defcon_wiz.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_NEWEXPRJ_TOOL = create(PATH_TOOL, "newexprj_wiz.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_NEWEXP_TOOL = create(PATH_TOOL, "newexp_wiz.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_NEWEX_TOOL = create(PATH_TOOL, "newex_wiz.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_NEWFTRPRJ_TOOL = create(PATH_TOOL, "newftrprj_wiz.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_NEWPPRJ_TOOL = create(PATH_TOOL, "newpprj_wiz.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_NEWFRAGPRJ_TOOL = create(PATH_TOOL, "newfragprj_wiz.gif"); //$NON-NLS-1$
-
-
-
-	/**
-	 * LCL
-	 */
-	public static final ImageDescriptor DESC_ADD_ATT = create(PATH_LCL, "add_att.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_ALPHAB_SORT_CO = create(PATH_LCL, "alphab_sort_co.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_CLONE_ATT = create(PATH_LCL, "clone_att.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_CLONE_EL = create(PATH_LCL, "clone_el.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_GENERATE_CLASS = create(PATH_LCL, "generate_class.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_GOTOOBJ = create(PATH_LCL, "goto_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_PROPERTIES = create(PATH_LCL, "properties.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_REFRESH = create(PATH_LCL, "refresh.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_REMOVE_ATT = create(PATH_LCL, "remove_att.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_MAXIMIZE = create(PATH_LCL, "maximize.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_RESTORE = create(PATH_LCL, "restore.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_FULL_HIERARCHY = create(PATH_LCL, "full_hierarchy.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_HORIZONTAL = create(PATH_LCL, "th_horizontal.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_VERTICAL = create(PATH_LCL, "th_vertical.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_COLLAPSE_ALL = create(PATH_LCL, "collapseall.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_HELP = create(PATH_LCL, "help.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_LINK_WITH_EDITOR = create(PATH_LCL, "synced.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_CALLEES = create(PATH_LCL, "ch_callees.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_CALLERS = create(PATH_LCL, "ch_callers.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_DEP_LOOP = create(PATH_LCL, "dep_loop.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_FLAT_LAYOUT = create(PATH_LCL, "flatLayout.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_HIERARCHICAL_LAYOUT = create(PATH_LCL, "hierarchicalLayout.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_HISTORY_LIST = create(PATH_LCL, "history_list.gif"); //$NON-NLS-1$
-	
-	public static final ImageDescriptor DESC_ADD_ATT_DISABLED = create(PATH_LCL_DISABLED, "add_att.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_ALPHAB_SORT_CO_DISABLED = create(PATH_LCL_DISABLED, "alphab_sort_co.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_CLONE_ATT_DISABLED = create(PATH_LCL_DISABLED, "clone_att.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_CLONE_EL_DISABLED = create(PATH_LCL_DISABLED, "clone_el.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_GENERATE_CLASS_DISABLED = create(PATH_LCL_DISABLED, "generate_class.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_GOTOOBJ_DISABLED = create(PATH_LCL_DISABLED, "goto_obj.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_PROPERTIES_DISABLED = create(PATH_LCL_DISABLED, "properties.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_REFRESH_DISABLED = create(PATH_LCL_DISABLED, "refresh.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_REMOVE_ATT_DISABLED = create(PATH_LCL_DISABLED, "remove_att.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_HORIZONTAL_DISABLED = create(PATH_LCL_DISABLED, "th_horizontal.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_VERTICAL_DISABLED = create(PATH_LCL_DISABLED, "th_vertical.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_COLLAPSE_ALL_DISABLED = create(PATH_LCL_DISABLED, "collapseall.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_LINK_WITH_EDITOR_DISABLED = create(PATH_LCL_DISABLED, "synced.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_CALLEES_DISABLED = create(PATH_LCL_DISABLED, "ch_callees.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_CALLERS_DISABLED = create(PATH_LCL_DISABLED, "ch_callers.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_DEP_LOOP_DISABLED = create(PATH_LCL_DISABLED, "dep_loop.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_FLAT_LAYOUT_DISABLED = create(PATH_LCL_DISABLED, "flatLayout.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_HIERARCHICAL_LAYOUT_DISABLED = create(PATH_LCL_DISABLED, "hierarchicalLayout.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_HISTORY_LIST_DISABLED = create(PATH_LCL_DISABLED, "history_list.gif"); //$NON-NLS-1$
-
-	public static final ImageDescriptor DESC_RUN_EXC = create(PATH_OBJ, "run_exc.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_DEBUG_EXC = create(PATH_OBJ, "debug_exc.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_WORKBENCH_LAUNCHER_WIZ = create(PATH_TOOL, "eclipse_launcher_wiz.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_NEWEXP_WIZ_TOOL = create(PATH_TOOL, "newexp_wiz.gif"); //$NON-NLS-1$
-
-	/**
-	 * WIZ
-	 */
- 	public static final ImageDescriptor DESC_NEWPPRJ_WIZ = create(PATH_WIZBAN, "newpprj_wiz.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_NEWFRAGPRJ_WIZ = create(PATH_WIZBAN, "newfprj_wiz.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_DEFCON_WIZ  = create(PATH_WIZBAN, "defcon_wiz.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_NEWEX_WIZ   = create(PATH_WIZBAN, "newex_wiz.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_NEWEXP_WIZ  = create(PATH_WIZBAN, "newexp_wiz.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_NEWEXPRJ_WIZ   = create(PATH_WIZBAN, "newexprj_wiz.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_NEWFTRPRJ_WIZ   = create(PATH_WIZBAN, "newftrprj_wiz.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_NEWFTRPTCH_WIZ = create(PATH_WIZBAN, "newefix_wizban.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_NEWSITEPRJ_WIZ   = create(PATH_WIZBAN, "newsiteprj_wiz.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_CONVJPPRJ_WIZ =create(PATH_WIZBAN, "convjpprj_wiz.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_EXT_POINT_SCHEMA_WIZ = create(PATH_WIZBAN, "schema_wiz.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_DEBUG_WIZ     = create(PATH_WIZBAN, "debug_wiz.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_RUN_WIZ     = create(PATH_WIZBAN, "run_wiz.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_PLUGIN_IMPORT_WIZ  = create(PATH_WIZBAN, "imp_extplug_wiz.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_PLUGIN_EXPORT_WIZ  = create(PATH_WIZBAN, "exp_deployplug_wiz.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_FEATURE_IMPORT_WIZ  = create(PATH_WIZBAN, "imp_extfeat_wiz.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_FEATURE_EXPORT_WIZ  = create(PATH_WIZBAN, "exp_deployfeat_wiz.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_MIGRATE_30_WIZ = create(PATH_WIZBAN, "migrate_30_wiz.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_PRODUCT_WIZ = create(PATH_WIZBAN, "product_wiz.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_PRODUCT_EXPORT_WIZ = create(PATH_WIZBAN, "exp_product.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_JAR_TO_PLUGIN_WIZ = create(PATH_WIZBAN, "jarToPlugin_wiz.gif"); //$NON-NLS-1$
-	public static final ImageDescriptor DESC_EXTSTR_WIZ = create(PATH_WIZBAN, "extstr_wiz.gif"); //$NON-NLS-1$
-
-	/**
-	 * View
-	 */
-	public static final ImageDescriptor DESC_ARGUMENT_TAB  = create(PATH_VIEW, "variable_tab.gif"); //$NON-NLS-1$
-	private static ImageDescriptor create(String prefix, String name) {
-		return ImageDescriptor.createFromURL(makeImageURL(prefix, name));
-	}
-	public static Image get(String key) {
-		if (PLUGIN_REGISTRY==null) initialize();
-		return PLUGIN_REGISTRY.get(key);
-	}
-
-/* package */
-private static final void initialize() {
-	PLUGIN_REGISTRY = new ImageRegistry();
-	manage(IMG_ATT_CLASS_OBJ,DESC_ATT_CLASS_OBJ);
-	manage(IMG_ATT_FILE_OBJ, DESC_ATT_FILE_OBJ);
-	manage(IMG_ATT_IMPL_OBJ, DESC_ATT_IMPL_OBJ);
-	manage(IMG_ATT_REQ_OBJ,  DESC_ATT_REQ_OBJ);
-	manage(IMG_GENERIC_XML_OBJ, DESC_GENERIC_XML_OBJ);
-}
-
-private static URL makeImageURL(String prefix, String name) {
-	String path = "$nl$/" + prefix + name; //$NON-NLS-1$
-	return Platform.find(PDEPlugin.getDefault().getBundle(), new Path(path));
-}
-
-public static Image manage(String key, ImageDescriptor desc) {
-	Image image = desc.createImage();
-	PLUGIN_REGISTRY.put(key, image);
-	return image;
-}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java
deleted file mode 100644
index e407f04..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java
+++ /dev/null

@@ -1,2189 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005 IBM Corporation and others. All rights reserved.   This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: 
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.pde.internal.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public class PDEUIMessages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.pde.internal.ui.pderesources";//$NON-NLS-1$
-
-	public static String ProjectStructurePage_sourceName;
-	public static String ProjectNamesPage_duplicateNames;
-	public static String ProjectStructurePage_fsourceName;
-	public static String DefaultCodeGenerationPage_initialName;
-	public static String DefaultCodeGenerationPage_initialFName;
-
-	//
-	// PDE resource strings
-	// Part 2.    (TRANSLATE Part 2)
-	// These are the translable properties.
-	//
-
-	public static String UpdateManager_noUndo;
-	public static String UpdateManager_noRedo;
-	public static String UpdateManager_undo;
-	public static String UpdateManager_redo;
-	public static String UpdateManager_op_add;
-	public static String UpdateManager_op_remove;
-	public static String UpdateManager_op_change;
-
-	//
-
-	public static String PluginModelManager_outOfSync;
-
-	// Status text #####################################
-	public static String ExternalModelManager_scanningProblems;
-	public static String ExtensionElementDetails_setSelectedDesc;
-	public static String ExternalModelManager_processingPath;
-	public static String Errors_SetupError;
-	public static String Errors_SetupError_NoPlatformHome;
-	public static String Errors_CreationError;
-	public static String Errors_CreationError_NoWizard;
-
-	public static String MissingPDENature_title;
-	public static String MissingPDENature_message;
-	public static String MissingPDENature_stopWarning;
-	public static String MissingPDENature_keepWarning;
-	public static String MissingPDENature_openWizard;
-
-	public static String MultiPageEditor_wrongEditor;
-	public static String MultiPageEditor_defaultPage_source;
-	public static String MultiPageEditor_defaultPage_overview;
-
-	public static String CodeGenerator_missing_title;
-	public static String CodeGenerator_missing_type;
-	public static String CodeGenerator_missing_types;
-	public static String CodeGenerator_desc_class;
-	public static String CodeGenerator_desc_constructor;
-	public static String CodeGenerator_desc_method;
-
-	// Reusable Parts ################################
-	public static String WizardCheckboxTablePart_selectAll;
-	public static String WizardCheckboxTablePart_deselectAll;
-	public static String WizardCheckboxTablePart_counter;
-
-	// Editors #######################################
-
-	// Source ##################################
-	public static String SourcePage_title;
-	public static String SourcePage_errorTitle;
-	public static String SourcePage_errorMessage;
-
-	// Outline #################################
-	public static String ToggleLinkWithEditorAction_label;
-	public static String ToggleLinkWithEditorAction_toolTip;
-	public static String ToggleLinkWithEditorAction_description;
-	public static String PDEMultiPageContentOutline_SortingAction_label;
-	public static String PDEMultiPageContentOutline_SortingAction_tooltip;
-	public static String PDEMultiPageContentOutline_SortingAction_description;
-
-	// build.properties editor #####################
-	public static String BuildEditor_header;
-	public static String BuildEditor_BuildPage_title;
-	public static String BuildEditor_Custom_plugin;
-	public static String BuiltFeaturesWizard_title;
-	public static String BuildEditor_Custom_fragment;
-	public static String BuildEditor_Custom_feature;
-
-	public static String BuildEditor_AddLibraryDialog_duplicate;
-	public static String BuildEditor_AddLibraryDialog_label;
-
-	public static String BuildEditor_RuntimeInfoSection_title;
-	public static String BuildEditor_RuntimeInfoSection_desc;
-	public static String BuildEditor_RuntimeInfoSection_duplicateLibrary;
-	public static String BuildEditor_RuntimeInfoSection_duplicateFolder;
-	public static String BuildEditor_RuntimeInfoSection_buildInclude;
-	public static String BuildEditor_RuntimeInfoSection_addLibrary;
-	public static String BuildEditor_RuntimeInfoSection_popupAdd;
-	public static String BuildEditor_RuntimeInfoSection_addFolder;
-	public static String BuildEditor_RuntimeInfoSection_popupFolder;
-
-	public static String BuildEditor_SrcSection_title;
-	public static String BuildEditor_SrcSection_desc;
-	public static String BuildEditor_BinSection_title;
-	public static String BuildEditor_BinSection_desc;
-
-	public static String BuildEditor_ClasspathSection_add;
-	public static String BuildEditor_SourceFolderSelectionDialog_button;
-	public static String BuildEditor_ClasspathSection_remove;
-	public static String BuildEditor_ClasspathSection_title;
-	public static String BuildEditor_ClasspathSection_desc;
-	public static String BuildEditor_ClasspathSection_jarsTitle;
-	public static String BuildEditor_ClasspathSection_jarsDesc;
-
-	// Feature Manifest Editor ####################
-	public static String FeatureEditor_previewAction_label;
-	public static String FeatureEditor_BuildAction_label;
-	public static String FeatureEditor_Unresolved_title;
-	public static String FeatureEditor_Unresolved_message;
-	public static String FeatureEditor_FeaturePage_title;
-	public static String FeatureEditor_InfoPage_title;
-	public static String FeatureEditor_InfoPage_heading;
-	public static String FeatureEditor_ReferencePage_title;
-	public static String FeatureEditor_ReferencePage_heading;
-	public static String FeatureEditor_IncludesPage_title;
-	public static String FeatureEditor_IncludesPage_heading;
-	public static String FeatureEditor_ReferencePage_portabilityTitle;
-	public static String FeatureEditor_ReferencePage_portabilityDesc;
-	public static String FeatureEditor_DependenciesPage_heading;
-	public static String FeatureEditor_DependenciesPage_title;
-	public static String FeatureEditor_Version_title;
-	public static String FeatureEditor_Version_message;
-	public static String FeatureEditor_AdvancedPage_title;
-	public static String FeatureEditor_AdvancedPage_heading;
-
-	public static String FeatureEditor_PortabilityChoicesDialog_title;
-	public static String FeatureEditor_PortabilityChoicesDialog_choices;
-
-	public static String FeatureEditor_SpecSection_title;
-	public static String FeatureEditor_SpecSection_desc;
-	public static String FeatureEditor_SpecSection_desc_patch;
-	public static String FeatureEditor_SpecSection_id;
-	public static String FeatureEditor_SpecSection_patchedId;
-	public static String FeatureEditor_SpecSection_name;
-	public static String FeatureEditor_SpecSection_version;
-	public static String FeatureEditor_SpecSection_patchedVersion;
-	public static String FeatureEditor_SpecSection_provider;
-	public static String FeatureEditor_SpecSection_plugin;
-	public static String FeatureEditor_SpecSection_browse;
-	public static String FeatureEditor_SpecSection_updateSite;
-	public static String FeatureEditor_SpecSection_updateUrlLabel;
-	public static String FeatureEditor_SpecSection_updateUrl;
-	public static String FeatureEditor_SpecSection_createJar;
-	public static String FeatureEditor_SpecSection_synchronize;
-	public static String FeatureEditor_SpecSection_badVersionTitle;
-	public static String FeatureEditor_SpecSection_badVersionMessage;
-	public static String FeatureEditor_SpecSection_badUrlTitle;
-	public static String FeatureEditor_SpecSection_badUrlMessage;
-	public static String FeatureEditor_PortabilitySection_title;
-	public static String FeatureEditor_PortabilitySection_desc;
-	public static String FeatureEditor_PortabilitySection_os;
-	public static String FeatureEditor_PortabilitySection_ws;
-	public static String FeatureEditor_PortabilitySection_nl;
-	public static String FeatureEditor_PortabilitySection_arch;
-	public static String FeatureEditor_PortabilitySection_edit;
-
-	public static String FeatureEditor_IncludedFeatures_title;
-	public static String FeatureEditor_IncludedFeatures_desc;
-	public static String FeatureEditor_IncludedFeatures_new;
-
-	public static String SiteEditor_IncludedFeaturesDetailsSection_title;
-	public static String SiteEditor_IncludedFeaturesDetailsSection_desc;
-	public static String SiteEditor_IncludedFeaturesDetailsSection_featureLabel;
-	public static String SiteEditor_IncludedFeaturesDetailsSection_optional;
-	public static String SiteEditor_IncludedFeaturesDetailsSection_searchLocation;
-	public static String SiteEditor_IncludedFeaturesDetailsSection_root;
-	public static String SiteEditor_IncludedFeaturesDetailsSection_self;
-	public static String SiteEditor_IncludedFeaturesDetailsSection_both;
-
-	public static String FeatureEditor_IncludedFeaturePortabilitySection_title;
-	public static String FeatureEditor_IncludedFeaturePortabilitySection_desc;
-
-	public static String FeatureEditor_HandlerSection_title;
-	public static String FeatureEditor_HandlerSection_desc;
-	public static String FeatureEditor_HandlerSection_library;
-	public static String FeatureEditor_HandlerSection_handler;
-
-	public static String FeatureEditor_InstallSection_title;
-	public static String FeatureEditor_InstallSection_desc;
-	public static String FeatureEditor_InstallSection_colocation_desc;
-	public static String FeatureEditor_InstallSection_colocation;
-	public static String FeatureEditor_InstallSection_exclusive;
-
-	public static String FeatureEditor_InfoSection_heading;
-	public static String FeatureEditor_InfoSection_desc;
-
-	public static String FeatureEditor_InfoSection_info;
-	public static String FeatureEditor_InfoSection_url;
-	public static String FeatureEditor_InfoSection_text;
-	public static String FeatureEditor_info_description;
-	public static String FeatureEditor_info_license;
-	public static String FeatureEditor_info_copyright;
-	public static String FeatureEditor_info_discoveryUrls;
-
-	public static String FeatureEditor_PluginSection_pluginTitle;
-	public static String FeatureEditor_PluginSection_pluginDesc;
-	public static String FeatureEditor_PluginSection_new;
-
-	public static String FeatureEditor_PluginPortabilitySection_title;
-	public static String FeatureEditor_PluginPortabilitySection_desc;
-
-	public static String SiteEditor_PluginDetailsSection_title;
-	public static String SiteEditor_PluginDetailsSection_desc;
-	public static String SiteEditor_PluginDetailsSection_pluginLabel;
-	public static String SiteEditor_PluginDetailsSection_downloadSize;
-	public static String SiteEditor_PluginDetailsSection_installSize;
-	public static String SiteEditor_PluginDetailsSection_unpack;
-
-	public static String FeatureEditor_DataSection_title;
-	public static String FeatureEditor_DataSection_desc;
-	public static String FeatureEditor_DataSection_new;
-
-	public static String SiteEditor_DataDetailsSection_title;
-	public static String SiteEditor_DataDetailsSection_desc;
-	public static String SiteEditor_DataDetailsSection_downloadSize;
-	public static String SiteEditor_DataDetailsSection_installSize;
-
-	public static String FeatureEditor_DataDetailsSection_title;
-	public static String FeatureEditor_DataDetailsSection_desc;
-
-	public static String FeatureEditor_modelsInUse_title;
-	public static String FeatureEditor_modelsInUse_message;
-	public static String FeatureExportJob_taskName;
-	public static String FeatureExportJob_problems;
-	public static String FeatureExportJob_name;
-	public static String FeatureExportJob_error;
-
-	public static String BuildSiteJob_refresh;
-	
-	public static String FeatureEditor_RequiresSection_title;
-	public static String FeatureEditor_RequiresSection_desc;
-	public static String FeatureEditor_RequiresSection_sync;
-	public static String FeatureEditor_RequiresSection_compute;
-	public static String FeatureEditor_RequiresSection_plugin;
-	public static String FeatureEditor_RequiresSection_feature;
-
-	public static String FeatureEditor_URLSection_desc;
-	public static String FeatureEditor_URLSection_new;
-	public static String FeatureEditor_URLSection_newDiscoverySite;
-	public static String FeatureEditor_URLSection_newURL;
-	public static String FeatureEditor_URLDetailsSection_desc;
-	public static String FeatureEditor_URLDetailsSection_updateUrlLabel;
-	public static String FeatureEditor_URLDetailsSection_updateUrl;
-	public static String FeatureEditor_URLDetailsSection_badUrlTitle;
-	public static String FeatureEditor_URLDetailsSection_badUrlMessage;
-
-
-	public static String FeatureEditor_InfoPage_ContentSection_title;
-	public static String FeatureEditor_InfoPage_ContentSection_text;
-
-	public static String FeatureEditor_InfoPage_PackagingSection_title;
-	public static String FeatureEditor_InfoPage_PackagingSection_text;
-
-	public static String FeatureEditor_InfoPage_PublishingSection_title;
-	public static String FeatureEditor_InfoPage_PublishingSection_text;
-	public static String FeatureExportWizardPage_targetEnvironmentText;
-
-	public static String FeatureOutlinePage_discoverUrls;
-
-	// Plug-in Manifest Editor ########################
-	public static String ManifestEditor_DependenciesForm_title;
-
-	public static String ManifestEditor_DetailChildrenSection_title;
-	public static String ManifestEditor_DetailChildrenSection_bodyText;
-
-	public static String ManifestEditor_DetailExtensionPointSection_title;
-	public static String ManifestEditor_DetailExtensionPointSection_new;
-	public static String ManifestEditor_DetailExtensionPointSection_newExtensionPoint;
-	public static String ManifestEditor_DetailExtensionPointSection_openSchema;
-
-	public static String ManifestEditor_DetailExtension_title;
-	public static String ManifestEditor_DetailExtension_new;
-	public static String ManifestEditor_DetailExtension_edit;
-	public static String ManifestEditor_DetailExtension_newExtension;
-	public static String ManifestEditor_DetailExtension_collapseAll;
-	public static String ManifestEditor_DetailExtension_up;
-	public static String ManifestEditor_DetailExtension_down;
-
-	public static String ManifestEditor_BodyTextSection_title;
-	public static String ManifestEditor_BodyTextSection_titleFull;
-
-	public static String ManifestEditor_ExportSection_title;
-	public static String ManifestEditor_ExportSection_desc;
-	public static String ManifestEditor_ExportSection_fullExport;
-	public static String ManifestEditor_ExportSection_selectedExport;
-	public static String ManifestEditor_ExportSection_add;
-	public static String ManifestEditor_ExportSection_remove;
-	public static String PackageSelectionDialog_label;
-	public static String PackageSelectionDialog_title;
-	public static String PackageSelectionDialog_nopackages_message;
-
-	public static String ManifestEditor_LibraryTypeSection_title;
-	public static String ManifestEditor_LibraryTypeSection_desc;
-	public static String ManifestEditor_LibraryTypeSection_code;
-	public static String ManifestEditor_LibraryTypeSection_resources;
-
-	public static String ManifestEditor_ExtensionElementPR_finish;
-
-	public static String ManifestEditor_ExtensionPointForm_title;
-
-	public static String ManifestEditor_ExtensionPointSection_title;
-	public static String ManifestEditor_ExtensionPointSection_desc;
-	public static String ManifestEditor_ExtensionPointSection_fdesc;
-	public static String ManifestEditor_ExtensionPointSection_more;
-
-	public static String ManifestEditor_ExtensionSection_title;
-	public static String ManifestEditor_ExtensionSection_desc;
-	public static String ManifestEditor_ExtensionSection_fdesc;
-	public static String ManifestEditor_ExtensionSection_more;
-
-	public static String ManifestEditor_ExtensionForm_title;
-
-	public static String ManifestEditor_ExtensionsPropertySheet_newAttribute;
-	public static String ManifestEditor_ExtensionsPropertySheet_addAttAction_label;
-	public static String ManifestEditor_ExtensionsPropertySheet_addAttAction_tooltip;
-	public static String ManifestEditor_ExtensionsPropertySheet_removeAttAction_label;
-	public static String ManifestEditor_ExtensionsPropertySheet_removeAttAction_tooltip;
-	public static String ManifestEditor_ExtensionsPropertySheet_cloneAction_text;
-	public static String ManifestEditor_ExtensionsPropertySheet_cloneAction_tooltip;
-	public static String ManifestEditor_ExtensionsPropertySheet_newAttributeEntry;
-
-	public static String ManifestEditor_TemplatePage_title;
-	public static String ManifestEditor_templatePage_heading;
-	public static String ManifestEditor_OverviewPage_title;
-	public static String ManifestEditor_DependenciesPage_title;
-	public static String ManifestEditor_RuntimePage_title;
-	public static String ManifestEditor_ExtensionsPage_title;
-	public static String ManifestEditor_ExtensionPointsPage_title;
-
-	public static String ManifestEditor_ExtensionPointDetails_validate_errorStatus;
-	public static String ManifestEditor_ExtensionPointDetails_schemaLocation_title;
-	public static String ManifestEditor_ExtensionPointDetails_schemaLocation_desc;
-
-	public static String ManifestEditor_ContentSection_title;
-	public static String ManifestEditor_ContentSection_ftitle;
-
-	public static String ManifestEditor_DeployingSection_title;
-
-	public static String ManifestEditor_JarsSection_title;
-	public static String ManifestEditor_JarsSection_desc;
-	public static String ManifestSourcePage_dependencies;
-	public static String ManifestEditor_JarsSection_new;
-	public static String ManifestEditor_JarsSection_dialogTitle;
-	public static String ManifestEditor_JarsSection_dialogMessage;
-	public static String ManifestEditor_JarsSection_rtitle;
-	public static String ManifestEditor_JarsSection_missingSource_duplicateFolder;
-
-	public static String ManifestEditor_LibrarySection_title;
-	public static String ManifestEditor_LibrarySection_fdesc;
-	public static String ManifestEditor_LibrarySection_desc;
-	public static String ManifestEditor_LibrarySection_new;
-	public static String ManifestEditor_LibrarySection_up;
-	public static String ManifestEditor_LibrarySection_down;
-	public static String ManifestEditor_LibrarySection_newLibrary;
-	public static String ManifestEditor_LibrarySection_newLibraryEntry;
-	public static String NewManifestEditor_LibrarySection_add;
-	public static String NewManifestEditor_LibrarySection_new;
-	public static String NewManifestEditor_LibrarySection_remove;
-	public static String ManifestEditor_RuntimeLibraryDialog_label;
-	public static String ManifestEditor_RuntimeLibraryDialog_default;
-	public static String ManifestEditor_RuntimeLibraryDialog_validationError;
-
-	public static String ManifestEditor_noPlatformHome;
-	public static String ManifestSourcePage_libraries;
-	public static String MailTemplate_perspectiveName;
-	public static String ManifestSourcePage_extensions;
-	public static String MainMethodSearchEngine_search;
-	public static String ManifestEditor_ManifestPropertySheet_gotoAction_label;
-	public static String ManifestEditor_ManifestPropertySheet_gotoAction_tooltip;
-
-	public static String ManifestEditor_ImportListSection_title;
-	public static String ManifestEditor_ImportListSection_desc;
-	public static String ManifestEditor_ImportListSection_fdesc;
-	public static String ManifestEditor_ImportListSection_new;
-	public static String ManifestEditor_ImportListSection_loopWarning;
-	public static String ManifestEditor_ImportListSection_updateBuildPath;
-	public static String ManifestEditor_ImportListSection_updatingBuildPath;
-
-	public static String ManifestEditor_ImportStatusSection_title;
-	public static String ManifestEditor_ImportStatusSection_desc;
-	public static String ManifestEditor_ImportStatusSection_comboLabel;
-	public static String ManifestEditor_ImportStatusSection_comboLoops;
-	public static String ManifestEditor_ImportStatusSection_comboRefs;
-	public static String ManifestEditor_ImportStatusSection_comboFrefs;
-
-	public static String ManifestEditor_MatchSection_title;
-	public static String MainTypeSelectionDialog_qualifier;
-	public static String ManifestEditor_MatchSection_desc;
-	public static String ManifestEditor_MatchSection_optional;
-	public static String ManifestEditor_MatchSection_reexport;
-	public static String ManifestEditor_MatchSection_version;
-	public static String ManifestEditor_MatchSection_rule;
-	public static String ManifestEditor_MatchSection_none;
-	public static String ManifestEditor_MatchSection_perfect;
-	public static String ManifestEditor_MatchSection_equivalent;
-	public static String ManifestEditor_MatchSection_compatible;
-	public static String ManifestEditor_MatchSection_greater;
-
-	public static String ManifestEditor_PluginSpecSection_title;
-	public static String ManifestEditor_PluginSpecSection_desc;
-	public static String ManifestEditor_PluginSpecSection_fdesc;
-
-	public static String ManifestEditor_PluginSpecSection_versionMatch;
-
-	public static String ManifestEditor_PointUsageSection_title;
-	public static String ManifestEditor_PointUsageSection_desc;
-	public static String ManifestEditor_PointUsageSection_fdesc;
-
-	public static String ManifestEditor_RequiresSection_title;
-	public static String ManifestEditor_RequiresSection_desc;
-	public static String ManifestEditor_RequiresSection_fdesc;
-	public static String ManifestEditor_RequiresSection_more;
-
-	public static String ResourceAttributeCellEditor_title;
-	public static String ResourceAttributeCellEditor_message;
-
-	public static String ManifestEditor_RuntimeForm_title;
-	public static String MainTypeSelectionDialog_matching;
-
-	public static String ManifestEditor_RuntimeSection_title;
-	public static String ManifestEditor_RuntimeSection_fdesc;
-	public static String ManifestEditor_RuntimeSection_desc;
-	public static String ManifestEditor_RuntimeSection_more;
-	public static String ManifestSourcePage_extensionPoints;
-	public static String MainTypeSelectionDialog_chooseType;
-
-	public static String ManifestEditor_TestingSection_title;
-
-	public static String ManifestEditor_PropertyPage_tagName;
-
-	// Schema Editor ##################################
-	public static String SchemaEditor_oldExtension;
-	public static String SchemaEditorContributor_previewAction;
-
-	public static String SchemaEditor_AttributePR_attributeCopy;
-
-	public static String SchemaEditor_AttributePR_use;
-	public static String SchemaEditor_AttributePR_kind;
-	public static String SchemaEditor_AttributePR_type;
-	public static String SchemaEditor_AttributePR_restriction;
-	public static String SchemaEditor_AttributePR_value;
-	public static String SchemaEditor_AttributePR_basedOn;
-	public static String SchemaEditor_AttributePR_name;
-
-	public static String SchemaEditor_CompositorPR_kind;
-
-	public static String SchemaEditor_DescriptionSection_title;
-	public static String SchemaEditor_DescriptionSection_desc;
-
-	public static String SchemaEditor_DocForm_title;
-
-	public static String SchemaEditor_DocSection_title;
-	public static String SchemaEditor_DocSection_desc;
-	public static String SchemaEditor_topic_overview;
-	public static String SchemaEditor_topic_since;
-	public static String SchemaEditor_topic_examples;
-	public static String SchemaEditor_topic_implementation;
-	public static String SchemaEditor_topic_api;
-	public static String SchemaEditor_topic_copyright;
-
-	public static String SchemaEditor_ElementPR_name;
-	public static String SchemaEditor_ElementPR_icon;
-	public static String SchemaEditor_ElementPR_labelAttribute;
-	public static String SchemaEditor_ElementPR_invalid;
-
-	public static String SchemaEditor_SpecSection_title;
-	public static String SchemaEditor_SpecSection_desc;
-	public static String SchemaEditor_SpecSection_plugin;
-	public static String SchemaEditor_SpecSection_point;
-	public static String SchemaEditor_SpecSection_name;
-
-	public static String SchemaEditor_ElementSection_title;
-	public static String SchemaEditor_ElementSection_desc;
-	public static String SchemaEditor_ElementSection_newElement;
-	public static String SchemaEditor_ElementSection_newAttribute;
-
-	public static String RestrictionDialog_wtitle;
-	public static String RestrictionDialog_type;
-	public static String RestrictionDialog_choices;
-	public static String RestrictionDialog_newChoice;
-	public static String RestrictionDialog_add;
-	public static String RestrictionDialog_remove;
-	public static String ReviewPage_noSampleFound;
-
-	public static String SchemaEditor_GrammarSection_title;
-	public static String SchemaEditor_GrammarSection_desc;
-	public static String SchemaEditor_GrammarSection_compositor;
-	public static String SchemaEditor_GrammarSection_reference;
-	public static String SchemaEditor_GrammarSection_dtd;
-
-	public static String SchemaEditor_NewAttribute_label;
-	public static String SchemaEditor_NewAttribute_tooltip;
-	public static String SchemaEditor_NewAttribute_initialName;
-
-	public static String SchemaEditor_NewElement_label;
-	public static String SchemaEditor_NewElement_tooltip;
-	public static String SchemaEditor_NewElement_initialName;
-
-	public static String SchemaEditor_NewCompositor_tooltip;
-
-	public static String SchemaEditor_FormPage_title;
-	public static String SchemaEditor_DocPage_title;
-
-	public static String SchemaPropertySheet_clone_label;
-	public static String SchemaPropertySheet_clone_tooltip;
-
-	public static String AbstractPluginModelBase_error;
-	// Launchers #######################################
-	public static String MainTab_name;
-	public static String WorkspaceDataBlock_workspace;
-	public static String WorkspaceDataBlock_location;
-	public static String WorkspaceDataBlock_clear;
-	public static String WorkspaceDataBlock_askClear;
-	public static String BasicLauncherTab_javaExec;
-	public static String ProgramBlock_runProduct;
-	public static String BasicLauncherTab_jre;
-	public static String BasicLauncherTab_installedJREs;
-	public static String BasicLauncherTab_jrePreferencePage;
-	public static String ProgramBlock_programToRun;
-	public static String BasicLauncherTab_bootstrap;
-	public static String BasicLauncherTab_javaExecDefault;
-	public static String ProgramBlock_runApplication;
-	public static String BasicLauncherTab_noJRE;
-	public static String WorkspaceDataBlock_noWorkspace;
-	public static String JUnitProgramBlock_headless;
-
-	public static String AdvancedLauncherTab_name;
-	public static String AdvancedLauncherTab_workspacePlugins;
-	public static String AdvancedLauncherTab_validatePlugins;
-	public static String AdvancedLauncherTab_useDefault;
-	public static String AdvancedLauncherTab_useFeatures;
-	public static String AdvancedLauncherTab_useList;
-	public static String AdvancedLauncherTab_selectAll;
-	public static String AdvancedFeatureExportPage_desc;
-	public static String AdvancedPluginExportPage_desc;
-	public static String AdvancedLauncherTab_deselectAll;
-	public static String AdvancedFeatureExportPage_noSite;
-	public static String AdvancedPluginExportPage_signJar;
-	public static String AdvancedPluginExportPage_noAlias;
-	public static String AdvancedLauncherTab_subset;
-	public static String AdvancedLauncherTab_addNew;
-	public static String AdvancedLauncherTab_defaults;
-	public static String AdvancedLauncherTab_workingSet;
-	public static String AdvancedLauncherTab_noProblems;
-	public static String AdvancedFeatureExportPage_jnlp;
-	public static String AdvancedPluginExportPage_title;
-	public static String AdvancedPluginExportPage_alias;
-	public static String AdvancedLauncherTab_includeFragments;
-	public static String AdvancedLauncherTab_includeOptional;
-	public static String AdvancedFeatureExportPage_siteURL;
-	public static String AdvancedPluginExportPage_keystore;
-	public static String AdvancedPluginExportPage_password;
-	public static String AdvancedFeatureExportPage_noVersion;
-	public static String AdvancedPluginExportPage_signButton;
-	public static String AdvancedPluginExportPage_noKeystore;
-	public static String AdvancedPluginExportPage_noPassword;
-	public static String AdvancedLauncherTab_pluginValidation;
-	public static String AdvancedFeatureExportPage_createJNLP;
-	public static String AdvancedFeatureExportPage_jreVersion;
-	public static String AdvancedLauncherTab_error_featureSetup;
-
-	public static String TracingLauncherTab_name;
-	public static String TracingLauncherTab_tracing;
-	public static String TracingLauncherTab_plugins;
-	public static String TracingLauncherTab_options;
-	public static String TracingLauncherTab_selectAll;
-	public static String TracinglauncherTab_deselectAll;
-
-	public static String ConfigurationTab_name;
-	public static String ConfigurationTab_clearArea;
-	public static String ConfigurationTab_configAreaGroup;
-	public static String ConfigurationTab_useDefaultLoc;
-	public static String ConfigurationTab_configLog;
-	public static String ConfigurationSection_title;
-	public static String ConfigurationSection_desc;
-	public static String ConfigurationSection_file;
-	public static String ConfigurationTab_configBrowse;
-	public static String ConfigurationSection_existing;
-	public static String ConfigurationTab_configLocMessage;
-	public static String ConfigurationTab_configFileGroup;
-	public static String ConfigurationTab_defaultConfigIni;
-	public static String ConfigurationTab_existingConfigIni;
-	public static String ConfigurationTab_templateLoc;
-	public static String ConfigurationSection_default;
-	public static String ConfigurationSection_browse;
-	public static String ConfigurationSection_message;
-	public static String ConfigurationTab_templateBrowse;
-	public static String ConfigurationTab_fileSelection;
-	public static String ConfigurationSection_selection;
-	public static String ConfigurationTab_fileDialogMessage;
-
-
-	public static String WorkbenchLauncherConfigurationDelegate_noJRE;
-	public static String WorkbenchLauncherConfigurationDelegate_jrePathNotFound;
-	public static String WorkbenchLauncherConfigurationDelegate_badFeatureSetup;
-	public static String WorkbenchLauncherConfigurationDelegate_starting;
-	public static String WorkbenchLauncherConfigurationDelegate_missingRequired;
-	public static String WorkbenchLauncherConfigurationDelegate_noStartup;
-	public static String WorkbenchLauncherConfigurationDelegate_brokenPlugins;
-	public static String WorkbenchLauncherConfigurationDelegate_title;
-	public static String WorkbenchLauncherConfigurationDelegate_confirmDeleteWorkspace;
-	public static String JUnitLaunchConfiguration_error_invalidproject;
-	public static String JUnitLaunchConfiguration_error_notests;
-	public static String JUnitLaunchConfiguration_error_notaplugin;
-	public static String JUnitLaunchConfiguration_error_missingPlugin;
-
-	public static String Launcher_error_title;
-	public static String LauncherSection_desc;
-	public static String LauncherSection_ico;
-	public static String LauncherSection_file;
-	public static String LauncherSection_icon;
-	public static String LauncherSection_tiny;
-	public static String Launcher_error_code13;
-	public static String Launcher_error_code15;
-	public static String Launcher_error_displayInLogView;
-	public static String Launcher_error_displayInSystemEditor;
-	public static String Launcher_error_displayNo;
-	public static String LauncherSection_browse;
-	public static String LauncherSection_title;
-	public static String LauncherSection_label;
-	public static String LauncherSection_bmpImages;
-	public static String LauncherSection_bmpImagesText;
-	public static String LauncherSection_Low16;
-	public static String LauncherSection_High16;
-	public static String LauncherSection_32Low;
-	public static String LauncherSection_32High;
-	public static String LauncherSection_48Low;
-	public static String LauncherSection_48High;
-	public static String LauncherSection_linuxLabel;
-	public static String LauncherSection_large;
-	public static String LauncherSection_medium;
-	public static String LauncherSection_small;
-	public static String LauncherSection_macLabel;
-	public static String OpenLogDialog_title;
-	public static String OpenLogDialog_message;
-	public static String OpenLogDialog_cannotDisplay;
-
-	// Preferences ####################################
-	public static String Preferences_MainPage_Description;
-	public static String Preferences_MainPage_noPDENature;
-
-	public static String Preferences_MainPage_showObjects;
-	public static String Preferences_MainPage_useIds;
-	public static String Preferences_MainPage_useFullNames;
-
-	public static String Preferences_TargetPlatformPage_Description;
-	public static String Preferences_TargetPlatformPage_useThis;
-	public static String Preferences_TargetPlatformPage_PlatformHome;
-	public static String Preferences_TargetPlatformPage_PlatformHome_Button;
-	public static String Preferences_TargetPlatformPage_title;
-	public static String Preferences_TargetPlatformPage_question;
-	public static String ExternalPluginsBlock_reload;
-	public static String ExternalPluginsBlock_selectAll;
-	public static String ExternalPluginsBlock_deselectAll;
-	public static String ExternalPluginsBlock_addRequired;
-	public static String ExternalPluginsBlock_includeFragments;
-	public static String ExternalPluginsBlock_workspace;
-	public static String ExternalPluginsBlock_workingSet;
-
-	public static String Preferences_TargetEnvironmentPage_os;
-	public static String Preferences_TargetEnvironmentPage_ws;
-	public static String Preferences_TargetEnvironmentPage_nl;
-	public static String Preferences_TargetEnvironmentPage_arch;
-
-	public static String SourceBlock_add;
-	public static String SourceBlock_remove;
-	public static String SourceBlock_target;
-	public static String SourceBlock_additional;
-	public static String SourceBlock_desc;
-
-	//
-	public static String PluginPathUpdater_updating;
-
-	// Wizards #######################################
-	public static String NewFragmentProjectWizard_title;
-	public static String NewProjectWizard_MainPage_ftitle;
-	public static String NewProductFileWizard_windowTitle;
-	public static String NewProjectWizard_MainPage_fdesc;
-
-	public static String NewProjectWizard_title;
-	public static String NewProjectWizard_MainPage_title;
-	public static String NewProjectWizard_MainPage_desc;
-
-	public static String ProjectStructurePage_title;
-	public static String ProjectNamesPage_emptyName;
-	public static String ProjectStructurePage_ftitle;
-	public static String ProjectStructurePage_desc;
-	public static String ProjectStructurePage_settings;
-	public static String ProjectStructurePage_simple;
-	public static String ProjectStructurePage_java;
-	public static String ProjectStructurePage_library;
-	public static String ProjectStructurePage_source;
-	public static String ProjectStructurePage_output;
-	public static String ProjectStructurePage_noOutput;
-
-	public static String ProjectNamesPage_projectName;
-	public static String ProjectNamesPage_multiProjectName;
-	public static String ProjectNamesPage_title;
-	public static String ProjectNamesPage_desc;
-	public static String ProjectNamesPage_noSampleFound;
-
-	public static String ContentPage_title;
-	public static String ContentPage_ftitle;
-	public static String ContentPage_desc;
-	public static String ContentPage_fdesc;
-	public static String ContentPage_pGroup;
-	public static String ContentPage_fGroup;
-	public static String ContentPage_parentPluginGroup;
-	public static String ContentPage_pClassGroup;
-	public static String ContentPage_pid;
-	public static String ContentPage_pversion;
-	public static String ContentPage_pname;
-	public static String ContentPage_pprovider;
-	public static String ContentPage_fid;
-	public static String ContentPage_fversion;
-	public static String ContentPage_fname;
-	public static String ContentPage_fprovider;
-	public static String ContentPage_generate;
-	public static String ContentPage_classname;
-	public static String ContentPage_uicontribution;
-	public static String FragmentContentPage_pid;
-	public static String FragmentContentPage_pversion;
-	public static String ContentPage_browse;
-	public static String ContentPage_matchRule;
-	public static String ContentPage_noid;
-	public static String ContentPage_invalidId;
-	public static String ContentPage_noversion;
-	public static String ContentPage_badversion;
-	public static String ContentPage_noname;
-	public static String ContentPage_nopid;
-	public static String ContentPage_pluginNotFound;
-	public static String ContentPage_nopversion;
-	public static String ContentPage_badpversion;
-	public static String ContentPage_fragment;
-	public static String ContentPage_plugin;
-	public static String ContentPage_illegalCharactersInID;
-	public static String WizardListSelectionPage_title;
-	public static String WizardListSelectionPage_desc;
-	public static String WizardListSelectionPage_label;
-	public static String WizardListSelectionPage_templates;
-	public static String OptionTemplateSection_mustBeSet;
-
-	public static String NewLibraryPluginProjectWizard_title;
-	public static String NewLibraryPluginCreationPage_title;
-	public static String NewLibraryPluginCreationPage_desc;
-	public static String NewLibraryPluginCreationPage_pformat;
-	public static String NewLibraryPluginCreationPage_pTarget;
-	public static String NewLibraryPluginCreationPage_bundle;
-	public static String NewLibraryPluginCreationPage_jarred;
-	public static String NewLibraryPluginCreationPage_pGroup;
-	public static String NewLibraryPluginCreationPage_pid;
-	public static String NewLibraryPluginCreationPage_pversion;
-	public static String NewLibraryPluginCreationPage_pname;
-	public static String NewLibraryPluginCreationPage_pprovider;
-	public static String NewLibraryPluginCreationPage_plugin;
-	public static String NewLibraryPluginCreationPage_noid;
-	public static String NewLibraryPluginCreationPage_invalidId;
-	public static String NewLibraryPluginCreationPage_noversion;
-	public static String NewLibraryPluginCreationPage_noname;
-	public static String LibraryPluginJarsPage_title;
-	public static String LibraryPluginJarsPage_desc;
-	public static String LibraryPluginJarsPage_label;
-	public static String LibraryPluginJarsPage_add;
-	public static String LibraryPluginJarsPage_addExternal;
-	public static String LibraryPluginJarsPage_remove;
-	public static String LibraryPluginJarsPage_SelectionDialog_title;
-	public static String LibraryPluginJarsPage_SelectionDialog_message;
-
-	public static String NewProjectCreationOperation_creating;
-	public static String NewProjectCreationOperation_project;
-	public static String NewProjectCreationOperation_setClasspath;
-	public static String NewProjectCreationOperation_manifestFile;
-	public static String NewProjectCreationOperation_buildPropertiesFile;
-	public static String NewProjectCreationOperation_copyingJar;
-	public static String NewProjectCreationOperation_errorImportingJar;
-
-	public static String AbstractTemplateSection_generating;
-
-	public static String BuildAction_Validate;
-	public static String BuildAction_Generate;
-	public static String BuildSiteJob_message;
-	public static String BuildAction_Update;
-	public static String BuildPage_custom;
-	public static String BuildPage_name;
-	public static String BuildAction_ErrorDialog_Title;
-	public static String BuildAction_ErrorDialog_Message;
-
-	public static String NewFeatureWizard_wtitle;
-	public static String NewFeatureWizard_MainPage_title;
-	public static String NewFeatureWizard_MainPage_desc;
-	public static String NewFeatureWizard_SpecPage_title;
-	public static String NewFeatureWizard_SpecPage_desc;
-	public static String NewFeatureWizard_SpecPage_id;
-	public static String NewFeatureWizard_SpecPage_name;
-	public static String NewFeatureWizard_SpecPage_version;
-	public static String NewFeatureWizard_SpecPage_provider;
-	public static String NewFeatureWizard_SpecPage_description;
-	public static String NewFeatureWizard_SpecPage_versionFormat;
-	public static String NewFeatureWizard_sampleCopyrightURL;
-	public static String NewFeatureWizard_sampleCopyrightDesc;
-	public static String NewFeatureWizard_sampleLicenseURL;
-	public static String NewFeatureWizard_sampleLicenseDesc;
-	public static String NewFeatureWizard_sampleDescriptionURL;
-	public static String NewFeatureWizard_sampleDescriptionDesc;
-	public static String NewSiteProjectCreationPage_webTitle;
-	public static String NewFeatureWizard_SpecPage_missing;
-	public static String NewFeatureWizard_SpecPage_pmissing;
-	public static String NewFeatureWizard_SpecPage_invalidId;
-
-	public static String NewFeatureWizard_PlugPage_title;
-	public static String NewFeatureWizard_PlugPage_desc;
-
-	public static String NewFeatureWizard_creatingProject;
-	public static String NewFeatureWizard_creatingFolders;
-	public static String NewFeatureWizard_creatingManifest;
-	public static String NewFeatureWizard_overwriteFeature;
-	public static String NewFeatureWizard_SpecPage_library;
-	public static String NewFeatureWizard_SpecPage_customProject;
-	public static String NewFeatureWizard_SpecPage_patch_customProject;
-	public static String NewFeatureWizard_SpecPage_patchProperties;
-	public static String NewFeatureWizard_SpecPage_error_library;
-
-	public static String FeatureDetailsSection_title;
-	public static String FeatureDetailsSection_desc;
-	public static String FeatureDetailsSection_url;
-	public static String FeatureDetailsSection_patch;
-	public static String FeatureDetailsSection_requiredURL;
-	public static String FeatureDetailsSection_requiredURL_title;
-
-	public static String SiteEditor_PortabilitySection_title;
-	public static String SiteEditor_PortabilitySection_desc;
-	public static String SiteEditor_PortabilitySection_os;
-	public static String SiteEditor_PortabilitySection_ws;
-	public static String SiteEditor_PortabilitySection_nl;
-	public static String SiteEditor_PortabilitySection_arch;
-	public static String SiteEditor_PortabilitySection_edit;
-	public static String SiteEditor_PortabilityChoicesDialog_title;
-
-	public static String FeaturePatch_wtitle;
-	public static String FeaturePatch_MainPage_title;
-	public static String FeaturePatch_MainPage_desc;
-	public static String PatchSpec_title;
-	public static String PatchSpec_desc;
-	public static String NewFeaturePatch_SpecPage_id;
-	public static String NewFeaturePatch_SpecPage_name;
-	public static String NewFeaturePatch_SpecPage_provider;
-	public static String NewFeaturePatch_SpecPage_notFound;
-	public static String FeatureSelectionDialog_title;
-	public static String FeatureSelectionDialog_message;
-	public static String PatchPlugins_title;
-	public static String PatchPlugins_desc;
-
-	public static String VersionSyncWizard_wtitle;
-	public static String VersionSyncWizard_title;
-	public static String VersionSyncWizard_desc;
-	public static String VersionSyncWizard_group;
-	public static String VersionSyncWizard_useComponent;
-	public static String VersionSyncWizard_usePlugins;
-	public static String VersionSyncWizard_usePluginsAtBuild;
-	public static String VersionSyncWizard_synchronizing;
-
-	public static String JavaAttributeWizard_wtitle;
-
-	public static String ExtensionsPage_collapseAll;
-	public static String ExtensionPointDetails_title;
-	public static String ExtensionPointDetails_desc;
-	public static String ExtensionPointDetails_id;
-	public static String ExtensionPointDetails_name;
-	public static String ExtensionPointsPage_title;
-	public static String ExtensionPointsPage_tabName;
-	public static String ExtensionPointDetails_schema;
-	public static String ExtensionPointDetails_schemaLinks;
-	public static String ExtensionPointsSection_message1;
-	public static String ExtensionPointDetails_browse;
-	public static String ExtensionPointsSection_title;
-	public static String ExtensionPointDetails_noSchemaLinks;
-	public static String ExtensionElementDetails_desc;
-	public static String ExtensionDetails_noPoint_title;
-	public static String ExtensionDetails_extensionPointLinks;
-	public static String ExtensionElementDetails_setDesc;
-	public static String ExtensionEditorSelectionPage_title;
-	public static String ExtensionEditorSelectionPage_message;
-	public static String ExtensionEditorSelectionPage_desc;
-	public static String ShowDescriptionAction_noPoint_desc;
-	public static String ExtensionElementDetails_title;
-
-	public static String BaseExtensionPoint_pluginId;
-	public static String BaseExtensionPoint_id;
-	public static String BaseExtensionPoint_name;
-	public static String BaseExtensionPoint_missingId;
-	public static String BaseExtensionPoint_noPlugin_missingId;
-	public static String BaseExtensionPoint_malformedId;
-	public static String BaseExtensionPoint_schema;
-	public static String BaseExtensionPoint_schemaLocation;
-	public static String BaseExtensionPoint_edit;
-	public static String BaseExtensionPoint_shared;
-	public static String BaseExtensionPoint_sections_overview;
-	public static String BaseExtensionPoint_sections_since;
-	public static String BaseExtensionPoint_sections_usage;
-	public static String BaseExtensionPoint_sections_api;
-	public static String BaseExtensionPoint_sections_supplied;
-	public static String BaseExportWizard_confirmReplace_desc;
-	public static String BaseExportWizardPage_packageJARs;
-	public static String BaseExportWizard_wtitle;
-	public static String BaseExportWizardPage_fPackageJARs;
-	public static String BaseFeatureSpecPage_patchGroup_title;
-	public static String BaseFeatureSpecPage_featurePropertiesGroup_title;
-	public static String BaseFeatureSpecPage_browse;
-	public static String BaseFeatureSpecPage_customGroup;
-	public static String BaseExtensionPoint_sections_copyright;
-	public static String BaseExportWizard_confirmReplace_title;
-	public static String BaseExtensionPoint_generating;
-	public static String GenericExtensionWizard_wtitle;
-	public static String GeneralInfoSection_version;
-	public static String GeneralInfoSection_provider;
-	public static String GeneralInfoSection_pluginId;
-	public static String GeneralInfoSection_pluginVersion;
-	public static String GeneralInfoSection_hostMinVersionRange;
-	public static String GeneralInfoSection_hostMaxVersionRange;
-
-	public static String NewWizard_wtitle;
-	public static String NewExtensionWizard_wtitle;
-	public static String NewExtensionWizard_title;
-	public static String NewElementAction_generic;
-	public static String NewExtensionWizard_desc;
-	public static String NewExtensionWizard_statusMessage;
-	public static String NewExtensionWizard_PointSelectionPage_title;
-	public static String NewExtensionWizard_PointSelectionPage_desc;
-	public static String NewExtensionRegistryReader_missingProperty;
-	public static String NewExtensionTemplateWizard_generating;
-	public static String NewExtensionWizard_PointSelectionPage_filterCheck;
-	public static String NewExtensionWizard_PointSelectionPage_descButton;
-	public static String NewExtensionWizard_PointSelectionPage_dependencyTitle;
-	public static String NewExtensionWizard_PointSelectionPage_dependencyMessage;
-	public static String NewExtensionWizard_PointSelectionPage_availExtPoints_label;
-	public static String NewExtensionWizard_PointSelectionPage_contributedTemplates_title;
-	public static String NewExtensionWizard_PointSelectionPage_contributedTemplates_label;
-	public static String NewExtensionWizard_PointSelectionPage_showDetails;
-	public static String NewExtensionWizard_PointSelectionPage_templateDescription;
-	public static String NewExtensionWizard_PointSelectionPage_pluginDescription;
-
-	public static String ExtensionEditorWizard_wtitle;
-
-	public static String NewExtensionPointWizard_wtitle;
-	public static String NewExtensionPointWizard_title;
-	public static String NewExtensionPointWizard_desc;
-
-	public static String NewSchemaFileWizard_wtitle;
-	public static String NewSchemaFileWizard_title;
-	public static String NewSchemaFileWizard_desc;
-
-	public static String ConvertedProjectWizard_title;
-	public static String ConvertedProjectWizard_desc;
-	public static String ConvertedProjectWizard_projectList;
-	public static String ConvertedProjectWizard_converting;
-	public static String ConvertedProjectWizard_updating;
-	public static String ConvertProjectsAction_find;
-	public static String ConvertProjectsAction_none;
-
-
-	// Supplied templates
-
-	public static String PluginCodeGeneratorWizard_title;
-	public static String PluginContentPage_invalidAppID;
-
-	public static String EditorNewWizard_wtitle;
-	public static String EditorTemplate_title;
-	public static String EditorTemplate_desc;
-	public static String EditorTemplate_packageName;
-	public static String EditorTemplate_editorClass;
-	public static String EditorTemplate_editorName;
-	public static String EditorTemplate_fileExtension;
-	public static String EditorTemplate_defaultEditorName;
-
-	public static String HelloWorldNewWizard_wtitle;
-	public static String HelloWorldTemplate_title;
-	public static String HelloWorldTemplate_desc;
-	public static String HelloRCPNewWizard_title;
-	public static String HelloRCPTemplate_title;
-	public static String HelloRCPTemplate_desc;
-	public static String HelloRCPTemplate_appId;
-	public static String HelloRCPTemplate_appClass;
-	public static String HelloNonUIRCPNewWizard_title;
-	public static String HelloNonUIRCPTemplate_title;
-	public static String HelloNonUIRCPTemplate_desc;
-	public static String HelloNonUIRCPTemplate_appClass;
-	public static String HelloNonUIRCPTemplate_messageText;
-	public static String HelloNonUIRCPTemplate_defaultMessage;
-	public static String HelloWorldTemplate_packageName;
-	public static String HelloWorldTemplate_className;
-	public static String HelloRCPTemplate_windowTitle;
-	public static String HelloWorldTemplate_messageText;
-	public static String HelloWorldTemplate_defaultMessage;
-	public static String HelloWorldTemplate_sampleActionSet;
-	public static String HelloWorldTemplate_sampleMenu;
-	public static String HelloWorldTemplate_sampleAction;
-
-	public static String IntroNewWizard_wtitle;
-	public static String IntroTemplate_title;
-	public static String IntroTemplate_desc;
-	public static String IntroTemplate_productID;
-	public static String IntroTemplate_productName;
-	public static String IntroTemplate_application;
-    public static String IntroTemplate_generate;
-    public static String IntroTemplate_generateDynamicContent;
-    public static String IntroTemplate_generateStaticContent;
-
-	public static String ViewRCPNewWizard_title;
-	public static String ViewRCPTemplate_title;
-	public static String ViewRCPTemplate_desc;
-	public static String ViewRCPTemplate_appId;
-	public static String ViewRCPTemplate_appClass;
-	public static String ViewRCPTemplate_packageName;
-	public static String ViewRCPTemplate_className;
-	public static String ViewRCPTemplate_windowTitle;
-
-	public static String MultiPageEditorNewWizard_wtitle;
-	public static String MultiPageEditorTemplate_title;
-	public static String MultiPageEditorTemplate_desc;
-	public static String MultiPageEditorTemplate_packageName;
-	public static String MultiPageEditorTemplate_className;
-	public static String MultiPageEditorTemplate_contributor;
-	public static String MultiPageEditorTemplate_editorName;
-	public static String MultiPageEditorTemplate_defaultEditorName;
-	public static String MultiPageEditorTemplate_extensions;
-
-	public static String NewWizardTemplate_title;
-	public static String NewWizardTemplate_desc;
-	public static String NewWizardTemplate_packageName;
-	public static String NewWizardTemplate_categoryId;
-	public static String NewWizardTemplate_categoryName;
-	public static String NewWizardTemplate_className;
-	public static String NewWizardTemplate_pageClassName;
-	public static String NewWizardTemplate_wizardName;
-	public static String NewWizardTemplate_defaultName;
-	public static String NewWizardTemplate_extension;
-	public static String NewWizardTemplate_fileName;
-	public static String NewProductFileWizard_title;
-
-	public static String PopupMenuNewWizard_wtitle;
-	public static String PopupMenuTemplate_title;
-	public static String PointSelectionPage_tab1;
-	public static String PointSelectionPage_tab2;
-	public static String PopupMenuTemplate_desc;
-	public static String PopupMenuTemplate_targetClass;
-	public static String PopupMenuTemplate_nameFilter;
-	public static String PopupMenuTemplate_newAction;
-	public static String PopupMenuTemplate_submenuName;
-	public static String PopupMenuTemplate_defaultSubmenuName;
-	public static String PopupMenuTemplate_actionLabel;
-	public static String PopupMenuTemplate_defaultActionName;
-	public static String PopupMenuTemplate_packageName;
-	public static String PopupMenuTemplate_actionClass;
-	public static String PointSelectionPage_categories;
-	public static String PopupMenuTemplate_enabledFor;
-	public static String PopupMenuTemplate_singleSelection;
-	public static String PopupMenuTemplate_multipleSelection;
-
-	public static String PreferencePageTemplate_title;
-	public static String PreferencePageTemplate_desc;
-	public static String PreferencePageTemplate_packageName;
-	public static String PreferencePageTemplate_className;
-	public static String PreferencePageTemplate_pageName;
-	public static String PreferencePageTemplate_defaultPageName;
-	public static String Product_PluginSection_includeFragments;
-	public static String ProductDefinitonWizardPage_productGroup;
-	public static String ProductDefinitonWizardPage_productExists;
-	public static String ProductDefinitonWizardPage_application;
-	public static String ProductDefinitonWizardPage_noProductID;
-	public static String ProductFileWizadPage_existingProduct;
-	public static String ProductFileWizadPage_existingLaunchConfig;
-	public static String ProductDefinitonWizardPage_productDefinition;
-	public static String ProductDefinitonWizardPage_applicationGroup;
-	public static String ProductDefinitonWizardPage_notInWorkspace;
-	public static String ProductDefinitionOperation_readOnly;
-	public static String ProductDefinitionOperation_malformed;
-
-	public static String PropertyPageNewWizard_wtitle;
-	public static String PropertyPageTemplate_title;
-	public static String PropertyPageTemplate_desc;
-	public static String PropertyPageTemplate_packageName;
-	public static String PropertyPageTemplate_pageClass;
-	public static String PropertyPageTemplate_pageName;
-	public static String PropertyPageTemplate_defaultPageName;
-	public static String PropertyPageTemplate_targetClass;
-	public static String PropertyPageTemplate_nameFilter;
-
-	public static String TemplateSelectionPage_title;
-	public static String TemplateSelectionPage_desc;
-	public static String TemplateSelectionPage_table;
-	public static String TemplateSelectionPage_column_name;
-	public static String TemplateSelectionPage_column_point;
-
-	public static String ViewNewWizard_wtitle;
-	public static String ViewTemplate_title0;
-	public static String ViewTemplate_desc0;
-	public static String ViewTemplate_title1;
-	public static String ViewTemplate_desc1;
-	public static String ViewTemplate_packageName;
-	public static String ViewTemplate_className;
-	public static String ViewTemplate_name;
-	public static String ViewTemplate_defaultName;
-	public static String ViewTemplate_categoryId;
-	public static String ViewTemplate_categoryName;
-	public static String ViewTemplate_defaultCategoryName;
-	public static String ViewTemplate_select;
-	public static String ViewTemplate_table;
-	public static String ViewTemplate_tree;
-	public static String ViewTemplate_doubleClick;
-	public static String ViewTemplate_popup;
-	public static String ViewTemplate_toolbar;
-	public static String ViewTemplate_pulldown;
-	public static String ViewTemplate_sorting;
-	public static String ViewTemplate_filtering;
-	public static String ViewTemplate_addToPerspective;
-
-	public static String HelpTemplate_title;
-	public static String HelpTemplate_desc;
-	public static String HelpTemplate_tocLabel;
-	public static String HelpTemplate_isPrimary;
-	public static String HelpTemplate_generateTest;
-	public static String HelpTemplate_gettingStarted;
-	public static String HelpTemplate_concepts;
-	public static String HelpTemplate_tasks;
-	public static String HelpTemplate_reference;
-	public static String HelpTemplate_samples;
-
-	public static String BuilderNewWizard_wtitle;
-	public static String BuilderTemplate_title;
-	public static String BuilderTemplate_desc;
-	public static String BuilderTemplate_builderClass;
-	public static String BuilderTemplate_builderId;
-	public static String BuilderTemplate_builderName;
-	public static String BuilderTemplate_natureClass;
-	public static String BuilderTemplate_natureId;
-	public static String BuilderTemplate_natureName;
-	public static String BuilderTemplate_packageLabel;
-	public static String BuilderTemplate_actionLabel;
-	public static String BuilderTemplate_defaultBuilderName;
-	public static String BuilderTemplate_defaultNatureName;
-	public static String BuilderTemplate_markerName;
-	public static String BuilderTemplate_generateAction;
-
-	//
-
-	public static String PluginSelectionDialog_title;
-	public static String PluginSelectionDialog_message;
-	public static String PluginImportOperation_linking;
-	public static String PluginContentPage_appQuestion;
-	public static String PluginSelectionDialog_workspacePlugins;
-	public static String PluginValidationOperation_invalidSingular;
-	public static String PluginValidationOperation_invalidPlural;
-	public static String PluginSelectionDialog_externalPlugins;
-
-	public static String ImportWizard_title;
-	public static String ImportWizard_noToAll;
-	public static String ImportWizard_messages_title;
-	public static String ImportWizard_messages_exists;
-	public static String ImportWizard_FirstPage_title;
-	public static String ImportWizard_FirstPage_warning;
-	public static String ImportWizard_FirstPage_desc;
-	public static String ImportWizard_FirstPage_importGroup;
-	public static String ImportWizard_FirstPage_importPrereqs;
-	public static String ImportWizard_FirstPage_scanAll;
-	public static String ImportWizard_FirstPage_importAs;
-	public static String ImportWizard_FirstPage_binary;
-	public static String ImportWizard_FirstPage_binaryLinks;
-	public static String ImportWizard_FirstPage_source;
-	public static String ImportWizard_FirstPage_codeLocations;
-	public static String ImportWizard_FirstPage_source_label;
-	public static String ImportWizard_FirstPage_variables;
-	public static String ImportWizard_FirstPage_env;
-	public static String ImportWizard_FirstPage_importFrom;
-	public static String ImportWizard_FirstPage_target;
-	public static String ImportWizard_FirstPage_goToTarget;
-	public static String ImportWizard_FirstPage_otherFolder;
-	public static String ImportWizard_FirstPage_browse;
-	public static String ImportWizard_SecondPage_addFragments;
-
-	public static String ImportWizard_messages_folder_title;
-	public static String ImportWizard_messages_folder_message;
-
-	public static String ImportWizard_errors_locationMissing;
-	public static String ImportWizard_errors_buildFolderInvalid;
-	public static String ImportWizard_errors_buildFolderMissing;
-
-	public static String ImportWizard_expressPage_title;
-	public static String ImportWizard_expressPage_desc;
-	public static String ImportWizard_expressPage_nonBinary;
-	public static String ImportWizard_expressPage_total;
-
-	public static String ImportWizard_DetailedPage_title;
-	public static String ImportWizard_DetailedPage_desc;
-	public static String ImportWizard_DetailedPage_availableList;
-	public static String ImportWizard_DetailedPage_importList;
-	public static String ImportWizard_DetailedPage_add;
-	public static String ImportWizard_DetailedPage_addAll;
-	public static String ImportWizard_DetailedPage_remove;
-	public static String ImportWizard_DetailedPage_removeAll;
-	public static String ImportWizard_DetailedPage_swap;
-	public static String ImportWizard_DetailedPage_existing;
-	public static String ImportWizard_DetailedPage_existingUnshared;
-	public static String ImportWizard_DetailedPage_addRequired;
-	public static String ImportWizard_DetailedPage_count;
-	public static String ImportWizard_DetailedPage_locate;
-	public static String ImportWizard_DetailedPage_search;
-
-	public static String ImportWizard_operation_creating;
-	public static String ImportWizard_operation_multiProblem;
-	public static String ImportWizard_operation_problem;
-	public static String ImportWizard_operation_creating2;
-	public static String ImportWizard_operation_extracting;
-	public static String ImportWizard_operation_copyingSource;
-
-	public static String FeatureImportWizard_FirstPage_title;
-	public static String FeatureImportWizard_FirstPage_desc;
-	public static String FeatureImportWizard_FirstPage_runtimeLocation;
-	public static String FeatureImportWizard_FirstPage_otherLocation;
-	public static String FeatureImportWizard_FirstPage_otherFolder;
-	public static String FeatureImportWizard_FirstPage_binaryImport;
-	public static String FeatureImportWizard_FirstPage_browse;
-	public static String FeatureImportWizard_messages_folder_title;
-	public static String FeatureImportWizard_messages_folder_message;
-	public static String FeatureImportWizard_errors_locationMissing;
-	public static String FeatureImportWizard_errors_buildFolderInvalid;
-	public static String FeatureImportWizard_errors_buildFolderMissing;
-
-	public static String FeatureImportWizard_DetailedPage_title;
-	public static String FeatureImportWizard_DetailedPage_desc;
-	public static String FeatureImportWizard_DetailedPage_featureList;
-	public static String FeatureImportWizard_messages_loadingRuntime;
-	public static String FeatureImportWizard_messages_updating;
-	public static String FeatureImportWizard_messages_loadingFile;
-	public static String FeatureImportWizard_title;
-	public static String FeatureMatchSection_patch;
-	public static String FeatureSection_removeAll;
-	public static String FeatureImportWizard_noToAll;
-	public static String FeatureImportWizard_messages_noFeatures;
-	public static String FeatureImportWizard_messages_title;
-	public static String FeatureImportWizard_messages_exists;
-
-	public static String FeatureImportWizard_operation_creating;
-	public static String FeatureImportWizard_operation_multiProblem;
-	public static String FeatureImportWizard_operation_problem;
-	public static String FeatureImportWizard_operation_creating2;
-
-	public static String UpdateBuildpathWizard_wtitle;
-	public static String UpdateBuildpathWizard_title;
-	public static String UpdateBuildpathWizard_desc;
-	public static String UpdateBuildpathWizard_availablePlugins;
-
-	// Actions ########################################
-	public static String EditorActions_save;
-	public static String EditorActions_cut;
-	public static String EditorActions_copy;
-	public static String EditorActions_paste;
-	public static String EditorActions_revert;
-	public static String Actions_properties_label;
-	public static String Actions_open_label;
-	public static String Actions_refresh_label;
-	public static String Actions_delete_label;
-	public static String Actions_synchronizeVersions_label;
-	public static String Actions_apply_label;
-	public static String Actions_reset_label;
-	public static String Actions_edit_label;
-
-	public static String Actions_delete_flabel;
-	public static String Actions_apply_flabel;
-	public static String Actions_reset_flabel;
-
-	public static String Menus_new_label;
-	public static String Menus_edit_label;
-	public static String Menus_goTo_label;
-
-	public static String Actions_Feature_OpenProjectWizardAction;
-	public static String Actions_Site_OpenProjectWizardAction;
-
-	public static String UpdateClasspathJob_error_title;
-	public static String UpdateClasspathJob_error_message;
-	public static String UpdateClasspathJob_task;
-	public static String UpdateClasspathJob_title;
-
-	public static String RuntimeWorkbenchShortcut_launchFailed;
-	public static String RuntimeWorkbenchShortcut_title;
-	public static String RuntimeWorkbenchShortcut_select_debug;
-	public static String RuntimeWorkbenchShortcut_select_run;
-	public static String RuntimeWorkbenchShortcut_name;
-	public static String RuntimeInfoSection_addEntry;
-	public static String RuntimeInfoSection_rename;
-	public static String BaseExtensionPointMainPage_noContainer;
-	public static String BaseExtensionPointMainPage_pluginId_tooltip;
-	public static String BaseExtensionPointMainPage_schemaLocation_tooltip;
-	public static String BaseExtensionPointMainPage_pluginBrowse;
-	public static String BaseExtensionPointMainPage_findBrowse;
-	public static String BaseProductCreationOperation_taskName;
-	public static String BaseExtensionPointMainPage_since;
-	public static String BaseExtensionPointMainPage_schemaLocation_title;
-	public static String BaseExtensionPointMainPage_schemaLocation_desc;
-	public static String SourcePreferencePage_new_title;
-	public static String SourcePreferencePage_column_name;
-	public static String SourcePreferencePage_column_path;
-	public static String SourcePreferencePage_dialogMessage;
-	public static String EditorPreferencePage_useSourcePage;
-	public static String EditorPreferencePage_askDefaultPage;
-	public static String EditorPreferencePage_desc;
-	public static String EditorPreferencePage_colorSettings;
-	public static String EditorPreferencePage_text;
-	public static String EditorPreferencePage_proc;
-	public static String EditorPreferencePage_string;
-	public static String EditorPreferencePage_tag;
-	public static String EditorPreferencePage_comment;
-	public static String PluginContentPage_yes;
-	public static String DefaultPageDialog_title;
-	public static String DefaultPageDialog_stopAskingButton;
-
-
-	//Search Page###############################
-	public static String SearchPage_searchString;
-	public static String SearchPage_caseSensitive;
-	public static String SearchPage_searchFor;
-	public static String SearchResult_matches;
-	public static String SearchPage_limitTo;
-	public static String SearchPage_externalScope;
-	public static String SearchPage_plugin;
-	public static String SearchPage_fragment;
-	public static String SelectionPage_title;
-	public static String SearchPage_extPt;
-	public static String SearchPage_declarations;
-	public static String SearchPage_references;
-	public static String SearchPage_allOccurrences;
-	public static String SearchPage_all;
-	public static String SearchPage_enabledOnly;
-	public static String SearchPage_none;
-	public static String Search_singleMatch;
-	public static String SearchResult_match;
-	public static String SelectionPage_desc;
-	public static String Search_multipleMatches;
-	public static String SearchAction_references;
-	public static String SearchAction_Declaration;
-	public static String ShowDescriptionAction_label;
-	public static String ShowDescriptionAction_title;
-	public static String ShowSampleAction_msgTitle;
-	public static String DependencyExtent_singular;
-	public static String DependencyExtent_plural;
-	public static String DetailsBlock_horizontal;
-	public static String DependencyExtent_found;
-	public static String DependencyExtent_searching;
-	public static String DependencyExtentAction_label;
-	public static String DependencyExtent_references;
-	public static String DependencyExtentQuery_label;
-	public static String UnusedDependencies_title;
-	public static String UnusedDependencies_action;
-	public static String UnusedDependencies_notFound;
-	public static String UnusedDependenciesJob_viewResults;
-	public static String UnusedDependenciesAction_jobName;
-	public static String UnusedDependencies_found;
-	public static String UnusedDependencies_remove;
-	public static String UnusedDependencies_analyze;
-	public static String UnusedDependencies_unused;
-
-	public static String DependenciesView_open;
-	public static String DependenciesView_ShowCalleesAction_label;
-	public static String DependenciesView_ShowCalleesAction_description;
-	public static String DependenciesView_ShowCalleesAction_tooltip;
-	public static String DependenciesView_ShowCallersAction_label;
-	public static String DependenciesView_ShowCallersAction_description;
-	public static String DependenciesView_ShowCallersAction_tooltip;
-	public static String DependenciesView_ShowListAction_label;
-	public static String DependenciesView_ShowListAction_description;
-	public static String DependenciesView_ShowListAction_tooltip;
-	public static String DependenciesView_ShowTreeAction_label;
-	public static String DependenciesView_ShowTreeAction_description;
-	public static String DependenciesView_ShowTreeAction_tooltip;
-	public static String DependenciesView_ShowLoopsAction_label;
-	public static String DependenciesView_ShowLoopsAction_description;
-	public static String DependenciesView_ShowLoopsAction_tooltip;
-	public static String DependenciesView_callees_tree_title;
-	public static String DependenciesView_callees_list_title;
-	public static String DependenciesView_callers_tree_title;
-	public static String DependenciesView_callers_list_title;
-	public static String DependenciesView_cycles_title;
-	public static String DependenciesViewTreePage_CollapseAllAction_label;
-	public static String DependenciesViewTreePage_CollapseAllAction_description;
-	public static String DependenciesViewTreePage_CollapseAllAction_tooltip;
-	public static String DependenciesPage_title;
-	public static String DependenciesPage_tabName;
-	public static String DetailsBlock_vertical;
-	public static String DependenciesViewPage_focusOn;
-	public static String DependenciesViewPage_focusOnSelection;
-	public static String DependencyAnalysisSection_title;
-	public static String DependencyAnalysisSection_loops;
-	public static String DependencyAnalysisSection_noCycles;
-	public static String DependencyAnalysisSection_references;
-	public static String DependencyAnalysisSection_dialogtitle;
-	public static String DependencyExtentOperation_searching;
-	public static String DependencyExtentOperation_inspecting;
-	public static String DependencyExtentSearchResult_dependency;
-	public static String DependencyExtentSearchResult_dependencies;
-	public static String DependencyAnalysisSection_fragment_editable;
-	public static String DependencyAnalysisSection_noReferencesFound;
-	public static String DependencyAnalysisSection_fragment_notEditable;
-	public static String DependencyAnalysisSection_plugin_editable;
-	public static String DependencyAnalysisSection_plugin_notEditable;
-
-	public static String HistoryAction_description;
-	public static String HistoryAction_tooltip;
-	public static String HistoryDropDownAction_tooltip;
-	public static String HistoryListAction_label;
-	public static String HistoryListDialog_label;
-	public static String HistoryListDialog_title;
-	public static String HistoryListDialog_remove_button;
-
-	public static String PluginsView_open;
-	public static String PluginsView_openDependencies;
-	public static String PluginsView_asBinaryProject;
-	public static String PluginsView_asSourceProject;
-	public static String PluginsView_showDisabled;
-	public static String PluginsView_showWorkspace;
-	public static String PluginsView_textEditor;
-	public static String PluginWorkingSet_title;
-	public static String PluginsView_systemEditor;
-	public static String PluginsView_manifestEditor;
-	public static String PluginContentPage_rcpGroup;
-	public static String PluginContentPage_appClass;
-	public static String PluginContentPage_noLibrary;
-	public static String PluginWorkingSet_emptyName;
-	public static String PluginWorkingSet_nameInUse;
-	public static String PluginsView_schemaEditor;
-	public static String PluginsView_copy;
-	public static String PluginsView_dependentPlugins;
-	public static String PluginsView_pluginsInJavaSearch;
-	public static String PluginsView_addToJavaSearch;
-	public static String PluginsView_removeFromJavaSearch;
-	public static String PluginsView_showInNavigator;
-	public static String PluginWorkingSet_setContent;
-	public static String PluginWorkingSet_selectAll_label;
-	public static String PluginWorkingSet_selectAll_toolTip;
-	public static String PluginWorkingSet_deselectAll_label;
-	public static String PluginWorkingSet_deselectAll_toolTip;
-	public static String PluginsView_showInPackageExplorer;
-	public static String PluginWorkingSet_noPluginsChecked;
-	public static String PluginStatusDialog_pluginValidation;
-	public static String PluginsView_openWith;
-	public static String PluginsView_import;
-	public static String PluginsView_select;
-	public static String PluginsView_CollapseAllAction_label;
-	public static String PluginsView_CollapseAllAction_description;
-	public static String PluginsView_CollapseAllAction_tooltip;
-	public static String PluginsView_SelectAllAction_label;
-
-	public static String PluginSection_open;
-	public static String PluginsView_unableToOpen;
-	public static String PluginWorkingSet_setName;
-	public static String PluginStatusDialog_label;
-	public static String PluginContentPage_appID;
-	public static String PluginContentPage_noApp;
-	public static String PluginSection_removeAll;
-	public static String PluginsView_disabled;
-	public static String PluginContentPage_no;
-	public static String PluginSection_remove;
-	public static String RequiredPluginsContainerPage_title;
-	public static String RequiredPluginsContainerPage_desc;
-	public static String RequiredPluginsContainerPage_label;
-
-	public static String NewSiteWizard_wtitle;
-	public static String NewSiteWizard_MainPage_title;
-	public static String NewSiteWizard_creatingProject;
-	public static String NewSiteWizard_creatingFolders;
-	public static String NewSiteWizard_creatingManifest;
-	public static String NewSiteWizard_MainPage_desc;
-	public static String NewFeatureWizard_overwriteSite;
-
-	//
-	public static String SiteHTML_checkLabel;
-	public static String SiteHTML_webLabel;
-	public static String SiteHTML_webError;
-	public static String SiteHTML_loadError;
-
-	//
-	public static String FeatureBuildOperation_running;
-
-	public static String CompilersConfigurationBlock_error;
-	public static String CompilersConfigurationBlock_warning;
-	public static String CompilersConfigurationBlock_ignore;
-	public static String CompilersConfigurationBlock_plugins;
-	public static String CompilersConfigurationBlock_schemas;
-	public static String CompilersConfigurationBlock_features;
-	public static String CompilersConfigurationBlock_sites;
-	public static String CompilersConfigurationBlock_label;
-	public static String CompilersConfigurationBlock_altlabel;
-
-	public static String CompilersPreferencePage_desc;
-	public static String CompilersPreferencePage_title;
-
-	public static String CompilersPropertyPage_useworkspacesettings_label;
-	public static String CompilersPropertyPage_useworkspacesettings_change;
-	public static String CompilersPropertyPage_useprojectsettings_label;
-
-	public static String compilers_p_unresolved_import;
-	public static String compilers_p_unresolved_ex_points;
-	public static String compilers_p_unknown_element;
-	public static String compilers_p_unknown_attribute;
-	public static String compilers_p_unknown_class;
-	public static String compilers_p_unknown_resource;
-	public static String compilers_p_no_required_att;
-	public static String compilers_p_not_externalized_att;
-	public static String compilers_p_deprecated;
-	public static String compilers_s_create_docs;
-	public static String compilers_s_doc_folder;
-	public static String compilers_s_open_tags;
-	public static String compilers_s_forbidden_end_tags;
-	public static String compilers_s_optional_end_tags;
-
-	public static String compilers_f_unresolved_plugins;
-	public static String compilers_f_unresolved_features;
-
-	public static String CompilersConfigurationBlock_rebuild_title;
-	public static String CompilersConfigurationBlock_rebuild_message;
-	public static String CompilersConfigurationBlock_rebuild_many_title;
-	public static String CompilersConfigurationBlock_rebuild_many_message;
-	public static String CompilersConfigurationBlock_building;
-
-	public static String SchemaMarkerResolutionGenerator_label;
-
-
-	public static String ExportWizard_Plugin_pageTitle;
-	public static String ExportWizard_Feature_pageTitle;
-	public static String ExportWizard_Plugin_pageBlock;
-	public static String ExportWizard_Feature_pageBlock;
-	public static String ExportWizard_Plugin_description;
-	public static String ExportWizard_archive;
-	public static String ExportWizard_includeSource;
-	public static String ExportWizard_multi_platform;
-	public static String ExportWizard_destination;
-	public static String ExportWizard_options;
-	public static String ExportWizard_directory;
-	public static String ExportWizard_badDirectory;
-	public static String ExportWizard_workingSet;
-	public static String ExportWizard_browse;
-	public static String ExportWizard_browse2;
-	public static String ExportWizard_antCheck;
-	public static String ExportWizard_dialog_title;
-	public static String ExportWizard_dialog_message;
-	public static String ExportWizard_error_message;
-	public static String ExportWizard_status_noselection;
-	public static String ExportWizard_status_nodirectory;
-	public static String ExportWizard_status_nofile;
-	public static String ExportWizard_status_noantfile;
-	public static String ExtensionsPage_title;
-	public static String ExtensionsPage_tabName;
-	public static String ExtensionDetails_title;
-	public static String ExtensionDetails_desc;
-	public static String ExtensionDetails_id;
-	public static String ExtensionDetails_name;
-	public static String ExtensionDetails_point;
-	public static String ExportWizard_zipFileExists;
-	public static String ExportWizard_targetEnv_button;
-	public static String ExportSection_successfulSync;
-
-	public static String ExportJob_error_message;
-	public static String ExportJob_exporting;
-	public static String ExportJob_jobTitle;
-	public static String ExportSection_sync;
-
-	public static String SiteEditorContributor_build;
-	public static String SiteEditorContributor_rebuildAll;
-	public static String GrammarPropertySource_minOccursFormat;
-	public static String GrammarPropertySource_maxOccursFormat;
-	public static String GrammarPropertySource_minOccursValue;
-	public static String GrammarPropertySource_maxOccursValue;
-	public static String ReferencePropertySource_minOccurs_value;
-	public static String ReferencePropertySource_maxOccurs_value;
-	public static String FeatureImportWizard_DetailedPage_loading;
-	public static String FeatureImportWizard_DetailedPage_problemsLoading;
-	public static String NewFeatureDialog_alreadyDefined;
-	public static String NewArchiveDialog_alreadyExists;
-	public static String UpdateClasspathAction_missingPlugin_title;
-	public static String UpdateClasspathAction_find;
-	public static String UpdateClasspathAction_none;
-	public static String RenameDialog_label;
-	public static String RenameDialog_validationError;
-	public static String ReferenceAttributeRow_browse;
-	public static String EditableTablePart_renameAction;
-	public static String EditableTablePart_renameTitle;
-
-	// Site Editor #########################################
-	public static String CategorySection_title;
-	public static String CategorySection_new;
-	public static String CategorySection_desc;
-	public static String CategorySection_add;
-	public static String CategorySection_remove;
-	public static String CategorySection_environment;
-	public static String CategorySection_buildAll;
-	public static String CategorySection_build;
-	public static String CategorySection_newCategoryName;
-	public static String CategorySection_newCategoryLabel;
-
-	public static String CategoryDetails_title;
-	public static String CategoryDetails_sectionDescription;
-	public static String CategoryDetails_name;
-	public static String CategoryDetails_label;
-	public static String CategoryDetails_desc;
-	public static String CategoryDetails_alreadyExists;
-	public static String CategoryDetails_alreadyExists_title;
-
-	public static String FeaturesPage_title;
-	public static String FeaturesPage_header;
-
-	public static String SiteEditor_add;
-	public static String SiteEditor_edit;
-	public static String SiteEditor_remove;
-	public static String SiteEditor_NewArchiveDialog_path;
-	public static String SiteEditor_NewArchiveDialog_url;
-	public static String SiteEditor_NewArchiveDialog_title;
-	public static String SiteEditor_NewArchiveDialog_error;
-	public static String SiteEditor_ArchiveSection_header;
-	public static String SiteEditor_ArchiveSection_instruction;
-	public static String SiteEditor_ArchiveSection_col1;
-	public static String SiteEditor_ArchiveSection_col2;
-	public static String SiteEditor_DescriptionSection_header;
-	public static String SiteEditor_DescriptionSection_desc;
-	public static String SiteEditor_DescriptionSection_descLabel;
-	public static String SiteEditor_DescriptionSection_urlLabel;
-	public static String SiteEditor_MirrorsSection_header;
-	public static String SiteEditor_MirrorsSection_desc;
-	public static String SiteEditor_MirrorsSection_urlLabel;
-
-	public static String SynchronizePropertiesAction_label;
-	public static String SynchronizePropertiesWizard_wtitle;
-	public static String SynchronizePropertiesWizardPage_title;
-	public static String SynchronizePropertiesWizardPage_desc;
-	public static String SynchronizePropertiesWizardPage_group;
-	public static String SynchronizationOperation_externalPlugin;
-	public static String SynchronizePropertiesWizardPage_oneFeature;
-	public static String SynchronizationOperation_noDefiningPlugin;
-	public static String SynchronizePropertiesWizardPage_allFeatures;
-	public static String SynchronizePropertiesWizardPage_synchronizing;
-
-	//Migration Wizard#############################
-	public static String MigrationWizard_title;
-	public static String MigrationAction_find;
-	public static String MigrationAction_none;
-	public static String MigrationWizard_progress;
-	public static String MigrationWizardPage_desc;
-	public static String MigrationWizardPage_label;
-	public static String MigrationWizard_update;
-
-	public static String PDEFormPage_help;
-	public static String GeneralInfoSection_id;
-	public static String GeneralInfoSection_name;
-	public static String GeneralInfoSection_class;
-	public static String GeneralInfoSection_browse;
-	public static String GeneralInfoSection_platformFilter;
-	public static String GeneralInfoSection_selectionTitle;
-	public static String RequiresSection_title;
-	public static String RequiresSection_fDesc;
-	public static String RequiresSection_desc;
-	public static String RequiresSection_down;
-	public static String RequiresSection_add;
-	public static String RequiresSection_up;
-	public static String RequiresSection_open;
-	public static String RequiresSection_compute;
-	public static String RequiresSection_update;
-	public static String RequiresSection_delete;
-	public static String LoopDialog_title;
-	public static String MatchSection_title;
-	public static String MailTemplate_title;
-	public static String MailTemplate_appId;
-	public static String MailNewWizard_title;
-	public static String MatchSection_desc;
-	public static String MailTemplate_desc;
-	public static String ClasspathSection_jarsMessage;
-	public static String ClasspathSection_rename;
-	public static String OverviewPage_exportingTitle;
-	public static String OverviewPage_content;
-	public static String OverviewPage_osgi;
-	public static String OverviewPage_testing;
-	public static String OverviewPage_OSGiTesting;
-	public static String OverviewPage_tabName;
-	public static String OverviewPage_title;
-	public static String OverviewPage_deploying;
-	public static String OverviewPage_fOsgi;
-	public static String OverviewPage_error;
-	public static String OverviewPage_fContent;
-	public static String OverviewPage_fTesting;
-	public static String OverviewPage_fDeploying;
-	public static String ClassAttributeRow_dialogTitle;
-	public static String AttributePropertySource_assertBoolean;
-	public static String AttributePropertySource_translatable;
-	public static String AttributePropertySource_deprecated;
-	public static String AttributePropertySource_invalidRestriction;
-	public static String ArchivePage_title;
-	public static String ArchivePage_name;
-
-	public static String SampleWizard_title;
-	public static String SampleEditor_desc;
-	public static String SampleWizard_overwrite;
-	public static String SampleEditor_content;
-	public static String SampleOperation_creating;
-	public static String SampleStandbyContent_content;
-	public static String SampleStandbyContent_desc;
-	public static String ReviewPage_title;
-	public static String ReviewPage_desc;
-	public static String ReviewPage_descContent;
-	public static String ReviewPage_content;
-	public static String ShowSampleAction_title;
-	public static String ShowSampleAction_msgDesc;
-	public static String SelfHostingPropertyPage_label;
-	public static String SelfHostingPropertyPage_viewerLabel;
-	public static String MigratePluginWizard_cleanProjects;
-	public static String RuntimePage_tabName;
-	public static String ApplicationSelectionDialog_debug;
-	public static String ApplicationSelectionDialog_run;
-	public static String ApplicationSelectionDialog_dtitle;
-	public static String ApplicationSelectionDialog_rtitle;
-
-	public static String PluginValidationOperation_missingCore;
-	public static String PluginValidationOperation_missingApp;
-	public static String PluginValidationOperation_missingApp2;
-	public static String PluginValidationOperation_missingProduct;
-	public static String PluginValidationOperation_missingProduct2;
-	public static String PluginValidationOperation_disableFragment;
-	public static String PluginValidationOperation_disablePlugin;
-	public static String PluginValidationOperation_missingRequired;
-	public static String PluginValidationOperation_disabledRequired;
-	public static String PluginValidationOperation_missingImport;
-	public static String PluginValidationOperation_missingParent;
-	public static String PluginValidationOperation_disabledParent;
-	public static String ElementPropertySource_translatable;
-	public static String ElementPropertySource_deprecated;
-	public static String TargetPlatformPreferencePage_pluginsTab;
-	public static String TargetPlatformPreferencePage_sourceCode;
-	public static String TargetPlatformPreferencePage_environmentTab;
-	public static String EnvironmentBlock_jreGroup;
-	public static String EnvironmentBlock_jreNote;
-	public static String EnvironmentBlock_targetEnv;
-	public static String MailTemplate_productName;
-	public static String MailTemplate_productID;
-	public static String MailTemplate_appClass;
-	public static String MailTemplate_packageName;
-
-	//Product Editor#####################
-	public static String Product_overview_configuration;
-	public static String Product_PluginSection_working;
-	public static String ProductInfoSection_titleLabel;
-	public static String Product_PluginSection_required;
-	public static String ProductInfoSection_prodIdLabel;
-	public static String ProductExportAction_errorTitle;
-	public static String ProductExportWizardPage_title;
-	public static String ProductExportWizardPage_config;
-	public static String ProductExportWizardPage_browse;
-	public static String Product_PluginSection_removeAll;
-	public static String Product_PluginSection_newPlugin;
-	public static String Product_ConfigurationPage_title;
-	public static String ProductFileWizadPage_groupTitle;
-	public static String Product_PluginSection_newFragment;
-	public static String Product_overview_testing;
-	public static String ProductInfoSection_title;
-	public static String Product_PluginSection_add;
-	public static String Product_PluginSection_title;
-	public static String Product_ExportSection_title;
-	public static String Product_FeatureSection_desc;
-	public static String ProductInfoSection_appLabel;
-	public static String ProductExportAction_jobName;
-	public static String ProductExportJob_jobName;
-	public static String ProductExportWizardPage_desc;
-	public static String ProductExportWizardPage_root;
-	public static String ProductExportWizardPage_sync;
-	public static String ProductExportWizard_error;
-	public static String ProductExportWizard_corrupt;
-	public static String ProductDefinitionWizard_title;
-	public static String ProductDefinitionWizard_error;
-	public static String ProductDefinitonWizardPage_title;
-	public static String ProductDefinitonWizardPage_desc;
-	public static String ProductDefinitonWizardPage_descNoName;
-	public static String ProductDefinitonWizardPage_plugin;
-	public static String ProductDefinitonWizardPage_browse;
-	public static String ProductDefinitonWizardPage_productId;
-	public static String ProductDefinitonWizardPage_productName;
-	public static String ProductDefinitonWizardPage_noPluginId;
-	public static String ProductDefinitonWizardPage_noPlugin;
-	public static String ProductDefinitonWizardPage_invalidId;
-	public static String Product_ExportSection_includeSource;
-	public static String Product_FeatureSection_title;
-	public static String Product_FeatureSection_newFeature;
-	public static String ProductExportAction_noDestination;
-	public static String ProductExportWizardPage_productGroup;
-	public static String ProductExportWizardPage_productNotExists;
-	public static String ProductExportWizardPage_wrongExtension;
-	public static String ProductExportWizardPage_fileSelection;
-	public static String ProductExportWizardPage_productSelection;
-	public static String ProductExportWizardPage_syncText;
-	public static String ProductExportWizardPage_syncButton;
-	public static String ProductExportWizardPage_noProduct;
-	public static String Product_OverviewPage_testing;
-	public static String Product_PluginSection_desc;
-	public static String Product_ExportSection_desc;
-	public static String Product_FeatureSection_add;
-	public static String ProductFileWizadPage_title;
-	public static String ProductFileWizadPage_basic;
-	public static String ProductFileWizadPage_error;
-	public static String Product_overview_exporting;
-	public static String ProductInfoSection_desc;
-	public static String ProductInfoSection_id;
-	public static String ProductInfoSection_new;
-	public static String ProductInfoSection_app;
-	public static String SplashSection_title;
-	public static String SplashSection_desc;
-	public static String SplashSection_label;
-	public static String SplashSection_plugin;
-	public static String SplashSection_browse;
-	public static String SplashSection_selection;
-	public static String SplashSection_message;
-	public static String BrandingPage_title;
-	public static String WindowImagesSection_title;
-	public static String WindowImagesSection_desc;
-	public static String WindowImagesSection_browse;
-	public static String WindowImagesSection_open;
-	public static String WindowImagesSection_warning;
-	public static String WindowImagesSection_emptyPath;
-	public static String WindowImagesSection_dialogTitle;
-	public static String WindowImagesSection_dialogMessage;
-	public static String AboutSection_title;
-	public static String AboutSection_desc;
-	public static String AboutSection_image;
-	public static String AboutSection_browse;
-	public static String AboutSection_text;
-	public static String AboutSection_open;
-	public static String AboutSection_warning;
-	public static String AboutSection_imgTitle;
-	public static String AboutSection_imgMessage;
-	public static String LauncherSection_solarisLabel;
-	public static String LauncherSection_launcherName;
-	public static String LauncherSection_dialogTitle;
-	public static String LauncherSection_dialogMessage;
-	public static String ProductDefinitonWizardPage_applicationDefinition;
-	public static String SWTApplicationLaunchShortcut_noMainInEditor;
-	public static String SWTApplicationLaunchShortcut_noMainInSelection;
-	public static String SWTApplicationLaunchShortcut_debug;
-	public static String SWTApplicationLaunchShortcut_run;
-	public static String SWTApplicationLaunchShortcut_launch;
-	public static String SWTApplicationLaunchShortcut_failed;
-	public static String SWTApplicationLaunchShortcut_chooseRun;
-	public static String SWTApplicationLaunchShortcut_chooseDebug;
-	public static String SWTApplicationLaunchShortcut_error;
-	public static String SWTApplicationLaunchShortcut_exception;
-	public static String ArgumentsSection_title;
-	public static String ArgumentsSection_desc;
-	public static String ArgumentsSection_program;
-	public static String ArgumentsSection_vm;
-
-	public static String Product_FeatureSection_remove;
-	public static String Product_FeatureSection_open;
-
-	public static String ImportPackageSection_desc;
-	public static String ImportPackageSection_descFragment;
-	public static String ExportPackageSection_desc;
-	public static String ExportPackageSection_descFragment;
-
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_NAME, PDEUIMessages.class);
-	}
-
-	public static String ExportPackageVisibilitySection_title;
-
-	public static String ExportPackageVisibilitySection_default;
-
-	public static String ExportPackageVisibilitySection_hideAll;
-
-	public static String ExportPackageVisibilitySection_hideOnly;
-
-	public static String ExportPackageSection_0;
-
-	public static String ExportPackageSection_add;
-
-	public static String ExportPackageSection_remove;
-
-	public static String ExportPackageSection_properties;
-
-	public static String ExportPackageSection_title;
-
-	public static String ExportPackageSection_propertyAction;
-
-	public static String DependenciesPage_properties;
-
-	public static String ImportPackageSection_add;
-
-	public static String ImportPackageSection_remove;
-
-	public static String ImportPackageSection_properties;
-
-	public static String ImportPackageSection_required;
-
-	public static String ImportPackageSection_exported;
-
-	public static String ImportPackageSection_selection;
-
-	public static String ImportPackageSection_propertyAction;
-
-	public static String DependencyPropertiesDialog_properties;
-
-	public static String DependencyPropertiesDialog_optional;
-
-	public static String DependencyPropertiesDialog_reexport;
-
-	public static String DependencyPropertiesDialog_version;
-
-	public static String DependencyPropertiesDialog_invalidRange;
-
-	public static String DependencyPropertiesDialog_invalidFormat;
-
-	public static String RequiresSection_properties;
-
-	public static String ClasspathSection_fragment;
-
-	public static String ClasspathSection_plugin;
-
-	public static String EnvironmentBlock_jreTitle;
-
-	public static String DependencyExtentSearchResultPage_referencesInPlugin;
-
-	public static String CrossPlatformExportPage_available;
-
-	public static String CrossPlatformExportPage_title;
-
-	public static String CrossPlatformExportPage_desc;
-
-	public static String BaseImportWizardSecondPage_autobuild;
-
-	public static String CreateHelpIndexAction_creating;
-
-	public static String ExportPackageVisibilitySection_unconditional;
-
-	public static String ExportPackageSection_props;
-
-	public static String ExtensionPointsSection_showDescription;
-
-	public static String HelloRCPTemplate_perspective;
-
-	public static String OverviewPage_buildTitle;
-
-	public static String OverviewPage_buildQuestion;
-
-	public static String BaseExportWizardPage_compilerOptions;
-
-	public static String BaseExportWizardPage_javacTarget;
-
-	public static String BaseExportWizardPage_javacSource;
-
-	public static String PluginWorkingSet_message;
-
-	public static String ProductDefinitonWizardPage_noProductName;
-
-	public static String DependencyPropertiesDialog_groupText;
-
-	public static String DependencyPropertiesDialog_comboInclusive;
-
-	public static String DependencyPropertiesDialog_comboExclusive;
-
-	public static String DependencyPropertiesDialog_minimumVersion;
-
-	public static String DependencyPropertiesDialog_maximumVersion;
-
-	public static String DependencyPropertiesDialog_versionRangeError;
-
-	public static String NewProjectCreationPage_pDependsOnRuntime;
-
-	public static String NewProjectCreationPage_pPureOSGi;
-
-	public static String HelloOSGiNewWizard_title;
-
-	public static String HelloOSGiTemplate_startMessage;
-
-	public static String HelloOSGiTemplate_stopMessage;
-
-	public static String HelloOSGiTemplate_pageTitle;
-
-	public static String HelloOSGiTemplate_pageDescription;
-
-	public static String IntroSection_sectionText;
-
-	public static String IntroSection_sectionDescription;
-
-	public static String IntroSection_introLabel;
-
-	public static String IntroSection_introInput;
-
-	public static String IntroSection_new;
-
-	public static String IntroSection_undefinedProductId;
-
-	public static String IntroSection_undefinedProductIdMessage;
-
-	public static String ProductIntroWizard_title;
-
-	public static String ProductIntroWizardPage_title;
-
-	public static String ProductIntroWizardPage_description;
-
-	public static String ProductIntroWizardPage_groupText;
-
-	public static String ProductIntroWizardPage_formText;
-
-	public static String ProductIntroWizardPage_targetLabel;
-
-	public static String ProductIntroWizardPage_browse;
-
-	public static String ProductIntroWizardPage_introLabel;
-
-	public static String ProductIntroWizardPage_targetNotSet;
-
-	public static String ProductIntroWizardPage_introNotSet;
-
-	public static String ProductIntroWizardPage_invalidIntroId;
-
-	public static String ProductIntroWizardPage_introIdExists;
-	
-	public static String ManifestTypeRenameParticipant_composite;
-
-	public static String LauncherPage_title;
-
-	public static String WindowImagesSection_16;
-
-	public static String WindowImagesSection_32;
-
-	public static String WindowImagesSection_48;
-
-	public static String WindowImagesSection_64;
-
-	public static String WindowImagesSection_128;
-
-	public static String ManifestPackageRenameParticipant_packageRename;
-
-	public static String NewProjectCreationPage_standard;
-
-	public static String PluginDevelopmentPage_presentation;
-
-	public static String PluginDevelopmentPage_extensions;
-
-	public static String PluginDevelopmentPage_equinox;
-
-	public static String MainTab_jreSection;
-
-	public static String PluginsTab_target;
-
-	public static String BaseBlock_workspace;
-
-	public static String BaseBlock_filesystem;
-
-	public static String BaseBlock_variables;
-
-	public static String BaseBlock_relative;
-
-	public static String OverviewPage_extensionContent;
-
-	public static String OverviewPage_extensionPageMessageTitle;
-
-	public static String OverviewPage_extensionPageMessageBody;
-
-	public static String OverviewPage_fExtensionContent;
-
-	public static String BaseBlock_dirSelection;
-
-	public static String BaseBlock_dirChoose;
-
-	public static String BaseBlock_errorMessage;
-
-	public static String ConfigurationTemplateBlock_name;
-
-	public static String WorkspaceDataBlock_name;
-
-	public static String ConfigurationAreaBlock_0;
-
-	public static String ConfigurationAreaBlock_name;
-
-	public static String AbstractPluginBlock_counter;
-
-	public static String EquinoxPluginBlock_pluginsColumn;
-
-	public static String EquinoxPluginBlock_levelColumn;
-
-	public static String EquinoxPluginBlock_autoColumn;
-
-	public static String EquinoxPluginsTab_defaultStart;
-
-	public static String EquinoxPluginsTab_defaultAuto;
-
-	public static String EquinoxSettingsTab_name;
-
-	public static String EquinoxLaunchConfiguration_oldTarget;
-
-	public static String ModelChangeLabelProvider_instance;
-
-	public static String ModelChangeLabelProvider_instances;
-
-	public static String GetNonExternalizedStringsOperation_taskMessage;
-
-	public static String ExternalizeStringsWizard_title;
-
-	public static String GetNonExternalizedStringsAction_allExternalizedTitle;
-
-	public static String GetNonExternalizedStringsAction_allExternalizedMessage;
-
-	public static String ExternalizeStringsWizardPage_pageTitle;
-
-	public static String ExternalizeStringsWizardPage_pageDescription;
-
-	public static String ExternalizeStringsWizardPage_badLocalizationError;
-
-	public static String ExternalizeStringsWizardPage_resourcelabel;
-
-	public static String ExternalizeStringsWizardPage_selectAllButton;
-
-	public static String ExternalizeStringsWizardPage_deselectAllButton;
-
-	public static String ExternalizeStringsWizardPage_projectLabel;
-
-	public static String ExternalizeStringsWizardPage_noUnderlyingResource;
-
-	public static String ExternalizeStringsWizardPage_localizationLabel;
-
-	public static String ExternalizeStringsWizardPage_propertiesLabel;
-
-	public static String ExternalizeStringsWizardPage_sourceLabel;
-
-	public static String ExternalizeStringsWizardPage_keyEmptyError;
-
-	public static String ExternalizeStringsWizardPage_keyCommentError;
-
-	public static String ExternalizeStringsWizardPage_keyError;
-
-	public static String ExternalizeStringsWizardPage_keyDuplicateError;
-
-	public static String ExternalizeStringsWizardPage_keySuggested;
-
-	public static String NewProjectCreationPage_target;
-
-	public static String NewProjectCreationPage_ftarget;
-
-	public static String NewProjectCreationPage_ptarget;
-
-	public static String RequiredExecutionEnvironmentSection_title;
-
-	public static String RequiredExecutionEnvironmentSection_minJRE;
-
-	public static String RequiredExecutionEnvironmentSection_jreProfile;
-
-	public static String RequiredExecutionEnvironmentSection_minJ2ME;
-
-	public static String RequiredExecutionEnvironmentSection_j2meProfile;
-
-	public static String RequiredExecutionEnvironmentSection_fminJRE;
-
-	public static String RequiredExecutionEnvironmentSection_fminJ2ME;
-
-	public static String PluginGeneralInfoSection_lazyStart;
-
-	public static String ClassSearchParticipant_taskMessage;
-
-	public static String CreateJREBundleHeaderResolution_desc;
-
-	public static String CreateJREBundleHeaderResolution_label;
-
-	public static String RenameAutostartResolution_desc;
-
-	public static String RenameAutostartResolution_label;
-
-	public static String AddSingleonAttributeTo_desc;
-
-	public static String AddSingleonAttributeTo_label;
-
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BaseBuildAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BaseBuildAction.java
deleted file mode 100644
index eec663f..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BaseBuildAction.java
+++ /dev/null

@@ -1,234 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.build;
-
-import java.lang.reflect.*;
-import java.util.*;
-
-import org.eclipse.ant.internal.ui.IAntUIConstants;
-import org.eclipse.ant.internal.ui.launchConfigurations.*;
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.debug.core.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.launching.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.operation.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.internal.*;
-import org.eclipse.pde.internal.build.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.ui.*;
-
-public abstract class BaseBuildAction
-		implements
-			IObjectActionDelegate,
-			IPreferenceConstants {
-
-	protected IFile fManifestFile;
-
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-	}
-
-	public void run(IAction action) {
-		if (!fManifestFile.exists())
-			return;
-
-		IRunnableWithProgress op = new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor) {
-				IWorkspaceRunnable wop = new IWorkspaceRunnable() {
-					public void run(IProgressMonitor monitor)
-							throws CoreException {
-						try {
-							doBuild(monitor);
-						} catch (InvocationTargetException e) {
-							PDEPlugin.logException(e);
-						}
-					}
-				};
-				try {
-					PDEPlugin.getWorkspace().run(wop, monitor);
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		};
-		try {
-			PlatformUI.getWorkbench().getProgressService().runInUI(
-					PDEPlugin.getActiveWorkbenchWindow(), op,
-					PDEPlugin.getWorkspace().getRoot());
-		} catch (InterruptedException e) {
-		} catch (InvocationTargetException e) {
-			PDEPlugin.logException(e);
-		}
-
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		if (selection instanceof IStructuredSelection) {
-			Object obj = ((IStructuredSelection) selection).getFirstElement();
-			if (obj != null && obj instanceof IFile) {
-				this.fManifestFile = (IFile) obj;
-			}
-		}
-
-	}
-
-	private void doBuild(IProgressMonitor monitor) throws CoreException,
-			InvocationTargetException {
-		monitor.beginTask(
-				PDEUIMessages.BuildAction_Validate, 4); 
-		if (!ensureValid(fManifestFile, monitor)) {
-			monitor.done();
-			return;
-		}
-		monitor.worked(1);
-		monitor
-				.setTaskName(PDEUIMessages.BuildAction_Generate); 
-		makeScripts(monitor);
-		monitor.worked(1);
-		monitor.setTaskName(PDEUIMessages.BuildAction_Update); 
-		refreshLocal(monitor);
-		monitor.worked(1);
-		setDefaultValues();
-		monitor.worked(1);
-
-	}
-
-	protected abstract void makeScripts(IProgressMonitor monitor)
-			throws InvocationTargetException, CoreException;
-
-	public static boolean ensureValid(IFile file, IProgressMonitor monitor)
-			throws CoreException {
-		// Force the build if autobuild is off
-		IProject project = file.getProject();
-		if (!project.getWorkspace().isAutoBuilding()) {
-			String builderID = "feature.xml".equals(file.getName()) ? PDE.FEATURE_BUILDER_ID : PDE.MANIFEST_BUILDER_ID; //$NON-NLS-1$
-			project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, builderID, null, monitor);
-		}
-
-		if (hasErrors(file)) {
-			// There are errors against this file - abort
-			MessageDialog
-					.openError(
-							null,
-							PDEUIMessages.BuildAction_ErrorDialog_Title, 
-							PDEUIMessages.BuildAction_ErrorDialog_Message); 
-			return false;
-		}
-		return true;
-	}
-
-	public static boolean hasErrors(IFile file) throws CoreException {
-		IMarker[] markers = file.findMarkers(IMarker.PROBLEM, true,
-				IResource.DEPTH_ZERO);
-		for (int i = 0; i < markers.length; i++) {
-			Object att = markers[i].getAttribute(IMarker.SEVERITY);
-			if (att != null && att instanceof Integer) {
-				if (((Integer) att).intValue() == IMarker.SEVERITY_ERROR)
-					return true;
-			}
-		}
-		return false;
-	}
-
-	protected void refreshLocal(IProgressMonitor monitor) throws CoreException {
-		IProject project = fManifestFile.getProject();
-		project.refreshLocal(IResource.DEPTH_ONE, monitor);
-		IFile file = project.getFile("dev.properties"); //$NON-NLS-1$
-		if (file.exists())
-			file.delete(true, false, monitor);
-		project.refreshLocal(IResource.DEPTH_ONE, monitor);
-	}
-
-	private void setDefaultValues() {
-		IProject project = fManifestFile.getProject();
-		IFile generatedFile = (IFile) project.findMember("build.xml"); //$NON-NLS-1$
-		if (generatedFile == null)
-			return;
-
-		try {
-			List configs = AntLaunchShortcut
-					.findExistingLaunchConfigurations(generatedFile);
-			ILaunchConfigurationWorkingCopy launchCopy;
-			if (configs.size() == 0) {
-				ILaunchConfiguration config = AntLaunchShortcut
-						.createDefaultLaunchConfiguration(generatedFile);
-				launchCopy = config.getWorkingCopy();
-			} else {
-				launchCopy = ((ILaunchConfiguration) configs.get(0))
-						.getWorkingCopy();
-			}
-			if (launchCopy == null)
-				return;
-
-			Map properties = new HashMap();
-			properties = launchCopy.getAttribute(
-					IAntLaunchConfigurationConstants.ATTR_ANT_PROPERTIES,
-					properties);
-			properties.put(IXMLConstants.PROPERTY_BASE_WS, TargetPlatform.getWS()); 
-			properties.put(IXMLConstants.PROPERTY_BASE_OS, TargetPlatform.getOS()); 
-			properties.put(IXMLConstants.PROPERTY_BASE_ARCH, TargetPlatform.getOSArch());
-			properties.put(IXMLConstants.PROPERTY_BASE_NL, TargetPlatform.getNL()); 
-			properties.put("eclipse.running", "true"); //$NON-NLS-1$ //$NON-NLS-2$
-
-			properties.put(IXMLConstants.PROPERTY_JAVAC_FAIL_ON_ERROR, "false"); //$NON-NLS-1$
-			properties.put(IXMLConstants.PROPERTY_JAVAC_DEBUG_INFO, "on"); //$NON-NLS-1$  
-			properties.put(IXMLConstants.PROPERTY_JAVAC_VERBOSE, "true"); //$NON-NLS-1$
-			
-			if (!project.hasNature(JavaCore.NATURE_ID)) {
-				Preferences pref = JavaCore.getPlugin().getPluginPreferences();
-				properties.put(IXMLConstants.PROPERTY_JAVAC_SOURCE, pref.getString(JavaCore.COMPILER_SOURCE)); 
-				properties.put(IXMLConstants.PROPERTY_JAVAC_TARGET, pref.getString(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM)); 
-			} else {
-				IJavaProject jProject = JavaCore.create(project);
-				properties.put(IXMLConstants.PROPERTY_JAVAC_SOURCE, jProject.getOption(JavaCore.COMPILER_SOURCE, true)); 
-				properties.put(IXMLConstants.PROPERTY_JAVAC_TARGET, jProject.getOption(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, true)); 				
-			}
-			properties.put(IXMLConstants.PROPERTY_BOOTCLASSPATH, getBootClasspath()); 
-			
-			launchCopy.setAttribute(
-					IAntLaunchConfigurationConstants.ATTR_ANT_PROPERTIES,
-					properties);
-			launchCopy.setAttribute(
-					IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_NAME,
-					(String) null);
-			launchCopy.setAttribute(
-					IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE,
-					(String) null);
-			launchCopy.setAttribute(
-					IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME,
-					(String) null);
-			launchCopy.setAttribute(
-					IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS,
-					(String) null);
-			launchCopy.setAttribute(
-					IAntUIConstants.ATTR_DEFAULT_VM_INSTALL,
-					(String) null);
-			launchCopy.doSave();
-		} catch (CoreException e) {
-		}
-	}
-	
-	public static String getBootClasspath() {
-		StringBuffer buffer = new StringBuffer();
-		LibraryLocation[] locations = JavaRuntime.getLibraryLocations(JavaRuntime.getDefaultVMInstall());
-		for (int i = 0; i < locations.length; i++) {
-			buffer.append(locations[i].getSystemLibraryPath().toOSString());
-			if (i < locations.length - 1)
-				buffer.append(";"); //$NON-NLS-1$
-		}
-		return buffer.toString();
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BuildFeatureAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BuildFeatureAction.java
deleted file mode 100644
index 3ac8d2c..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BuildFeatureAction.java
+++ /dev/null

@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.build;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.build.AbstractScriptGenerator;
-import org.eclipse.pde.internal.build.BuildScriptGenerator;
-import org.eclipse.pde.internal.build.IXMLConstants;
-import org.eclipse.pde.internal.core.ClasspathHelper;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.TargetPlatform;
-import org.eclipse.pde.internal.core.feature.FeatureChild;
-import org.eclipse.pde.internal.core.ifeature.IFeature;
-import org.eclipse.pde.internal.core.ifeature.IFeatureChild;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.core.ifeature.IFeaturePlugin;
-
-public class BuildFeatureAction extends BaseBuildAction {
-	
-	private IFeatureModel fFeatureModel;
-
-	protected void makeScripts(IProgressMonitor monitor)
-		throws InvocationTargetException, CoreException {
-		
-		ArrayList paths = new ArrayList();
-		IFeatureModel[] models = PDECore.getDefault().getFeatureModelManager().getModels();
-		for (int i = 0; i < models.length; i++) {
-			paths.add(models[i].getInstallLocation() + IPath.SEPARATOR + "feature.xml"); //$NON-NLS-1$
-			if (models[i].getUnderlyingResource() != null
-					&& models[i].getUnderlyingResource().equals(fManifestFile))
-				fFeatureModel = models[i];
-		}
-		
-		BuildScriptGenerator generator = new BuildScriptGenerator();
-		generator.setBuildingOSGi(PDECore.getDefault().getModelManager().isOSGiRuntime());
-		generator.setChildren(true);
-		AbstractScriptGenerator.setEmbeddedSource(AbstractScriptGenerator.getDefaultEmbeddedSource());
-
-		String url = ClasspathHelper.getDevEntriesProperties(fManifestFile.getProject().getLocation().addTrailingSeparator().toString() + "dev.properties", false); //$NON-NLS-1$
-		generator.setDevEntries(url);
-		generator.setWorkingDirectory(fManifestFile.getProject().getLocation().toOSString());
-		AbstractScriptGenerator.setConfigInfo(AbstractScriptGenerator.getDefaultConfigInfos()); //This needs to be set before we set the format
-		generator.setArchivesFormat(AbstractScriptGenerator.getDefaultConfigInfos() + '-' + IXMLConstants.FORMAT_ANTZIP);
-		generator.setElements(new String[] { "feature@" + fFeatureModel.getFeature().getId() + (fFeatureModel.getFeature().getVersion() == null ? "" : ":" + fFeatureModel.getFeature().getVersion()) }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		generator.setPluginPath(TargetPlatform.getFeaturePaths());
-		generator.setPDEState(TargetPlatform.getState());
-		generator.setNextId(TargetPlatform.getPDEState().getNextId());
-		generator.setStateExtraData(TargetPlatform.getBundleClasspaths(TargetPlatform.getPDEState()));
-		generator.setGenerateAssembleScript(false);
-		generator.generate();	
-	}
-	
-	private void refreshLocal(IFeature feature, IProgressMonitor monitor)
-		throws CoreException {
-		IFeaturePlugin[] references = feature.getPlugins();
-		for (int i = 0; i < references.length; i++) {
-			IPluginModelBase refmodel = feature.getReferencedModel(references[i]);
-			if (refmodel != null) {
-				IResource resource = refmodel.getUnderlyingResource();
-				if (resource != null)
-					resource.getProject().refreshLocal(IResource.DEPTH_ONE, monitor);
-			}
-		}
-		IFeatureChild[] included = feature.getIncludedFeatures();
-		for (int i = 0; i < included.length; i++) {
-			IFeature child = ((FeatureChild) included[i])
-					.getReferencedFeature();
-			if (child != null && child != fFeatureModel.getFeature()) {
-				IFeatureModel refmodel = child.getModel();
-				if (refmodel != null) {
-					refmodel.getUnderlyingResource().getProject().refreshLocal(
-							IResource.DEPTH_ONE, monitor);
-				}
-				refreshLocal(child, monitor);
-
-			}
-		}
-	}
-	
-	protected void refreshLocal(IProgressMonitor monitor)
-		throws CoreException {
-		super.refreshLocal(monitor);
-		refreshLocal(fFeatureModel.getFeature(), monitor);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BuildPluginAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BuildPluginAction.java
deleted file mode 100644
index 9daddee..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BuildPluginAction.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.build;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.build.AbstractScriptGenerator;
-import org.eclipse.pde.internal.build.BuildScriptGenerator;
-import org.eclipse.pde.internal.core.ClasspathHelper;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.TargetPlatform;
-
-public class BuildPluginAction extends BaseBuildAction {
-
-	protected void makeScripts(IProgressMonitor monitor)
-		throws InvocationTargetException, CoreException {
-	
-		BuildScriptGenerator generator = new BuildScriptGenerator();
-		BuildScriptGenerator.setEmbeddedSource(AbstractScriptGenerator.getDefaultEmbeddedSource());
-		BuildScriptGenerator.setForceUpdateJar(AbstractScriptGenerator.getForceUpdateJarFormat());
-		BuildScriptGenerator.setConfigInfo(AbstractScriptGenerator.getDefaultConfigInfos());
-		
-		IProject project = fManifestFile.getProject();
-		generator.setWorkingDirectory(project.getLocation().toOSString());
-		String url = ClasspathHelper.getDevEntriesProperties(project.getLocation().addTrailingSeparator().toString() + "dev.properties", false); //$NON-NLS-1$
-		generator.setDevEntries(url);
-		generator.setPDEState(TargetPlatform.getState());
-		generator.setNextId(TargetPlatform.getPDEState().getNextId());
-		generator.setStateExtraData(TargetPlatform.getBundleClasspaths(TargetPlatform.getPDEState()));
-		generator.setBuildingOSGi(PDECore.getDefault().getModelManager().isOSGiRuntime());
-		IPluginModelBase model = PDECore.getDefault().getModelManager().findModel(project);
-		generator.setElements(new String[] { "plugin@" +model.getPluginBase().getId() }); //$NON-NLS-1$
-		
-		generator.generate();
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BuildSiteAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BuildSiteAction.java
deleted file mode 100644
index b8657dd..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BuildSiteAction.java
+++ /dev/null

@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Oct 6, 2003
- */
-package org.eclipse.pde.internal.ui.build;
-
-import java.util.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.core.ifeature.*;
-import org.eclipse.pde.internal.core.isite.*;
-import org.eclipse.pde.internal.core.site.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.progress.*;
-
-public class BuildSiteAction implements IObjectActionDelegate,
-		IPreferenceConstants {
-
-	private ISiteModel fModel;
-
-	private IFile fSiteXML;
-	
-	private IWorkbenchPart fTargetPart;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction,
-	 *      org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		fTargetPart = targetPart;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		if (fModel == null)
-			return;
-		ISiteFeature[] sbFeatures = fModel.getSite().getFeatures();
-		sbFeatures[0].getModel().getSite().getFeatures();
-		IFeatureModel[] models = getFeatureModels(sbFeatures);
-
-		if (models.length > 0) {
-			BuildSiteJob job = new BuildSiteJob(fTargetPart.getSite().getShell().getDisplay(), models, fModel);
-			job.setUser(true);
-			job.schedule();
-			job.setProperty(IProgressConstants.ICON_PROPERTY,
-					PDEPluginImages.DESC_SITE_OBJ);
-		}
-	}
-
-	private IFeatureModel[] getFeatureModels(ISiteFeature[] sFeatures) {
-		ArrayList list = new ArrayList();
-		for (int i = 0; i < sFeatures.length; i++) {
-			ISiteFeature siteFeature = sFeatures[i];
-			IFeatureModel model = PDECore.getDefault().getFeatureModelManager()
-					.findFeatureModelRelaxed(siteFeature.getId(),
-							siteFeature.getVersion());
-			if (model != null && model.getUnderlyingResource() != null)
-				list.add(model);
-		}
-		return (IFeatureModel[]) list.toArray(new IFeatureModel[list.size()]);
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		if (selection instanceof IStructuredSelection) {
-			Object obj = ((IStructuredSelection) selection).getFirstElement();
-			if (obj != null && obj instanceof IFile) {
-				fSiteXML = (IFile) obj;
-				fModel = new WorkspaceSiteModel(fSiteXML);
-				try {
-					fModel.load();
-				} catch (CoreException e) {
-				}
-			}
-		}
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BuildSiteJob.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BuildSiteJob.java
deleted file mode 100644
index 3f6aa8e..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/BuildSiteJob.java
+++ /dev/null

@@ -1,292 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.build;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Properties;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.PluginVersionIdentifier;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.core.runtime.jobs.MultiRule;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.TargetPlatform;
-import org.eclipse.pde.internal.core.ifeature.IFeature;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.core.isite.ISiteFeature;
-import org.eclipse.pde.internal.core.isite.ISiteModel;
-import org.eclipse.pde.internal.core.site.WorkspaceSiteModel;
-import org.eclipse.pde.internal.core.util.PatternConstructor;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.swt.widgets.Display;
-
-public class BuildSiteJob extends FeatureExportJob {
-
-	private IFeatureModel[] fFeaturemodels;
-
-	private ISiteModel fSiteModel;
-
-	private IContainer fSiteContainer;
-	
-	private long fBuildTime;
-
-	private String fFeatureLocation;
-	
-	private static FeatureExportInfo getInfo(ISiteModel siteModel, IFeatureModel[] models) {
-		FeatureExportInfo info = new FeatureExportInfo();
-		info.useJarFormat = true;
-		info.toDirectory = true;
-		info.destinationDirectory = siteModel.getUnderlyingResource().getParent().getLocation().toOSString();
-		info.items = models;
-		return info;
-	}
-
-	public BuildSiteJob(Display display, IFeatureModel[] models,
-			ISiteModel siteModel) {		
-		super(getInfo(siteModel, models));
-		fFeaturemodels = models;
-		fSiteModel = siteModel;
-		fSiteContainer = siteModel.getUnderlyingResource().getParent();
-		setRule(MultiRule.combine(fSiteContainer.getProject(), getRule()));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.wizards.exports.FeatureExportJob#run(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected IStatus run(final IProgressMonitor monitor) {
-		fBuildTime = System.currentTimeMillis();
-		IStatus status = super.run(monitor);
-		try {
-			fSiteContainer.refreshLocal(IResource.DEPTH_INFINITE, monitor);
-			updateSiteFeatureVersions();
-		} catch (CoreException ce) {
-			PDECore.logException(ce);
-		}
-		return status;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.wizards.exports.FeatureExportJob#doExports(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void doExports(IProgressMonitor monitor)
-			throws InvocationTargetException, CoreException {
-		String[] config = { TargetPlatform.getOS(),
-				TargetPlatform.getWS(), TargetPlatform.getOSArch(),
-				TargetPlatform.getNL() };
-		try {
-			monitor.beginTask("", 10); //$NON-NLS-1$
-			// create a feature to wrap all plug-ins and features
-			String featureID = "org.eclipse.pde.container.feature"; //$NON-NLS-1$
-			fFeatureLocation = fBuildTempLocation + File.separator
-					+ featureID;
-			createFeature(featureID, fFeatureLocation, config, false);
-			createBuildPropertiesFile(fFeatureLocation);
-			if (fInfo.useJarFormat) {
-				createPostProcessingFile(new File(fFeatureLocation,
-						FEATURE_POST_PROCESSING));
-				createPostProcessingFile(new File(fFeatureLocation,
-						PLUGIN_POST_PROCESSING));
-			}
-			doExport(featureID, null, fFeatureLocation, config[0],
-					config[1], config[2],
-					new SubProgressMonitor(monitor, 7));
-		} catch (IOException e) {
-		} finally {
-			for (int j = 0; j < fInfo.items.length; j++) {
-				deleteBuildFiles(fInfo.items[j]);
-			}
-			cleanup(null, new SubProgressMonitor(monitor, 3));
-			monitor.done();
-		}	
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.wizards.exports.FeatureExportJob#getPaths()
-	 */
-	protected String[] getPaths() {
-		String[] paths = super.getPaths();
-		String[] all = new String[paths.length + 1];
-		all[0] = fFeatureLocation + File.separator + "feature.xml"; //$NON-NLS-1$
-		System.arraycopy(paths, 0, all, 1, paths.length);
-		return all;
-	}
-
-	private void createBuildPropertiesFile(String featureLocation) {
-		File file = new File(featureLocation);
-		if (!file.exists() || !file.isDirectory())
-			file.mkdirs();
-		Properties prop = new Properties();
-		prop.put("pde", "marker"); //$NON-NLS-1$ //$NON-NLS-2$
-		save(new File(file, "build.properties"), prop, "Marker File"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	private void save(File file, Properties properties, String header) {
-		try {
-			FileOutputStream stream = new FileOutputStream(file);
-			properties.store(stream, header);
-			stream.flush();
-			stream.close();
-		} catch (IOException e) {
-			PDECore.logException(e);
-		}
-	}
-	private void updateSiteFeatureVersions() {
-		try {
-			for (int i = 0; i < fFeaturemodels.length; i++) {
-				IFeature feature = fFeaturemodels[i].getFeature();
-				PluginVersionIdentifier pvi = new PluginVersionIdentifier(
-						feature.getVersion());
-
-				if ("qualifier".equals(pvi.getQualifierComponent())) { //$NON-NLS-1$
-					String newVersion = findBuiltVersion(feature.getId(), pvi
-							.getMajorComponent(), pvi.getMinorComponent(), pvi
-							.getServiceComponent());
-					if (newVersion == null) {
-						continue;
-					}
-					ISiteFeature reVersionCandidate = findSiteFeature(feature,
-							pvi);
-					if (reVersionCandidate != null) {
-						reVersionCandidate.setVersion(newVersion);
-						reVersionCandidate
-								.setURL("features/" + feature.getId() + "_" //$NON-NLS-1$ //$NON-NLS-2$
-										+ newVersion + ".jar"); //$NON-NLS-1$
-					}
-				}
-			}
-			((WorkspaceSiteModel)fSiteModel).save();
-		} catch (CoreException ce) {
-			PDEPlugin.logException(ce);
-		}
-	}
-
-	/**
-	 * @param feature
-	 * @param pvi
-	 * @param siteFeatures
-	 * @return
-	 */
-	private ISiteFeature findSiteFeature(IFeature feature,
-			PluginVersionIdentifier pvi) {
-		ISiteFeature reversionCandidate = null;
-		// first see if version with qualifier being qualifier is present among
-		// site features
-		ISiteFeature[] siteFeatures = fSiteModel.getSite().getFeatures();
-		for (int s = 0; s < siteFeatures.length; s++) {
-			if (siteFeatures[s].getId().equals(feature.getId())
-					&& siteFeatures[s].getVersion()
-							.equals(feature.getVersion())) {
-				return siteFeatures[s];
-			}
-		}
-		String highestQualifier = null;
-		// then find feature with the highest qualifier
-		for (int s = 0; s < siteFeatures.length; s++) {
-			if (siteFeatures[s].getId().equals(feature.getId())) {
-				PluginVersionIdentifier candidatePvi = new PluginVersionIdentifier(
-						siteFeatures[s].getVersion());
-				if (pvi.getMajorComponent() == candidatePvi.getMajorComponent()
-						&& pvi.getMinorComponent() == candidatePvi
-								.getMinorComponent()
-						&& pvi.getServiceComponent() == candidatePvi
-								.getServiceComponent()) {
-					if (reversionCandidate == null
-							|| candidatePvi.getQualifierComponent().compareTo(
-									highestQualifier) > 0) {
-						reversionCandidate = siteFeatures[s];
-						highestQualifier = candidatePvi.getQualifierComponent();
-					}
-
-				}
-			}
-		}
-		return reversionCandidate;
-	}
-
-	/**
-	 * Finds the highest version from feature jars. ID and version components
-	 * are constant. Qualifier varies
-	 * 
-	 * @param builtJars
-	 *            candidate jars in format id_version.jar
-	 * @param id
-	 * @param major
-	 * @param minor
-	 * @param service
-	 * @return
-	 */
-	private String findBuiltVersion(String id, int major, int minor, int service) {
-		IFolder featuresFolder = fSiteContainer.getFolder(new Path("features")); //$NON-NLS-1$
-		if (!featuresFolder.exists()) {
-			return null;
-		}
-		IResource[] featureJars = null;
-		try {
-			featureJars = featuresFolder.members();
-		} catch (CoreException ce) {
-			return null;
-		}
-		Pattern pattern = PatternConstructor.createPattern(id + "_" //$NON-NLS-1$
-				+ major + "." //$NON-NLS-1$
-				+ minor + "." //$NON-NLS-1$
-				+ service + "*.jar", true); //$NON-NLS-1$ 
-		// finding the newest feature archive
-		String newestName = null;
-		long newestTime = 0;
-		for (int i = 0; i < featureJars.length; i++) {
-			File file = new File(featureJars[i].getLocation().toOSString());
-			long jarTime = file.lastModified();
-			String jarName = featureJars[i].getName();
-			
-			if (jarTime < fBuildTime) {
-				continue;
-			}
-			if (jarTime <= newestTime) {
-				continue;
-			}
-			if (pattern.matcher(jarName).matches()) {
-				newestName = featureJars[i].getName();
-				newestTime = jarTime;
-			}
-		}
-		if (newestName == null) {
-			return null;
-		}
-
-		return newestName.substring(id.length() + 1, newestName.length() - 4);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.wizards.exports.FeatureExportJob#getLogFoundMessage()
-	 */
-	protected String getLogFoundMessage() {
-		return PDEUIMessages.BuildSiteJob_message; 
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/FeatureExportInfo.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/FeatureExportInfo.java
deleted file mode 100644
index 7a7d0f3..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/FeatureExportInfo.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.build;
-
-public class FeatureExportInfo {
-
-		public boolean toDirectory;
-		public boolean useJarFormat;
-		public boolean exportSource;
-		public String destinationDirectory;
-		public String zipFileName;
-		public Object[] items;
-		public String[] signingInfo;
-		public String[] jnlpInfo;
-		public String[][] targets;
-		public String javacTarget;
-		public String javacSource;
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/FeatureExportJob.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/FeatureExportJob.java
deleted file mode 100644
index c8dde47..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/FeatureExportJob.java
+++ /dev/null

@@ -1,706 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.build;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Dictionary;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.ant.core.AntCorePlugin;
-import org.eclipse.ant.core.AntCorePreferences;
-import org.eclipse.ant.core.AntRunner;
-import org.eclipse.ant.core.IAntClasspathEntry;
-import org.eclipse.core.resources.IFile;
-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.OperationCanceledException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.osgi.service.resolver.BundleDescription;
-import org.eclipse.osgi.service.resolver.State;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.core.IModel;
-import org.eclipse.pde.core.build.IBuild;
-import org.eclipse.pde.core.build.IBuildEntry;
-import org.eclipse.pde.core.build.IBuildModel;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.build.AbstractScriptGenerator;
-import org.eclipse.pde.internal.build.BuildScriptGenerator;
-import org.eclipse.pde.internal.build.IXMLConstants;
-import org.eclipse.pde.internal.core.ClasspathHelper;
-import org.eclipse.pde.internal.core.ModelEntry;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.PluginModelManager;
-import org.eclipse.pde.internal.core.TargetPlatform;
-import org.eclipse.pde.internal.core.XMLPrintHandler;
-import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;
-import org.eclipse.pde.internal.core.feature.FeatureChild;
-import org.eclipse.pde.internal.core.ifeature.IFeature;
-import org.eclipse.pde.internal.core.ifeature.IFeatureChild;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.core.ifeature.IFeaturePlugin;
-import org.eclipse.pde.internal.core.util.CoreUtility;
-import org.eclipse.pde.internal.ui.IPreferenceConstants;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.swt.widgets.Display;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class FeatureExportJob extends Job implements IPreferenceConstants {
-	
-	// write to the ant build listener log
-	private static boolean fHasErrors;
-
-	// Location where the build takes place
-	protected String fBuildTempLocation;
-	private String fDevProperties;
-
-	protected HashMap fAntBuildProperties;
-
-	protected static String FEATURE_POST_PROCESSING = "features.postProcessingSteps.properties"; //$NON-NLS-1$
-	protected static String PLUGIN_POST_PROCESSING = "plugins.postProcessingSteps.properties"; //$NON-NLS-1$
-	
-	private State fStateCopy;
-
-	protected FeatureExportInfo fInfo;
-
-	private static int fNumberErrors;
-
-	class SchedulingRule implements ISchedulingRule {
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.runtime.jobs.ISchedulingRule#contains(org.eclipse.core.runtime.jobs.ISchedulingRule)
-		 */
-		public boolean contains(ISchedulingRule rule) {
-			return rule instanceof SchedulingRule;
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.runtime.jobs.ISchedulingRule#isConflicting(org.eclipse.core.runtime.jobs.ISchedulingRule)
-		 */
-		public boolean isConflicting(ISchedulingRule rule) {
-			return rule instanceof SchedulingRule;
-		}
-	}
-
-	public FeatureExportJob(FeatureExportInfo info) {
-		super(PDEUIMessages.FeatureExportJob_name); 
-		fInfo = info;
-		fBuildTempLocation = PDEPlugin.getDefault().getStateLocation().append("temp").toString(); //$NON-NLS-1$
-		setRule(new SchedulingRule());
-	}
-
-	protected IStatus run(IProgressMonitor monitor) {
-		String errorMessage = null;
-		try {
-			fHasErrors = false;
-			fNumberErrors = 0;
-			doExports(monitor);
-		} catch (final CoreException e) {
-			final Display display = getStandardDisplay();
-			display.asyncExec(new Runnable() {
-				public void run() {
-					ErrorDialog.openError(display.getActiveShell(), PDEUIMessages.FeatureExportJob_error, PDEUIMessages.FeatureExportJob_problems, e.getStatus()); // 
-					done(new Status(IStatus.OK, PDEPlugin.getPluginId(), IStatus.OK, "", null)); //$NON-NLS-1$
-				}
-			});
-			return Job.ASYNC_FINISH;
-		} catch (InvocationTargetException e) {
-			String message = e.getTargetException().getMessage();
-			if (message != null && message.length() > 0) {
-				errorMessage = e.getTargetException().getMessage();
-			}
-		}
-		if (errorMessage == null && fNumberErrors > 0) {
-			errorMessage = getLogFoundMessage();
-		}
-
-		if (errorMessage != null) {
-			final String em = errorMessage;
-			getStandardDisplay().asyncExec(new Runnable() {
-				public void run() {
-					asyncNotifyExportException(em);
-				}
-			});
-			return Job.ASYNC_FINISH;
-		}
-		return new Status(IStatus.OK, PDEPlugin.getPluginId(), IStatus.OK, "", null); //$NON-NLS-1$
-	}
-	
-	public static void errorFound() {
-		fHasErrors = true;
-		fNumberErrors += 1;
-	}
-
-	protected void doExports(IProgressMonitor monitor) throws InvocationTargetException, CoreException {
-		createDestination();
-		String[][] configurations = fInfo.targets;
-		if (configurations == null)
-			configurations = new String[][] { null };
-		
-		monitor.beginTask("", configurations.length * fInfo.items.length * 10); //$NON-NLS-1$
-		for (int i = 0; i < configurations.length; i++) {
-			for (int j = 0; j < fInfo.items.length; j++) {
-				if (monitor.isCanceled())
-					throw new OperationCanceledException();
-				try {
-					doExport((IFeatureModel) fInfo.items[j], configurations[i], new SubProgressMonitor(monitor, 9));
-				} finally {
-					cleanup(configurations[i], new SubProgressMonitor(monitor, 1));
-				}
-			}
-		}
-		monitor.done();
-	}
-
-	private void doExport(IFeatureModel model, String os, String ws, String arch, IProgressMonitor monitor) throws CoreException, InvocationTargetException {
-		try {
-			String location = model.getInstallLocation();
-			if (fInfo.useJarFormat) {
-				createPostProcessingFile(new File(location, FEATURE_POST_PROCESSING));
-				createPostProcessingFile(new File(location, PLUGIN_POST_PROCESSING));
-			}
-			IFeature feature = model.getFeature();
-			doExport(feature.getId(), feature.getVersion(), location, os, ws, arch, monitor);
-		} finally {
-			deleteBuildFiles(model);
-		}
-	}
-	
-	protected void createPostProcessingFile(File file) {
-		FileOutputStream stream = null;
-		try {
-			stream = new FileOutputStream(file);
-			Properties prop = new Properties();
-			prop.put("*", "updateJar"); //$NON-NLS-1$ //$NON-NLS-2$
-			prop.store(stream, ""); //$NON-NLS-1$
-			stream.flush();
-		} catch (IOException e) {
-		} finally {
-			try {
-				if (stream != null)
-					stream.close();
-			} catch (IOException e) {
-			}			
-		}
-	}
-
-	private String getOS(IFeature feature) {
-		String os = feature.getOS();
-		if (os == null || os.trim().length() == 0 || os.indexOf(',') != -1 || os.equals("*")) //$NON-NLS-1$
-			return TargetPlatform.getOS();
-		return os;
-	}
-
-	private String getWS(IFeature feature) {
-		String ws = feature.getWS();
-		if (ws == null || ws.trim().length() == 0 || ws.indexOf(',') != -1 || ws.equals("*")) //$NON-NLS-1$
-			return TargetPlatform.getWS();
-		return ws;
-	}
-
-	private String getOSArch(IFeature feature) {
-		String arch = feature.getArch();
-		if (arch == null || arch.trim().length() == 0 || arch.indexOf(',') != -1 || arch.equals("*")) //$NON-NLS-1$
-			return TargetPlatform.getOSArch();
-		return arch;
-	}
-
-	private void createDestination() throws InvocationTargetException {
-		File file = new File(fInfo.destinationDirectory);
-		if (!file.exists() || !file.isDirectory()) {
-			if (!file.mkdirs())
-				throw new InvocationTargetException(new Exception(PDEUIMessages.ExportWizard_badDirectory)); 
-		}
-	}
-
-	private void createDestination(String os, String ws, String arch) throws InvocationTargetException {
-		if (!fInfo.toDirectory)
-			return;
-		File file = new File(fInfo.destinationDirectory, os + '.' + ws + '.' + arch);
-		if (!file.exists() || !file.isDirectory()) {
-			if (!file.mkdirs())
-				throw new InvocationTargetException(new Exception(PDEUIMessages.ExportWizard_badDirectory)); 
-		}
-	}
-
-	protected void doExport(IFeatureModel model, String[] config, IProgressMonitor monitor) throws CoreException, InvocationTargetException {
-		if (config == null) {
-			IFeature feature = model.getFeature();
-			doExport(model, getOS(feature), getWS(feature), getOSArch(feature), monitor);
-		} else {
-			createDestination(config[0], config[1], config[2]);
-			doExport(model, config[0], config[1], config[2], monitor);
-		}
-	}
-		
-	protected void doExport(String featureID, String version, String featureLocation, String os, String ws, String arch, IProgressMonitor monitor) throws CoreException, InvocationTargetException {
-		fHasErrors = false;
-		monitor.beginTask("", 9); //$NON-NLS-1$
-		monitor.setTaskName(PDEUIMessages.FeatureExportJob_taskName); 
-		try {
-			HashMap properties = createAntBuildProperties(os, ws, arch);
-			BuildScriptGenerator generator = new BuildScriptGenerator();
-			setupGenerator(generator, featureID, version, os, ws, arch, featureLocation);
-			generator.generate();
-			monitor.worked(1);
-			runScript(getBuildScriptName(featureLocation), getBuildExecutionTargets(), properties, new SubProgressMonitor(monitor, 2));
-			runScript(getAssemblyScriptName(featureID, os, ws, arch, featureLocation), new String[] {"main"}, //$NON-NLS-1$
-					properties, new SubProgressMonitor(monitor, 2));
-			runScript(getPackagerScriptName(featureID, os, ws, arch, featureLocation), null, properties, new SubProgressMonitor(monitor, 2));
-			properties.put("destination.temp.folder", fBuildTempLocation + "/pde.logs"); //$NON-NLS-1$ //$NON-NLS-2$
-			runScript(getBuildScriptName(featureLocation), new String[] {"gather.logs"}, properties, new SubProgressMonitor(monitor, 2)); //$NON-NLS-1$
-		} finally {
-			monitor.done();
-		}
-	}
-
-	protected String getPackagerScriptName(String featureID, String os, String ws, String arch, String featureLocation) {
-		return featureLocation + IPath.SEPARATOR + "package." //$NON-NLS-1$
-				+ featureID + "." + os + "." //$NON-NLS-1$ //$NON-NLS-2$
-				+ ws + "." + arch //$NON-NLS-1$
-				+ ".xml"; //$NON-NLS-1$
-	}
-
-	protected HashMap createAntBuildProperties(String os, String ws, String arch) {
-		if (fAntBuildProperties == null) {
-			fAntBuildProperties = new HashMap(15);
-			if (fInfo.signingInfo != null) {
-				fAntBuildProperties.put("sign.alias", fInfo.signingInfo[0]); //$NON-NLS-1$
-				fAntBuildProperties.put("sign.keystore", fInfo.signingInfo[1]); //$NON-NLS-1$
-				fAntBuildProperties.put("sign.storepass", fInfo.signingInfo[2]); //$NON-NLS-1$
-			}
-			if (fInfo.jnlpInfo != null) {
-				fAntBuildProperties.put("jnlp.codebase", fInfo.jnlpInfo[0]); //$NON-NLS-1$
-				fAntBuildProperties.put("jnlp.j2se", fInfo.jnlpInfo[1]); //$NON-NLS-1$
-			}
-
-			fAntBuildProperties.put(IXMLConstants.PROPERTY_BUILD_TEMP, fBuildTempLocation + "/destination"); //$NON-NLS-1$
-			fAntBuildProperties.put(IXMLConstants.PROPERTY_FEATURE_TEMP_FOLDER, fBuildTempLocation + "/destination"); //$NON-NLS-1$
-			fAntBuildProperties.put(IXMLConstants.PROPERTY_INCLUDE_CHILDREN, "true"); //$NON-NLS-1$
-			fAntBuildProperties.put("eclipse.running", "true"); //$NON-NLS-1$ //$NON-NLS-2$
-			fAntBuildProperties.put(IXMLConstants.PROPERTY_BASE_OS, os);
-			fAntBuildProperties.put(IXMLConstants.PROPERTY_BASE_WS, ws);
-			fAntBuildProperties.put(IXMLConstants.PROPERTY_BASE_ARCH, arch);
-			fAntBuildProperties.put(IXMLConstants.PROPERTY_BASE_NL, TargetPlatform.getNL());
-			fAntBuildProperties.put(IXMLConstants.PROPERTY_BOOTCLASSPATH, BaseBuildAction.getBootClasspath());
-			fAntBuildProperties.put(IXMLConstants.PROPERTY_JAVAC_FAIL_ON_ERROR, "false"); //$NON-NLS-1$
-			fAntBuildProperties.put(IXMLConstants.PROPERTY_JAVAC_DEBUG_INFO, "on"); //$NON-NLS-1$ 
-			fAntBuildProperties.put(IXMLConstants.PROPERTY_JAVAC_VERBOSE, "true"); //$NON-NLS-1$
-
-			Preferences pref = JavaCore.getPlugin().getPluginPreferences();
-			String source = fInfo.javacSource == null ?  pref.getString(JavaCore.COMPILER_SOURCE) : fInfo.javacSource; 
-			fAntBuildProperties.put(IXMLConstants.PROPERTY_JAVAC_SOURCE, source);
-			String target = fInfo.javacTarget == null ? pref.getString(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM) : fInfo.javacTarget;
-			fAntBuildProperties.put(IXMLConstants.PROPERTY_JAVAC_TARGET, target);
-
-			// for the assembler...
-			fAntBuildProperties.put(IXMLConstants.PROPERTY_BUILD_DIRECTORY, fBuildTempLocation + "/assemblyLocation"); //$NON-NLS-1$
-			fAntBuildProperties.put(IXMLConstants.PROPERTY_BUILD_LABEL, "."); //$NON-NLS-1$
-			fAntBuildProperties.put(IXMLConstants.PROPERTY_COLLECTING_FOLDER, "."); //$NON-NLS-1$
-			String prefix = Platform.getOS().equals("macosx") ? "." : ""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			fAntBuildProperties.put(IXMLConstants.PROPERTY_ARCHIVE_PREFIX, prefix);
-
-			if (!fInfo.toDirectory) {
-				String filename = fInfo.zipFileName;
-				if (fInfo.targets != null) {
-					int i = filename.lastIndexOf('.');
-					filename = filename.substring(0, i) + '.' + os + '.' + ws + '.' + arch + filename.substring(i);
-				}
-				fAntBuildProperties.put(IXMLConstants.PROPERTY_ARCHIVE_FULLPATH, fInfo.destinationDirectory + File.separator + filename);
-			} else {
-				String dir = fInfo.destinationDirectory;
-				if (fInfo.targets != null)
-					dir += File.separatorChar + os + '.' + ws + '.' + arch;
-				fAntBuildProperties.put(IXMLConstants.PROPERTY_ASSEMBLY_TMP, dir);
-			}
-			fAntBuildProperties.put(IXMLConstants.PROPERTY_TAR_ARGS, ""); //$NON-NLS-1$
-		}
-		return fAntBuildProperties;
-	}
-
-	protected void setupGenerator(BuildScriptGenerator generator, String featureID, String versionId, String os, String ws, String arch, String featureLocation) throws CoreException {
-		generator.setBuildingOSGi(PDECore.getDefault().getModelManager().isOSGiRuntime());
-		generator.setChildren(true);
-		generator.setWorkingDirectory(featureLocation);
-		generator.setDevEntries(getDevProperties());
-		generator.setElements(new String[] {"feature@" + featureID + (versionId == null ? "" : ":" + versionId)}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		generator.setPluginPath(getPaths());
-		generator.setReportResolutionErrors(false);
-		generator.setIgnoreMissingPropertiesFile(true);
-		generator.setSignJars(fInfo.signingInfo != null);
-		generator.setGenerateJnlp(fInfo.jnlpInfo != null);
-		String config = os + ',' + ws + ',' + arch;
-		AbstractScriptGenerator.setConfigInfo(config);  //This needs to be set before we set the format
-		String format;
-		if (fInfo.toDirectory)
-			format = config + '-' + IXMLConstants.FORMAT_FOLDER;
-		else
-			format = config + '-' + IXMLConstants.FORMAT_ANTZIP;
-		generator.setArchivesFormat(format);
-		generator.setPDEState(getState(os, ws, arch));
-		generator.setNextId(TargetPlatform.getPDEState().getNextId());
-		generator.setStateExtraData(TargetPlatform.getBundleClasspaths(TargetPlatform.getPDEState()));
-		AbstractScriptGenerator.setForceUpdateJar(false);
-		AbstractScriptGenerator.setEmbeddedSource(fInfo.exportSource);		
-	}
-	
-	protected State getState(String os, String ws, String arch) {
-		State main = TargetPlatform.getState();
-		if (os.equals(TargetPlatform.getOS()) 
-				&& ws.equals(TargetPlatform.getWS())
-				&& arch.equals(TargetPlatform.getOSArch())) {
-			return main;
-		} 			
-		if (fStateCopy == null) {
-			fStateCopy = main.getFactory().createState(main);
-			fStateCopy.setResolver(Platform.getPlatformAdmin().getResolver());
-			fStateCopy.setPlatformProperties(main.getPlatformProperties()[0]);
-		}
-			
-		Dictionary properties = fStateCopy.getPlatformProperties()[0];
-		properties.put("osgi.os", os); //$NON-NLS-1$
-		properties.put("osgi.ws", ws); //$NON-NLS-1$
-		properties.put("osgi.arch", arch); //$NON-NLS-1$
-		fStateCopy.setPlatformProperties(properties);
-		fStateCopy.resolve(false);
-		return fStateCopy;
-	}
-	
-	private String getDevProperties() {
-		if (fDevProperties == null) {
-			fDevProperties = ClasspathHelper.getDevEntriesProperties(fBuildTempLocation + "/dev.properties", false); //$NON-NLS-1$
-		}
-		return fDevProperties;
-	}
-
-	protected void runScript(String location, String[] targets, Map properties, IProgressMonitor monitor) throws InvocationTargetException, CoreException {
-		AntRunner runner = new AntRunner();
-		runner.addUserProperties(properties);
-		runner.setAntHome(location);
-		runner.setBuildFileLocation(location);
-		runner.addBuildListener("org.eclipse.pde.internal.ui.ant.ExportBuildListener"); //$NON-NLS-1$
-		runner.setExecutionTargets(targets);
-		if (fInfo.signingInfo != null) {
-			AntCorePreferences preferences = AntCorePlugin.getPlugin().getPreferences();
-			IAntClasspathEntry entry = preferences.getToolsJarEntry();
-			if (entry != null) {
-				IAntClasspathEntry[] classpath = preferences.getAntHomeClasspathEntries();
-				URL[] urls = new URL[classpath.length + 2];
-				for (int i = 0; i < classpath.length; i++) {
-					urls[i] = classpath[i].getEntryURL();
-				}
-				IPath path = new Path(entry.getEntryURL().toString()).removeLastSegments(2);
-				path = path.append("bin"); //$NON-NLS-1$
-				try {
-					urls[classpath.length] = new URL(path.toString());
-				} catch (MalformedURLException e) {
-					urls[classpath.length] = entry.getEntryURL();
-				} finally {
-					urls[classpath.length + 1] = entry.getEntryURL();
-				}
-				runner.setCustomClasspath(urls);
-			}
-		}
-		runner.run(monitor);
-	}
-
-	private String getBuildScriptName(String featureLocation) {
-		return featureLocation + IPath.SEPARATOR + "build.xml"; //$NON-NLS-1$
-	}
-
-	protected String getAssemblyScriptName(String featureID, String os, String ws, String arch, String featureLocation) {
-		return featureLocation + IPath.SEPARATOR + "assemble." //$NON-NLS-1$
-				+ featureID + "." + os + "." //$NON-NLS-1$ //$NON-NLS-2$
-				+ ws + "." + arch //$NON-NLS-1$
-				+ ".xml"; //$NON-NLS-1$
-	}
-
-	private String[] getBuildExecutionTargets() {
-		if (fInfo.exportSource)
-			return new String[] {"build.jars", "build.sources"}; //$NON-NLS-1$ //$NON-NLS-2$ 
-		return new String[] {"build.jars"}; //$NON-NLS-1$ 
-	}
-
-	public void deleteBuildFiles(Object object) throws CoreException {
-		IModel model = null;
-		if (object instanceof BundleDescription) {
-			model = PDECore.getDefault().getModelManager().findModel((BundleDescription)object);
-		} else if (object instanceof IModel){
-			model = (IModel)object;
-		}
-		
-		if (model == null)
-			return;
-
-		if (model.getUnderlyingResource() != null && !isCustomBuild(model)) {
-			String directory = (model instanceof IFeatureModel) ? ((IFeatureModel) model).getInstallLocation() : ((IPluginModelBase) model).getInstallLocation();
-			File dir = new File(directory);
-			File[] children = dir.listFiles();
-			if (children != null) {
-				for (int i = 0; i < children.length; i++) {
-					if (!children[i].isDirectory()) {
-						String filename = children[i].getName();
-						if (filename.equals("build.xml") || //$NON-NLS-1$
-								(filename.startsWith("assemble.") && filename.endsWith(".xml")) //$NON-NLS-1$ //$NON-NLS-2$
-								|| (filename.startsWith("package.") && filename.endsWith(".xml")) //$NON-NLS-1$ //$NON-NLS-2$
-								|| filename.equals(FEATURE_POST_PROCESSING)
-								|| filename.equals(PLUGIN_POST_PROCESSING)) {
-								children[i].delete();
-						}
-					} else if (children[i].getName().equals("temp.folder")) { //$NON-NLS-1$
-						CoreUtility.deleteContent(children[i]);
-					}
-				}
-			}
-		}
-
-		if (model instanceof IFeatureModel) {
-			IFeature feature = ((IFeatureModel) model).getFeature();
-			IFeatureChild[] children = feature.getIncludedFeatures();
-			for (int i = 0; i < children.length; i++) {
-				IFeature ref = ((FeatureChild) children[i]).getReferencedFeature();
-				if (ref != null) {
-					deleteBuildFiles(ref.getModel());
-				}
-			}
-
-			IFeaturePlugin[] plugins = feature.getPlugins();
-			PluginModelManager manager = PDECore.getDefault().getModelManager();
-			for (int i = 0; i < plugins.length; i++) {
-				ModelEntry entry = manager.findEntry(plugins[i].getId());
-				if (entry != null) {
-					deleteBuildFiles(entry.getActiveModel());
-				}
-			}
-		}
-	}
-
-	protected boolean isCustomBuild(IModel model) throws CoreException {
-		IBuildModel buildModel = null;
-		IFile buildFile = model.getUnderlyingResource().getProject().getFile("build.properties"); //$NON-NLS-1$
-		if (buildFile.exists()) {
-			buildModel = new WorkspaceBuildModel(buildFile);
-			buildModel.load();
-		}
-		if (buildModel != null) {
-			IBuild build = buildModel.getBuild();
-			if (build == null)
-				return false;
-			IBuildEntry entry = build.getEntry("custom"); //$NON-NLS-1$
-			if (entry != null) {
-				String[] tokens = entry.getTokens();
-				for (int i = 0; i < tokens.length; i++) {
-					if (tokens[i].equals("true")) //$NON-NLS-1$
-						return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	protected String[] getPaths() {
-		return TargetPlatform.getFeaturePaths();
-	}
-	
-	protected void cleanup(String[] config, IProgressMonitor monitor) {
-        monitor.beginTask("", 2); //$NON-NLS-1$
-        // clear out some cached values that depend on the configuration being built.
-        fDevProperties = null;
-        fAntBuildProperties = null;
-
-		File scriptFile = null;
-		try {
-			scriptFile = createScriptFile("zip.xml"); //$NON-NLS-1$
-			DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-			Document doc = factory.newDocumentBuilder().newDocument();
-			
-			Element root = doc.createElement("project"); //$NON-NLS-1$
-			root.setAttribute("name", "temp"); //$NON-NLS-1$ //$NON-NLS-2$
-			root.setAttribute("default", "clean"); //$NON-NLS-1$ //$NON-NLS-2$
-			root.setAttribute("basedir", "."); //$NON-NLS-1$ //$NON-NLS-2$
-			doc.appendChild(root);
-			
-			Element target = doc.createElement("target"); //$NON-NLS-1$
-			target.setAttribute("name", "clean"); //$NON-NLS-1$ //$NON-NLS-2$
-			Element child = doc.createElement("delete"); //$NON-NLS-1$
-			child.setAttribute("dir", fBuildTempLocation); //$NON-NLS-1$
-			target.appendChild(child);
-			root.appendChild(target);
-							
-			if (fHasErrors) {
-				target = doc.createElement("target"); //$NON-NLS-1$
-				target.setAttribute("name", "zip.logs"); //$NON-NLS-1$ //$NON-NLS-2$
-				child = doc.createElement("zip"); //$NON-NLS-1$
-				child.setAttribute("zipfile", fInfo.destinationDirectory + logName(config)); //$NON-NLS-1$
-				child.setAttribute("basedir", fBuildTempLocation + "/pde.logs"); //$NON-NLS-1$ //$NON-NLS-2$
-				target.appendChild(child);
-				root.appendChild(target);
-			}	
-			XMLPrintHandler.writeFile(doc, scriptFile);
-			
-			String[] targets = fHasErrors 
-						? new String[] {"zip.logs", "clean"}  //$NON-NLS-1$ //$NON-NLS-2$
-						: new String[] {"clean"}; //$NON-NLS-1$
-			AntRunner runner = new AntRunner();
-			runner.setBuildFileLocation(scriptFile.getAbsolutePath());
-			runner.setExecutionTargets(targets);
-			runner.run(new SubProgressMonitor(monitor, 1));
-		} catch (FactoryConfigurationError e) {
-		} catch (ParserConfigurationException e) {
-		} catch (CoreException e) {
-		} catch (IOException e) {
-		} finally {
-			if (scriptFile != null && scriptFile.exists())
-				scriptFile.delete();
-			monitor.done();
-		}
-	}
-
-	protected File createScriptFile(String filename) throws IOException {
-		String path = PDEPlugin.getDefault().getStateLocation().toOSString();
-		File zip = new File(path, filename); 
-		if (zip.exists()) {
-			zip.delete();
-			zip.createNewFile();
-		}
-		return zip;
-	}
-
-	private String logName(String[] config) {
-		if (config == null)
-			return "/logs.zip"; //$NON-NLS-1$
-		return "/logs." + config[0] + '.' + config[1] + '.' + config[2] + ".zip";  //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * 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;
-	}
-
-	private void asyncNotifyExportException(String errorMessage) {
-		getStandardDisplay().beep();
-		MessageDialog.openError(PDEPlugin.getActiveWorkbenchShell(), PDEUIMessages.FeatureExportJob_error, errorMessage); 
-		done(new Status(IStatus.OK, PDEPlugin.getPluginId(), IStatus.OK, "", null)); //$NON-NLS-1$
-	}
-
-	protected String getLogFoundMessage() {
-		return NLS.bind(PDEUIMessages.ExportJob_error_message, fInfo.destinationDirectory); 
-	}
-    
-    protected void createFeature(String featureID, String featureLocation, String[] config, boolean includeLauncher) throws IOException {
-        File file = new File(featureLocation);
-        if (!file.exists() || !file.isDirectory())
-            file.mkdirs();
-        
-		try {
-			DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-			Document doc = factory.newDocumentBuilder().newDocument();
-			Element root = doc.createElement("feature"); //$NON-NLS-1$
-			root.setAttribute("id", featureID); //$NON-NLS-1$
-			root.setAttribute("version", "1.0"); //$NON-NLS-1$ //$NON-NLS-2$
-			doc.appendChild(root);
-			
-			if (includeLauncher) {
-				IFeatureModel model = PDECore.getDefault().getFeatureModelManager().findFeatureModel("org.eclipse.platform.launchers"); //$NON-NLS-1$
-				if (model != null) {
-					IFeature feature = model.getFeature();
-					Element includes = doc.createElement("includes"); //$NON-NLS-1$
-					includes.setAttribute("id", feature.getId()); //$NON-NLS-1$
-					includes.setAttribute("version", feature.getVersion()); //$NON-NLS-1$
-					root.appendChild(includes);
-				}
-			}
-            Dictionary environment = new Hashtable(4);
-            environment.put("osgi.os", config[0]); //$NON-NLS-1$
-            environment.put("osgi.ws", config[1]); //$NON-NLS-1$
-            environment.put("osgi.arch", config[2]); //$NON-NLS-1$
-            environment.put("osgi.nl", config[3]); //$NON-NLS-1$
-
-            BundleContext context = PDEPlugin.getDefault().getBundleContext();
-            for (int i = 0; i < fInfo.items.length; i++) {
-            	if (fInfo.items[i] instanceof IFeatureModel) {
-                    IFeature feature = ((IFeatureModel) fInfo.items[i]).getFeature();
-  					Element includes = doc.createElement("includes"); //$NON-NLS-1$
- 					includes.setAttribute("id", feature.getId()); //$NON-NLS-1$
- 					includes.setAttribute("version", feature.getVersion()); //$NON-NLS-1$
- 					root.appendChild(includes);
-                } else {
-	            	BundleDescription bundle = null;
-	                if (fInfo.items[i] instanceof IPluginModelBase) {
-	                	bundle = ((IPluginModelBase)fInfo.items[i]).getBundleDescription();
-	                }
-	                if (bundle == null) {
-	                	if (fInfo.items[i] instanceof BundleDescription)
-	                		bundle = (BundleDescription)fInfo.items[i];
-	                }
-	                if (bundle == null)
-	                	continue;
-                    try {
-                        String filterSpec = bundle.getPlatformFilter();
-                        if (filterSpec == null|| context.createFilter(filterSpec).match(environment)) {
-                        	Element plugin = doc.createElement("plugin"); //$NON-NLS-1$
-                        	plugin.setAttribute("id", bundle.getSymbolicName()); //$NON-NLS-1$
-                            plugin.setAttribute("version", "0.0.0"); //$NON-NLS-1$ //$NON-NLS-2$
-                            if (!fInfo.useJarFormat) {
-                                plugin.setAttribute("unpack", Boolean.toString(isUnpack(bundle))); //$NON-NLS-1$
-                             }
-                            root.appendChild(plugin);
-                         }
-                    } catch (InvalidSyntaxException e) {
-                    }
-                }
-            }
-            XMLPrintHandler.writeFile(doc, new File(file, "feature.xml")); //$NON-NLS-1$
- 		} catch (DOMException e1) {
-		} catch (FactoryConfigurationError e1) {
-		} catch (ParserConfigurationException e1) {
-		}      	
-    }
-    
-    protected boolean isUnpack(BundleDescription bundle){
-    	return CoreUtility.guessUnpack(bundle);
-    }
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/PluginExportJob.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/PluginExportJob.java
deleted file mode 100644
index 9319391..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/PluginExportJob.java
+++ /dev/null

@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.build;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Properties;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.osgi.service.resolver.BundleDescription;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.TargetPlatform;
-
-public class PluginExportJob extends FeatureExportJob {
-
-	private String fFeatureLocation;
-
-	public PluginExportJob(FeatureExportInfo info) {
-		super(info);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.exports.FeatureExportJob#doExports(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void doExports(IProgressMonitor monitor)
-			throws InvocationTargetException, CoreException {
-		try {
-            monitor.beginTask("", 10); //$NON-NLS-1$
-			// create a feature to contain all plug-ins
-			String featureID = "org.eclipse.pde.container.feature"; //$NON-NLS-1$
-			fFeatureLocation = fBuildTempLocation + File.separator + featureID;
-			String[] config = new String[] {TargetPlatform.getOS(), TargetPlatform.getWS(), TargetPlatform.getOSArch(), TargetPlatform.getNL() };
-			createFeature(featureID, fFeatureLocation, config, false);
-			createBuildPropertiesFile(fFeatureLocation);
-			if (fInfo.useJarFormat)
-				createPostProcessingFile(new File(fFeatureLocation, PLUGIN_POST_PROCESSING));
-			doExport(featureID, null, fFeatureLocation, TargetPlatform.getOS(), TargetPlatform.getWS(), TargetPlatform.getOSArch(), 
-                    new SubProgressMonitor(monitor, 7));
-		} catch (IOException e) {
-		} finally {
-			for (int i = 0; i < fInfo.items.length; i++) {
-				if (fInfo.items[i] instanceof IPluginModelBase)
-					deleteBuildFiles(fInfo.items[i]);
-			}
-			cleanup(null, new SubProgressMonitor(monitor, 3));
-			monitor.done();
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.exports.FeatureExportJob#getPaths()
-	 */
-	protected String[] getPaths() {
-		String[] paths =  super.getPaths();
-		String[] all = new String[paths.length + 1];
-		all[0] = fFeatureLocation + File.separator + "feature.xml"; //$NON-NLS-1$
-		System.arraycopy(paths, 0, all, 1, paths.length);
-		return all;
-	}
-	
-	private void createBuildPropertiesFile(String featureLocation) {
-		File file = new File(featureLocation);
-		if (!file.exists() || !file.isDirectory())
-			file.mkdirs();
-		Properties prop = new Properties();
-		prop.put("pde", "marker"); //$NON-NLS-1$ //$NON-NLS-2$
-		save(new File(file, "build.properties"),prop, "Marker File");  //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	private void save(File file, Properties properties, String header) {
-		try {
-			FileOutputStream stream = new FileOutputStream(file);
-			properties.store(stream, header); 
-			stream.flush();
-			stream.close();
-		} catch (IOException e) {
-			PDECore.logException(e);
-		}
-	}
-    protected boolean isUnpack(BundleDescription bundle) {
-		if (fInfo.items.length <= 1) {
-			return !fInfo.useJarFormat;
-		}
-		return super.isUnpack(bundle);
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/ProductExportJob.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/ProductExportJob.java
deleted file mode 100644
index 58772cc..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/ProductExportJob.java
+++ /dev/null

@@ -1,535 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.build;
-
-import java.io.*;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
-import java.util.*;
-import javax.xml.parsers.*;
-import org.eclipse.ant.core.AntRunner;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.*;
-import org.eclipse.osgi.framework.adaptor.core.AbstractFrameworkAdaptor;
-import org.eclipse.osgi.service.resolver.BundleDescription;
-import org.eclipse.osgi.service.resolver.State;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.build.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.core.iproduct.*;
-import org.eclipse.pde.internal.core.iproduct.IProduct;
-import org.eclipse.pde.internal.core.util.CoreUtility;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class ProductExportJob extends FeatureExportJob {
-	
-	private String fFeatureLocation;
-
-	private String fRoot;
-	
-	private IProduct fProduct;
-	
-	public ProductExportJob(FeatureExportInfo info, IProductModel model, String productRoot) {
-		super(info);
-		fProduct = model.getProduct();
-		fRoot = productRoot;
-	}
-
-	protected void doExports(IProgressMonitor monitor)
-			throws InvocationTargetException, CoreException {
-		String[][] configurations = fInfo.targets;
-		if (configurations == null)
-			configurations = new String[][] { {TargetPlatform.getOS(), TargetPlatform.getWS(), TargetPlatform.getOSArch(), TargetPlatform.getNL() } };
-        monitor.beginTask("", 10 * configurations.length); //$NON-NLS-1$
-		for (int i = 0; i < configurations.length; i++) {
-			try {
-				String[] config = configurations[i];
-				if (config[0].equals("macosx") && fInfo.targets == null) //$NON-NLS-1$
-					createMacScript(config, new SubProgressMonitor(monitor, 1));
-				// create a feature to wrap all plug-ins and features
-				String featureID = "org.eclipse.pde.container.feature"; //$NON-NLS-1$
-				fFeatureLocation = fBuildTempLocation + File.separator + featureID;
-				createFeature(featureID, fFeatureLocation, config, true);
-				createBuildPropertiesFile(fFeatureLocation);
-				createConfigIniFile(config);
-				createEclipseProductFile();
-				createLauncherIniFile(config[0]);
-				doExport(featureID, 
-	                        null, 
-	                        fFeatureLocation, 
-	                        config[0], 
-	                        config[1], 
-	                        config[2], 
-	                        new SubProgressMonitor(monitor, 8));
-			} catch (IOException e) {
-			} finally {
-				for (int j = 0; j < fInfo.items.length; j++) {
-					deleteBuildFiles(fInfo.items[j]);
-				}
-				cleanup(fInfo.targets == null ? null : configurations[i], new SubProgressMonitor(monitor, 1));
-			}
-		}
-		monitor.done();
-	}
-	
-	private File getCustomIniFile() {
-		IConfigurationFileInfo info = fProduct.getConfigurationFileInfo();
-		if (info != null  && info.getUse().equals("custom")) { //$NON-NLS-1$
-			String path = getExpandedPath(info.getPath());
-			if (path != null) {
-				File file = new File(path);
-				if (file.exists() && file.isFile())
-					return file;
-			}
-		}
-		return null;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.wizards.exports.FeatureExportJob#getPaths()
-	 */
-	protected String[] getPaths() {
-		String[] paths = super.getPaths();
-		String[] all = new String[paths.length + 1];
-		all[0] = fFeatureLocation + File.separator + "feature.xml"; //$NON-NLS-1$
-		System.arraycopy(paths, 0, all, 1, paths.length);
-		return all;
-	}
-
-	private void createBuildPropertiesFile(String featureLocation) {
-		File file = new File(featureLocation);
-		if (!file.exists() || !file.isDirectory())
-			file.mkdirs();
-		
-		boolean hasLaunchers = PDECore.getDefault().getFeatureModelManager().findFeatureModel("org.eclipse.platform.launchers") != null; //$NON-NLS-1$
-		Properties properties = new Properties();
-		properties.put(IBuildPropertiesConstants.ROOT, getRootFileLocations(hasLaunchers)); //To copy a folder
-		if (!hasLaunchers) {
-			properties.put("root.permissions.755", getLauncherName()); //$NON-NLS-1$
-			if (TargetPlatform.getWS().equals("motif") && TargetPlatform.getOS().equals("linux")) { //$NON-NLS-1$ //$NON-NLS-2$
-				properties.put("root.linux.motif.x86.permissions.755", "libXm.so.2"); //$NON-NLS-1$ //$NON-NLS-2$
-			} else if (TargetPlatform.getOS().equals("macosx")) { //$NON-NLS-1$
-				properties.put(
-						"root.macosx.carbon.ppc.permissions.755" ,  //$NON-NLS-1$
-						"${launcherName}.app/Contents/MacOS/${launcherName}"); //$NON-NLS-1$
-			}
-		}
-		save(new File(file, "build.properties"), properties, "Build Configuration"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	private String getRootFileLocations(boolean hasLaunchers) {
-		StringBuffer buffer = new StringBuffer();
-
-		File homeDir = ExternalModelManager.getEclipseHome().toFile();
-		if (!hasLaunchers) {
-			if (homeDir.exists() && homeDir.isDirectory()) {
-				buffer.append("absolute:file:"); //$NON-NLS-1$
-				buffer.append(new File(homeDir, "startup.jar").getAbsolutePath()); //$NON-NLS-1$
-				if (!TargetPlatform.getOS().equals("macosx")) { //$NON-NLS-1$
-					File file = new File(homeDir, "eclipse"); //$NON-NLS-1$
-					if (file.exists()) {
-						buffer.append(",absolute:file:"); //$NON-NLS-1$
-						buffer.append(file.getAbsolutePath()); 
-					}				
-					file = new File(homeDir, "eclipse.exe"); //$NON-NLS-1$
-					if (file.exists()) {
-						buffer.append(",absolute:file:"); //$NON-NLS-1$
-						buffer.append(file.getAbsolutePath()); 
-					}
-					file = new File(homeDir, "libXm.so.2"); //$NON-NLS-1$
-					if (file.exists()) {
-						buffer.append(",absolute:file:"); //$NON-NLS-1$
-						buffer.append(file.getAbsolutePath()); 
-					}
-				}
-			}	
-		}
-		// add content of temp folder (.eclipseproduct, configuration/config.ini)
-		if (buffer.length() > 0)
-			buffer.append(","); //$NON-NLS-1$
-		buffer.append("/temp/"); //$NON-NLS-1$
-		return buffer.toString();
-	}
-	
-	private void createEclipseProductFile() {
-		File dir = new File(fFeatureLocation, "temp"); //$NON-NLS-1$
-		if (!dir.exists() || !dir.isDirectory())
-			dir.mkdirs();
-		Properties properties = new Properties();
-		properties.put("name", fProduct.getName()); //$NON-NLS-1$
-		properties.put("id", fProduct.getId());		 //$NON-NLS-1$
-		IPluginModelBase model = PDECore.getDefault().getModelManager().findModel(getBrandingPlugin());
-		if (model != null)
-			properties.put("version", model.getPluginBase().getVersion()); //$NON-NLS-1$
-		save(new File(dir, ".eclipseproduct"), properties, "Eclipse Product File"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	private void createLauncherIniFile(String os) {
-		String programArgs = getProgramArguments();
-		String vmArgs = getVMArguments();
-		
-		if (programArgs.length() == 0 && vmArgs.length() == 0)
-			return;
-		
-		File dir = new File(fFeatureLocation, "temp"); //$NON-NLS-1$
-		if (!dir.exists() || !dir.isDirectory())
-			dir.mkdirs();
-		
-		String lineDelimiter = Platform.OS_WIN32.equals(os)?"\r\n":"\n"; //$NON-NLS-1$ //$NON-NLS-2$
-		
-		PrintWriter writer = null;
-		try {
-			writer = new PrintWriter(new FileWriter(new File(dir, getLauncherName() + ".ini"))); //$NON-NLS-1$
-			if (programArgs.length() > 0) {
-				StringTokenizer tokenizer = new StringTokenizer(programArgs);
-				while (tokenizer.hasMoreTokens()){
-					writer.print(tokenizer.nextToken());
-					writer.print(lineDelimiter);
-				}
-			}
-			if (vmArgs.length() > 0) {
-				writer.print("-vmargs"); //$NON-NLS-1$
-				writer.print(lineDelimiter);
-				StringTokenizer tokenizer = new StringTokenizer(vmArgs);
-				while (tokenizer.hasMoreTokens()){
-					writer.print(tokenizer.nextToken());
-					writer.print(lineDelimiter);
-				}
-
-			}	
-		} catch (IOException e) {
-		} finally {
-			if (writer != null) {
-				writer.close();
-			}			
-		}
-	}
-
-	private String getProgramArguments() {
-		IArgumentsInfo info = fProduct.getLauncherArguments();
-		return (info != null) ? CoreUtility.normalize(info.getProgramArguments()) : ""; //$NON-NLS-1$
-	}
-	
-	private String getVMArguments() {
-		IArgumentsInfo info = fProduct.getLauncherArguments();
-		return (info != null) ? CoreUtility.normalize(info.getVMArguments()) : ""; //$NON-NLS-1$
-	}	
-	
-	
-	private void createConfigIniFile(String[] config) {
-		File dir = new File(fFeatureLocation, "temp/configuration"); //$NON-NLS-1$
-		if (!dir.exists() || !dir.isDirectory())
-			dir.mkdirs();
-
-        PrintWriter writer = null;
-
-        File custom = getCustomIniFile();       
-		if (custom != null) {
-			String path = getExpandedPath(fProduct.getConfigurationFileInfo().getPath());
-			BufferedReader in = null;
-			try {
-                in = new BufferedReader(new FileReader(path));
-                writer = new PrintWriter(new FileWriter(new File(dir, "config.ini"))); //$NON-NLS-1$
-                String line;
-                while ((line = in.readLine()) != null) {
-                    writer.println(line);
-                }
-			} catch (IOException e) {
-			} finally {
-				try {
-					if (in != null)
-						in.close();
-                    if (writer != null)
-                        writer.close();
-				} catch (IOException e) {
-				}
-			}
-            return;
-		} 
-        try {
-            writer = new PrintWriter(new FileWriter(new File(dir, "config.ini"))); //$NON-NLS-1$
-            String location = getSplashLocation(config[0], config[1], config[2]);
-            writer.println("#Product Runtime Configuration File"); //$NON-NLS-1$
-            writer.println();
-            if (location != null)
-            	writer.println("osgi.splashPath=" + location); //$NON-NLS-1$
-            writer.println("eclipse.product=" + fProduct.getId()); //$NON-NLS-1$
-            if (fProduct.useFeatures() || fProduct.containsPlugin("org.eclipse.update.configurator")) { //$NON-NLS-1$
-                writer.println("osgi.bundles=" +  "org.eclipse.core.runtime@2:start,org.eclipse.update.configurator@3:start"); //$NON-NLS-1$ //$NON-NLS-2$
-            } else {
-                writer.println("osgi.bundles=" + getPluginList(config)); //$NON-NLS-1$
-            }
-            writer.println("osgi.bundles.defaultStartLevel=4"); //$NON-NLS-1$ 		
-        } catch (IOException e) {
-        } finally {
-            if (writer != null)
-                writer.close();
-        }
-	}
-	
-	private String getSplashLocation(String os, String ws, String arch) {
-		ISplashInfo info = fProduct.getSplashInfo();
-		String plugin = null;
-		if (info != null) {
-			plugin = info.getLocation();
-		}
-		if (plugin == null)
-			plugin = getBrandingPlugin();
-		
-		if (plugin == null)
-			return null;
-		
-		StringBuffer buffer = new StringBuffer("platform:/base/plugins/"); //$NON-NLS-1$
-		buffer.append(plugin);
-		
-		State state = getState(os, ws, arch);
-		BundleDescription bundle = state.getBundle(plugin, null);
-		if (bundle != null) {
-			BundleDescription[] fragments = bundle.getFragments();
-			for (int i = 0; i < fragments.length; i++) {
-				String id = fragments[i].getSymbolicName();
-				if (fProduct.containsPlugin(id)) {
-					buffer.append(",platform:/base/plugins/"); //$NON-NLS-1$
-					buffer.append(id);
-				}
-			}
-		}	
-		return buffer.toString();
-	}
-	
-	private String getBrandingPlugin() {
-		int dot = fProduct.getId().lastIndexOf('.');
-		return (dot != -1) ? fProduct.getId().substring(0, dot) : null;
-	}
-	
-	private String getPluginList(String[] config) {
-		StringBuffer buffer = new StringBuffer();
-		
-        Dictionary environment = new Hashtable(4);
-        environment.put("osgi.os", config[0]); //$NON-NLS-1$
-        environment.put("osgi.ws", config[1]); //$NON-NLS-1$
-        environment.put("osgi.arch", config[2]); //$NON-NLS-1$
-        environment.put("osgi.nl", config[3]); //$NON-NLS-1$
-
-        BundleContext context = PDEPlugin.getDefault().getBundleContext();
-
-		for (int i = 0; i < fInfo.items.length; i++) {
-			BundleDescription bundle = (BundleDescription)fInfo.items[i];
-            String filterSpec = bundle.getPlatformFilter();
-            try {
-				if (filterSpec == null|| context.createFilter(filterSpec).match(environment)) {			
-					String id = ((BundleDescription)fInfo.items[i]).getSymbolicName();				
-					if ("org.eclipse.osgi".equals(id)) //$NON-NLS-1$
-						continue;
-					if (buffer.length() > 0)
-						buffer.append(","); //$NON-NLS-1$
-					buffer.append(id);
-					if ("org.eclipse.core.runtime".equals(id)) //$NON-NLS-1$
-						buffer.append("@2:start"); //$NON-NLS-1$
-				}
-			} catch (InvalidSyntaxException e) {
-			}
-		}
-		return buffer.toString();
-	}
-	
-	protected HashMap createAntBuildProperties(String os, String ws, String arch) {
-		HashMap properties = super.createAntBuildProperties(os, ws, arch);
-		properties.put(IXMLConstants.PROPERTY_LAUNCHER_NAME, getLauncherName());
-		
-		ILauncherInfo info = fProduct.getLauncherInfo();	
-		if (info != null) {
-			String images = null;
-			if (os.equals("win32")) { //$NON-NLS-1$
-				images = getWin32Images(info);
-			} else if (os.equals("solaris")) { //$NON-NLS-1$
-				images = getSolarisImages(info);
-			} else if (os.equals("linux")) { //$NON-NLS-1$
-				images = getExpandedPath(info.getIconPath(ILauncherInfo.LINUX_ICON));
-			} else if (os.equals("macosx")) { //$NON-NLS-1$
-				images = getExpandedPath(info.getIconPath(ILauncherInfo.MACOSX_ICON));
-			}
-			if (images != null && images.length() > 0)
-				properties.put(IXMLConstants.PROPERTY_LAUNCHER_ICONS, images);
-		}
-		
-		fAntBuildProperties.put(IXMLConstants.PROPERTY_COLLECTING_FOLDER, fRoot); 
-		fAntBuildProperties.put(IXMLConstants.PROPERTY_ARCHIVE_PREFIX, fRoot); 
-		return properties;
-	}
-	
-	private String getLauncherName() {
-		ILauncherInfo info = fProduct.getLauncherInfo();	
-		if (info != null) {
-			String name = info.getLauncherName();
-			if (name != null && name.length() > 0) {
-				name = name.trim();
-				if (name.endsWith(".exe")) //$NON-NLS-1$
-					name = name.substring(0, name.length() - 4);
-				return name;
-			}
-		}
-		return "eclipse";	 //$NON-NLS-1$
-	}
-	
-	private String getWin32Images(ILauncherInfo info) {
-		StringBuffer buffer = new StringBuffer();
-		if (info.usesWinIcoFile()) {
-			append(buffer, info.getIconPath(ILauncherInfo.P_ICO_PATH));
-		} else {
-			append(buffer, info.getIconPath(ILauncherInfo.WIN32_16_HIGH));
-			append(buffer, info.getIconPath(ILauncherInfo.WIN32_16_LOW));
-			append(buffer, info.getIconPath(ILauncherInfo.WIN32_32_HIGH));
-			append(buffer, info.getIconPath(ILauncherInfo.WIN32_32_LOW));
-			append(buffer, info.getIconPath(ILauncherInfo.WIN32_48_HIGH));
-			append(buffer, info.getIconPath(ILauncherInfo.WIN32_48_LOW));
-		}
-		return buffer.length() > 0 ? buffer.toString() : null;
-	}
-	
-	private String getSolarisImages(ILauncherInfo info) {
-		StringBuffer buffer = new StringBuffer();
-		append(buffer, info.getIconPath(ILauncherInfo.SOLARIS_LARGE));
-		append(buffer, info.getIconPath(ILauncherInfo.SOLARIS_MEDIUM));
-		append(buffer, info.getIconPath(ILauncherInfo.SOLARIS_SMALL));
-		append(buffer, info.getIconPath(ILauncherInfo.SOLARIS_TINY));
-		return buffer.length() > 0 ? buffer.toString() : null;
-	}
-	
-	private void append(StringBuffer buffer, String path) {
-		path = getExpandedPath(path);
-		if (path != null) {
-			if (buffer.length() > 0)
-				buffer.append(","); //$NON-NLS-1$
-			buffer.append(path);
-		}
-	}
-	
-	private String getExpandedPath(String path) {
-		if (path == null || path.length() == 0)
-			return null;
-		IResource resource = PDEPlugin.getWorkspace().getRoot().findMember(new Path(path));
-		if (resource != null) {
-			IPath fullPath = resource.getLocation();
-			return fullPath == null ? null : fullPath.toOSString();
-		}
-		return null;
-	}
-	
-	private void save(File file, Properties properties, String header) {
-		try {
-			FileOutputStream stream = new FileOutputStream(file);
-			properties.store(stream, header); 
-			stream.flush();
-			stream.close();
-		} catch (IOException e) {
-			PDECore.logException(e);
-		}
-	}
-	
-	protected void setupGenerator(BuildScriptGenerator generator, String featureID, String versionId, String os, String ws, String arch, String featureLocation) throws CoreException {
-		super.setupGenerator(generator, featureID, versionId, os, ws, arch, featureLocation);
-		if (fProduct != null)
-			generator.setProduct(fProduct.getModel().getInstallLocation());
-	}
-	
-	private void createMacScript(String[] config, IProgressMonitor monitor) {
-		URL url = PDEPlugin.getDefault().getBundle().getEntry("macosx/Info.plist");  //$NON-NLS-1$
-		if (url == null)
-			return;
-
-		File scriptFile = null;
-		File plist = null;
-		InputStream in = null;
-		String location = PDEPlugin.getDefault().getStateLocation().toOSString();
-		try {
-			in = url.openStream();
-			File dir = new File(location, "Eclipse.app/Contents"); //$NON-NLS-1$
-			dir.mkdirs();
-			plist = new File(dir, "Info.plist"); //$NON-NLS-1$
-			AbstractFrameworkAdaptor.readFile(in, plist);
-			scriptFile = createScriptFile("macbuild.xml"); //$NON-NLS-1$
-			DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-			Document doc = factory.newDocumentBuilder().newDocument();
-			
-			Element root = doc.createElement("project"); //$NON-NLS-1$
-			root.setAttribute("name", "project"); //$NON-NLS-1$ //$NON-NLS-2$
-			root.setAttribute("default", "default"); //$NON-NLS-1$ //$NON-NLS-2$
-			doc.appendChild(root);
-			
-			Element property = doc.createElement("property"); //$NON-NLS-1$
-			property.setAttribute("name", "eclipse.base"); //$NON-NLS-1$ //$NON-NLS-2$
-			property.setAttribute("value", "${assemblyTempDir}/${collectingFolder}"); //$NON-NLS-1$ //$NON-NLS-2$
-			root.appendChild(property);
-			
-			Element target = doc.createElement("target"); //$NON-NLS-1$
-			target.setAttribute("name", "default"); //$NON-NLS-1$ //$NON-NLS-2$
-			root.appendChild(target);
-			
-			Element copy = doc.createElement("copy"); //$NON-NLS-1$
-			copy.setAttribute("todir", "${eclipse.base}/macosx.carbon.ppc/${collectingFolder}");  //$NON-NLS-1$ //$NON-NLS-2$
-			copy.setAttribute("failonerror", "false"); //$NON-NLS-1$ //$NON-NLS-2$
-			copy.setAttribute("overwrite", "true"); //$NON-NLS-1$ //$NON-NLS-2$
-			target.appendChild(copy);
-			
-			Element fileset = doc.createElement("fileset"); //$NON-NLS-1$
-			fileset.setAttribute("dir", "${installFolder}"); //$NON-NLS-1$ //$NON-NLS-2$
-			fileset.setAttribute("includes", "Eclipse.app/Contents/MacOS/eclipse"); //$NON-NLS-1$ //$NON-NLS-2$
-			copy.appendChild(fileset);
-			
-			fileset = doc.createElement("fileset"); //$NON-NLS-1$
-			fileset.setAttribute("dir", "${template}"); //$NON-NLS-1$ //$NON-NLS-2$
-			fileset.setAttribute("includes", "Eclipse.app/Contents/Info.plist"); //$NON-NLS-1$ //$NON-NLS-2$
-			copy.appendChild(fileset);
-							
-			XMLPrintHandler.writeFile(doc, scriptFile);
-			
-			AntRunner runner = new AntRunner();
-			HashMap map = new HashMap();
-			if (!fInfo.toDirectory) {
-				String filename = fInfo.zipFileName;
-				map.put(IXMLConstants.PROPERTY_ARCHIVE_FULLPATH, fInfo.destinationDirectory + File.separator + filename);
-			} else {
-				map.put(IXMLConstants.PROPERTY_ASSEMBLY_TMP, fInfo.destinationDirectory);
-			}
-			map.put(IXMLConstants.PROPERTY_COLLECTING_FOLDER, fRoot); 
-			map.put("installFolder", ExternalModelManager.getEclipseHome().toOSString()); //$NON-NLS-1$
-			map.put("template", location); //$NON-NLS-1$
-			runner.addUserProperties(map);
-			runner.setBuildFileLocation(scriptFile.getAbsolutePath());
-			runner.setExecutionTargets(new String[] {"default"}); //$NON-NLS-1$
-			runner.run(new SubProgressMonitor(monitor, 1));
-		} catch (FactoryConfigurationError e) {
-		} catch (ParserConfigurationException e) {
-		} catch (CoreException e) {
-		} catch (IOException e) {
-		} finally {
-			try {
-				if (in != null)
-					in.close();
-			} catch (IOException e) {
-			}
-			CoreUtility.deleteContent(new File(location, "Eclipse.app"));		 //$NON-NLS-1$
-			if (scriptFile != null && scriptFile.exists())
-				scriptFile.delete();
-			monitor.done();
-		}	
-	}
-	
-
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/AbstractPDEMarkerResolution.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/AbstractPDEMarkerResolution.java
deleted file mode 100644
index 3c4b82a..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/AbstractPDEMarkerResolution.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.correction;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IMarkerResolution2;
-
-public abstract class AbstractPDEMarkerResolution implements IMarkerResolution2 {
-
-	public static final int CREATE_TYPE = 1;
-	public static final int RENAME_TYPE = 2;
-	public static final int REMOVE_TYPE = 3;
-	
-	protected int fType;
-
-	public AbstractPDEMarkerResolution(int type) {
-		fType = type;
-	}
-	
-	public Image getImage() {
-		return null;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/AddSingleonAttributeTo.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/AddSingleonAttributeTo.java
deleted file mode 100644
index fe7ef46..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/AddSingleonAttributeTo.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.correction;
-
-import org.eclipse.pde.internal.core.ibundle.IBundle;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.model.bundle.Bundle;
-import org.eclipse.pde.internal.ui.model.bundle.BundleModel;
-import org.eclipse.pde.internal.ui.model.bundle.ManifestHeader;
-import org.osgi.framework.Constants;
-
-public class AddSingleonAttributeTo extends ManifestHeaderErrorResolution {
-
-	public AddSingleonAttributeTo(int type) {
-		super(type);
-	}
-
-	public String getDescription() {
-		return PDEUIMessages.AddSingleonAttributeTo_desc;
-	}
-
-	public String getLabel() {
-		return PDEUIMessages.AddSingleonAttributeTo_label;
-	}
-
-	protected void createChange(BundleModel model) {
-		IBundle bundle = model.getBundle();
-		if (bundle instanceof Bundle) {
-			Bundle bun = (Bundle)bundle;
-			ManifestHeader header = bun.getManifestHeader(Constants.BUNDLE_SYMBOLICNAME);
-			if (header == null)
-				return;
-			header.setDirective(Constants.SINGLETON_DIRECTIVE, new String[] {Boolean.toString(true)});
-		}
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/BundleTextChangeListener.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/BundleTextChangeListener.java
deleted file mode 100644
index a85b5d6..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/BundleTextChangeListener.java
+++ /dev/null

@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.correction;
-
-import java.util.HashMap;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.ui.model.IDocumentKey;
-import org.eclipse.pde.internal.ui.model.bundle.ManifestHeader;
-import org.eclipse.pde.internal.ui.model.bundle.PackageFriend;
-import org.eclipse.pde.internal.ui.model.bundle.PackageObject;
-import org.eclipse.text.edits.DeleteEdit;
-import org.eclipse.text.edits.InsertEdit;
-import org.eclipse.text.edits.ReplaceEdit;
-import org.eclipse.text.edits.TextEdit;
-
-public class BundleTextChangeListener implements IModelTextChangeListener {
-
-	private HashMap fOperationTable = new HashMap();
-	private IDocument fDocument;
-	
-	public BundleTextChangeListener(IDocument document) {
-		fDocument = document;
-	}
-
-	public void modelChanged(IModelChangedEvent event) {
-		Object[] objects = event.getChangedObjects();
-		if (objects != null) {
-			for (int i = 0; i < objects.length; i++) {
-				Object object = objects[i];
-                if (object instanceof PackageObject)
-                    object = ((PackageObject)object).getHeader();
-                else if (object instanceof PackageFriend)
-                    object = ((PackageFriend)object).getHeader();
-                
-				if (object instanceof ManifestHeader) {
-					ManifestHeader header = (ManifestHeader)object;
-					TextEdit op = (TextEdit)fOperationTable.get(header);
-					if (op != null) {
-						fOperationTable.remove(header);
-					}
-					if (header.getValue() == null || header.getValue().trim().length() == 0) {
-						deleteKey(header);						
-					} else {
-						modifyKey(header);
-					}
-				}
-			}
-		}
-	}
-
-	private void insertKey(IDocumentKey key) {
-		int offset = fDocument.getLength();
-		for (int i = fDocument.getNumberOfLines() - 1; i >= 0; i--) {
-			try {
-				if (fDocument.get(fDocument.getLineOffset(i), fDocument.getLineLength(i)).trim().length() > 0) {
-					break;
-				}
-				offset = fDocument.getLineOffset(i);
-			} catch (BadLocationException e) {
-			}
-		}
-		InsertEdit op = new InsertEdit(offset, key.write()); 
-		fOperationTable.put(key, op);
-	}
-	
-	private void deleteKey(IDocumentKey key) {
-		if (key.getOffset() > 0) {
-			TextEdit op = new DeleteEdit(key.getOffset(), key.getLength());
-			fOperationTable.put(key, op);
-		}
-	}
-	
-	private void modifyKey(IDocumentKey key) {		
-		if (key.getOffset() == -1) {
-			insertKey(key);
-		} else {
-			TextEdit op = new ReplaceEdit(key.getOffset(), key.getLength(), key.write()); 
-			fOperationTable.put(key, op);
-		}	
-	}
-
-	public TextEdit[] getTextOperations() {
-		return (TextEdit[])fOperationTable.values().toArray(new TextEdit[fOperationTable.size()]);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/CreateJREBundleHeaderResolution.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/CreateJREBundleHeaderResolution.java
deleted file mode 100644
index 57cf0e2..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/CreateJREBundleHeaderResolution.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.correction;
-
-import org.eclipse.pde.internal.core.ICoreConstants;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.model.bundle.BundleModel;
-
-public class CreateJREBundleHeaderResolution extends ManifestHeaderErrorResolution {
-
-	public CreateJREBundleHeaderResolution(int type) {
-		super(type);
-	}
-
-	public String getDescription() {
-		return PDEUIMessages.CreateJREBundleHeaderResolution_desc;
-	}
-
-	public String getLabel() {
-		return PDEUIMessages.CreateJREBundleHeaderResolution_label;
-	}
-
-	protected void createChange(BundleModel model) {
-		model.getBundle().setHeader(ICoreConstants.ECLIPSE_JREBUNDLE, Boolean.toString(true));
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/IModelTextChangeListener.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/IModelTextChangeListener.java
deleted file mode 100644
index 31d4552..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/IModelTextChangeListener.java
+++ /dev/null

@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.correction;
-
-import org.eclipse.pde.core.IModelChangedListener;
-import org.eclipse.text.edits.TextEdit;
-
-public interface IModelTextChangeListener extends IModelChangedListener {
-	
-	TextEdit[] getTextOperations();
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/ManifestHeaderErrorResolution.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/ManifestHeaderErrorResolution.java
deleted file mode 100644
index 9c3d9c2..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/ManifestHeaderErrorResolution.java
+++ /dev/null

@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.correction;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.model.bundle.BundleModel;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.text.edits.TextEdit;
-
-public abstract class ManifestHeaderErrorResolution extends AbstractPDEMarkerResolution {	
-	
-	public ManifestHeaderErrorResolution(int type) {
-		super(type);
-	}
-
-	public void run(IMarker marker) {
-		IResource resource = marker.getResource();
-		try {
-			ITextFileBufferManager manager = FileBuffers.getTextFileBufferManager();
-			manager.connect(resource.getFullPath(), null);
-			ITextFileBuffer buffer = manager.getTextFileBuffer(resource.getFullPath());
-			IDocument document = buffer.getDocument();		
-			BundleModel model = new BundleModel(document, false);
-			model.load();
-			if (model.isLoaded()) {
-				IModelTextChangeListener listener = new BundleTextChangeListener(document);
-				model.addModelChangedListener(listener);
-				createChange(model);
-				TextEdit[] edits = listener.getTextOperations();
-				if (edits.length > 0) {
-					MultiTextEdit multi = new MultiTextEdit();
-					multi.addChildren(edits);
-					multi.apply(document);
-					buffer.commit(null, true);
-				}
-			}
-		} catch (CoreException e) {
-			PDEPlugin.log(e);
-		} catch (MalformedTreeException e) {
-			PDEPlugin.log(e);
-		} catch (BadLocationException e) {
-			PDEPlugin.log(e);
-		} finally {
-			try {
-				FileBuffers.getTextFileBufferManager().disconnect(resource.getFullPath(), null);
-			} catch (CoreException e) {
-				PDEPlugin.log(e);
-			}
-		}
-	}
-	
-	protected abstract void createChange(BundleModel model);
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/RenameAutostartResolution.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/RenameAutostartResolution.java
deleted file mode 100644
index 754bdff..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/RenameAutostartResolution.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.correction;
-
-import org.eclipse.pde.internal.core.ICoreConstants;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.model.bundle.BundleModel;
-
-public class RenameAutostartResolution extends ManifestHeaderErrorResolution {
-
-	public RenameAutostartResolution(int type) {
-		super(type);
-	}
-
-	public String getDescription() {
-		return PDEUIMessages.RenameAutostartResolution_desc;
-	}
-
-	public String getLabel() {
-		return PDEUIMessages.RenameAutostartResolution_label;
-	}
-
-	protected void createChange(BundleModel model) {
-		model.getBundle().renameHeader(ICoreConstants.ECLIPSE_AUTOSTART, ICoreConstants.ECLIPSE_LAZYSTART);
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/ResolutionGenerator.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/ResolutionGenerator.java
deleted file mode 100644
index 2363677..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/ResolutionGenerator.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.correction;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.pde.internal.builders.PDEMarkerFactory;
-import org.eclipse.ui.IMarkerResolution;
-import org.eclipse.ui.IMarkerResolutionGenerator2;
-
-public class ResolutionGenerator implements IMarkerResolutionGenerator2 {
-	
-	private static IMarkerResolution[] NO_RESOLUTIONS = new IMarkerResolution[0];
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.IMarkerResolutionGenerator#getResolutions(org.eclipse.core.resources.IMarker)
-	 */
-	public IMarkerResolution[] getResolutions(IMarker marker) {
-		int problemID = marker.getAttribute("id", -1); //$NON-NLS-1$
-		switch (problemID) {
-			case PDEMarkerFactory.DEPRECATED_AUTOSTART:
-				return new IMarkerResolution[] {new RenameAutostartResolution(AbstractPDEMarkerResolution.RENAME_TYPE)};
-			case PDEMarkerFactory.JAVA_PACKAGE__PORTED:
-				return new IMarkerResolution[] {new CreateJREBundleHeaderResolution(AbstractPDEMarkerResolution.CREATE_TYPE)};
-			case PDEMarkerFactory.SINGLETON_NOT_SET:
-				return new IMarkerResolution[] {new AddSingleonAttributeTo(AbstractPDEMarkerResolution.RENAME_TYPE)};
-		}
-		return NO_RESOLUTIONS;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.IMarkerResolutionGenerator2#hasResolutions(org.eclipse.core.resources.IMarker)
-	 */
-	public boolean hasResolutions(IMarker marker) {
-		return marker.getAttribute("id", -1) > 0; //$NON-NLS-1$
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/EmptyOutlinePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/EmptyOutlinePage.java
deleted file mode 100644
index de43a91..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/EmptyOutlinePage.java
+++ /dev/null

@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 28, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.pde.internal.ui.editor;
-
-import org.eclipse.jface.viewers.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.IActionBars;
-
-
-public class EmptyOutlinePage implements ISortableContentOutlinePage {
-	private Composite control;
-	/**
-	 * 
-	 */
-	public EmptyOutlinePage() {
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.IPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		control = new Composite(parent, SWT.NULL);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.IPage#dispose()
-	 */
-	public void dispose() {
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.IPage#getControl()
-	 */
-	public Control getControl() {
-		return control;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.IPage#setActionBars(org.eclipse.ui.IActionBars)
-	 */
-	public void setActionBars(IActionBars actionBars) {
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.IPage#setFocus()
-	 */
-	public void setFocus() {
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
-	 */
-	public void addSelectionChangedListener(ISelectionChangedListener listener) {
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
-	 */
-	public ISelection getSelection() {
-		return new ISelection() { 
-			public boolean isEmpty() { return true; }
-		};
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
-	 */
-	public void removeSelectionChangedListener(
-			ISelectionChangedListener listener) {
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
-	 */
-	public void setSelection(ISelection selection) {
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.ISortable#sort(boolean)
-	 */
-	public void sort(boolean sorting) {
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/FormEntryAdapter.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/FormEntryAdapter.java
deleted file mode 100644
index f3d956d..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/FormEntryAdapter.java
+++ /dev/null

@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 27, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.pde.internal.ui.editor;
-
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.text.*;
-import org.eclipse.pde.internal.ui.parts.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.forms.events.*;
-
-public class FormEntryAdapter implements IFormEntryListener {
-	private IContextPart contextPart;
-	protected IActionBars actionBars;
-
-	public FormEntryAdapter(IContextPart contextPart) {
-		this(contextPart, null);
-	}
-	public FormEntryAdapter(IContextPart contextPart, IActionBars actionBars) {
-		this.contextPart = contextPart;
-		this.actionBars = actionBars;
-	}
-	public void focusGained(FormEntry entry) {
-		ITextSelection selection = new TextSelection(1,1);
-		contextPart.getPage().getPDEEditor().getContributor().updateSelectableActions(selection);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.newparts.IFormEntryListener#textDirty(org.eclipse.pde.internal.ui.newparts.FormEntry)
-	 */
-	public void textDirty(FormEntry entry) {
-		contextPart.fireSaveNeeded();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.newparts.IFormEntryListener#textValueChanged(org.eclipse.pde.internal.ui.newparts.FormEntry)
-	 */
-	public void textValueChanged(FormEntry entry) {
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.newparts.IFormEntryListener#browseButtonSelected(org.eclipse.pde.internal.ui.newparts.FormEntry)
-	 */
-	public void browseButtonSelected(FormEntry entry) {
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.events.HyperlinkListener#linkEntered(org.eclipse.ui.forms.events.HyperlinkEvent)
-	 */
-	public void linkEntered(HyperlinkEvent e) {
-		if (actionBars==null) return;
-		IStatusLineManager mng = actionBars.getStatusLineManager();
-		mng.setMessage(e.getLabel());
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.events.HyperlinkListener#linkExited(org.eclipse.ui.forms.events.HyperlinkEvent)
-	 */
-	public void linkExited(HyperlinkEvent e) {
-		if (actionBars==null) return;
-		IStatusLineManager mng = actionBars.getStatusLineManager();
-		mng.setMessage(null);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.events.HyperlinkListener#linkActivated(org.eclipse.ui.forms.events.HyperlinkEvent)
-	 */
-	public void linkActivated(HyperlinkEvent e) {
-	}
-	public void selectionChanged(FormEntry entry) {
-		ITextSelection selection = new TextSelection(1,1);
-		contextPart.getPage().getPDEEditor().getContributor().updateSelectableActions(selection);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/FormOutlinePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/FormOutlinePage.java
deleted file mode 100644
index 0918bac..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/FormOutlinePage.java
+++ /dev/null

@@ -1,232 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-import java.util.ArrayList;
-
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.internal.core.plugin.ImportObject;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
-import org.eclipse.pde.internal.ui.model.IDocumentNode;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.forms.editor.IFormPage;
-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
-
-public class FormOutlinePage extends ContentOutlinePage
-		implements
-			IModelChangedListener, ISortableContentOutlinePage {
-	private boolean stale;
-	private ViewerSorter fViewerSorter;
-	private boolean sorted;
-	public class BasicContentProvider extends DefaultContentProvider
-			implements
-				ITreeContentProvider {
-		public Object[] getElements(Object obj) {
-			return getPages();
-		}
-		public Object[] getChildren(Object obj) {
-			return FormOutlinePage.this.getChildren(obj);
-		}
-		public boolean hasChildren(Object obj) {
-			return getChildren(obj).length > 0;
-		}
-		public Object getParent(Object obj) {
-			return null;
-		}
-	}
-	public class BasicLabelProvider extends LabelProvider {
-		public String getText(Object obj) {
-			if (obj instanceof IFormPage)
-				return ((IFormPage)obj).getTitle();
-			return PDEPlugin.getDefault().getLabelProvider().getText(obj);
-		}
-		public Image getImage(Object obj) {
-			if (obj instanceof IFormPage)
-				return PDEPlugin.getDefault().getLabelProvider().get(PDEPluginImages.DESC_PAGE_OBJ);
-			return PDEPlugin.getDefault().getLabelProvider().getImage(obj);
-		}
-	}
-	public class BasicSorter extends ViewerSorter {
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ViewerSorter#category(java.lang.Object)
-		 */
-		public int category(Object element) {
-			Object[] pages = getPages();
-			for(int i=0; i<pages.length; i++){
-				if(pages[i]==element){
-					return i;
-				}
-			}
-			return Integer.MAX_VALUE;
-		}
-	}
-	protected TreeViewer treeViewer;
-	protected PDEFormEditor editor;
-	protected boolean editorSelection = false;
-	protected boolean outlineSelection = false;
-	public FormOutlinePage(PDEFormEditor editor) {
-		this.editor = editor;
-	}
-	protected ITreeContentProvider createContentProvider() {
-		return new BasicContentProvider();
-	}
-	protected ViewerSorter createOutlineSorter(){
-		fViewerSorter = new BasicSorter();
-		return fViewerSorter;
-	}
-	public void createControl(Composite parent) {
-		Tree widget = new Tree(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
-		treeViewer = new TreeViewer(widget);
-		treeViewer.addSelectionChangedListener(this);
-		treeViewer.setContentProvider(createContentProvider());
-		treeViewer.setLabelProvider(createLabelProvider());
-		createOutlineSorter();
-		if(sorted)
-			treeViewer.setSorter(fViewerSorter);
-		else
-			treeViewer.setSorter(null);
-		treeViewer.setAutoExpandLevel(TreeViewer.ALL_LEVELS);
-		treeViewer.setUseHashlookup(true);
-		treeViewer.setInput(editor);
-		IBaseModel model = editor.getAggregateModel();
-		if (model instanceof IModelChangeProvider)
-			((IModelChangeProvider)model).addModelChangedListener(this);
-	}
-	protected ILabelProvider createLabelProvider() {
-		return new BasicLabelProvider();
-	}
-	public void dispose() {
-		IBaseModel model = editor.getAggregateModel();
-		if (model instanceof IModelChangeProvider)
-			((IModelChangeProvider)model).removeModelChangedListener(this);
-		super.dispose();
-	}
-	
-	public Control getControl() {
-		return treeViewer != null ? treeViewer.getControl() : null;
-	}
-	private Object[] getPages() {
-		ArrayList formPages = new ArrayList();
-		IFormPage [] pages = editor.getPages();
-		for (int i=0; i<pages.length; i++) {
-			if (pages[i].isEditor()==false)
-				formPages.add(pages[i]);
-		}
-		return formPages.toArray(); 
-	}
-
-	public void modelChanged(IModelChangedEvent event) {
-		IFormPage page = editor.getActivePageInstance();
-		stale=true;
-		if (page.isEditor()==false)
-			refresh();
-	}
-	
-	public void refresh() {
-		if (stale) {
-			treeViewer.refresh();
-			treeViewer.expandAll();
-			stale=false;
-		}
-	}
-	
-	protected String getParentPageId(Object item) {
-		if (item instanceof IFormPage)
-			return ((IFormPage)item).getId();
-		return null;
-	}
-	
-	protected Object[] getChildren(Object parent) {
-		return new Object[0];
-	}
-
-	public void selectionChanged(Object item) {
-		IFormPage page = editor.getActivePageInstance();
-		String id = getParentPageId(item);
-		IFormPage newPage=null;
-		if (id!=null && (page==null || !page.getId().equals(id)))
-			newPage = editor.setActivePage(id);
-		IFormPage revealPage = newPage!=null?newPage:page;
-		if (revealPage!=null && !(item instanceof IFormPage))
-			revealPage.selectReveal(item);
-	}
-	
-	public void selectionChanged(SelectionChangedEvent event) {
-		if (editorSelection)
-			return;
-		outlineSelection = true;
-		try {
-			ISelection selection = event.getSelection();
-			if (selection.isEmpty() == false
-					&& selection instanceof IStructuredSelection) {
-				IStructuredSelection ssel = (IStructuredSelection) selection;
-				Object item = ssel.getFirstElement();
-				selectionChanged(item);
-			}
-			fireSelectionChanged(selection);
-		} finally {
-			outlineSelection = false;
-		}
-	}
-	public void setFocus() {
-		if (treeViewer != null)
-			treeViewer.getTree().setFocus();
-	}
-	public ISelection getSelection() {
-		if (treeViewer == null)
-			return StructuredSelection.EMPTY;
-		return treeViewer.getSelection();
-	}
-	public void sort (boolean sorting){
-		sorted = sorting;
-		if(treeViewer!=null)
-			if(sorting)
-				treeViewer.setSorter(fViewerSorter);
-			else
-				treeViewer.setSorter(null);
-	}
-	/*
-	 * (non-Javadoc) Method declared on ISelectionProvider.
-	 */
-	public void setSelection(ISelection selection) {
-		if (outlineSelection)
-			return;
-		editorSelection = true;
-		try {
-			if (treeViewer == null)
-				return;
-			if (selection != null && !selection.isEmpty()
-					&& selection instanceof IStructuredSelection) {
-				Object item = ((IStructuredSelection) selection)
-						.getFirstElement();
-				if (item instanceof ImportObject) {
-					selection = new StructuredSelection(((ImportObject) item)
-							.getImport());
-				}
-				if (item instanceof IDocumentNode) {
-					while (null == treeViewer.testFindItem(item)) {
-						item = ((IDocumentNode) item).getParentNode();
-						if (item == null) {
-							break;
-						} 
-						selection = new StructuredSelection(item);					
-					}
-				}
-			}
-			treeViewer.setSelection(selection);
-		} finally {
-			editorSelection = false;
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/GenericSourcePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/GenericSourcePage.java
deleted file mode 100644
index abcbb96..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/GenericSourcePage.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-
-import org.eclipse.jface.viewers.*;
-
-/**
- *
- */
-public class GenericSourcePage extends PDESourcePage {
-	/**
-	 * @param editor
-	 * @param id
-	 * @param title
-	 */
-	public GenericSourcePage(PDEFormEditor editor, String id, String title) {
-		super(editor, id, title);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.PDESourcePage#createOutlineLabelProvider()
-	 */
-	protected ILabelProvider createOutlineLabelProvider() {
-		return null;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.PDESourcePage#createOutlineContentProvider()
-	 */
-	protected ITreeContentProvider createOutlineContentProvider() {
-		return null;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.PDESourcePage#createOutlineContentProvider()
-	 */
-	protected ViewerSorter createOutlineSorter() {
-		return null;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.PDESourcePage#outlineSelectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
-	 */
-	protected void outlineSelectionChanged(SelectionChangedEvent e) {
-	}
-	protected ISortableContentOutlinePage createOutlinePage() {
-		return null;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/IContextPart.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/IContextPart.java
deleted file mode 100644
index f23b42f..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/IContextPart.java
+++ /dev/null

@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-
-import org.eclipse.pde.core.IModelChangedListener;
-
-public interface IContextPart extends IModelChangedListener {
-	boolean isEditable();
-	PDEFormPage getPage();
-	String getContextId();
-	void fireSaveNeeded();
-	void cancelEdit();
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/IModelUndoManager.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/IModelUndoManager.java
deleted file mode 100644
index 7956f48..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/IModelUndoManager.java
+++ /dev/null

@@ -1,101 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.pde.core.IModelChangeProvider;
-
-/**
- * Classes that implement this interface provide undo/redo
- * capability linked to changes reported by model change
- * providers. Model change events carry sufficient data
- * to be used in an undo/redo stack and reverted to or
- * reapplied after the change.
- * <p>Model undo manager adds itself as a change listener
- * after being connected to the provider. It is expected
- * to stop listening to change events after being disconnected.
- * Changes reported while being connected are kept in the
- * operation stack whose size can be controlled.
- * <p>The part that uses the undo manager is responsible
- * for supplying Undo and Redo action objects for
- * the purpose of controlling their availability. 
- * Undo manager should keep track of its current
- * operation stack pointer and adjust Undo/Redo action
- * availability by calling 'setEnabled' on the
- * provided action objects. Implementation of this
- * interface may also opt to modify Undo/Redo action
- * labels in order to better indicate the effect
- * of the operations if selected (for example,
- * 'Undo Delete' instead of 'Undo').
- */
-public interface IModelUndoManager {
-	/**
-	 * Connects to the change provider. Until disconnecting,
-	 * the manager will keep model changes in the operation
-	 * stack and will be able to revert or reapply these
-	 * changes in the source model.
-	 * @param provider the model change provider to connect to
-	 */
-	public void connect(IModelChangeProvider provider);
-	/**
-	 * Disconnects from the change provider. Upon disconnecting,
-	 * the manager will no longer be able to revert or reapply
-	 * changes in the source model.
-	 * @param provider the model change provider to disconnect from
-	 */
-	public void disconnect(IModelChangeProvider provider);
-	/**
-	 * Tests whether the current operation in the undo stack can
-	 * be reverted.
-	 * @return true if the current operation can be undone.
-	 */
-	public boolean isUndoable();
-	/**
-	 * Tests whether the current operation in the undo stack can
-	 * be reapplied.
-	 * @return true if the current operation can be redone.
-	 */
-	public boolean isRedoable();
-	/**
-	 * Reverts the current operation in the undo stack and decrements
-	 * the stack pointer.
-	 */
-	public void undo();
-	/**
-	 * Reapplies the next operation in the undo stack and sets
-	 * the stack pointer to that operation.
-	 * 
-	 */
-	public void redo();
-	/**
-	 * Sets the depth of the undo stack.
-	 * @param limit number of levels in the undo stack.
-	 */
-	public void setUndoLevelLimit(int limit);
-	/**
-	 * Temporarily suspends undo manager.
-	 * @param ignore if true, model changes reported by the 
-	 * model change provider will be ignore until this
-	 * property is set to <samp>false</samp> again.
-	 */
-	public void setIgnoreChanges(boolean ignore);
-	/**
-	 * Connects the undo manager with the undo and redo actions 
-	 * in the workbench part using the manager. The manager
-	 * uses these objects to enable or disable the actions
-	 * according to the state of the undo stack and the current
-	 * location of the stack pointer. 
-	 * @param undoAction the action in the workbench part that performs
-	 * the undo operation.
-	 * @param redoAction the action in the workbench part that performs
-	 * the redo operation.
-	 */
-	public void setActions(IAction undoAction, IAction redoAction);
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/ISortableContentOutlinePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/ISortableContentOutlinePage.java
deleted file mode 100644
index 1b99adb..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/ISortableContentOutlinePage.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-
-/**
- * IConentOutlinePage with externally enabled/disabled element sorting
- */
-public interface ISortableContentOutlinePage extends IContentOutlinePage {
-	/**
-	 * Turns sorting on or off
-	 * @param sorting - boolean value indicating if sorting should be enabled
-	 */
-	public void sort(boolean sorting);
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/JarEntryEditorInput.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/JarEntryEditorInput.java
deleted file mode 100644
index bd7ae06..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/JarEntryEditorInput.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-
-
-import java.io.*;
-
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.*;
-
-
-/**
- * An EditorInput for a JarEntryFile.
- */
-public class JarEntryEditorInput implements IStorageEditorInput {
-		
-	private IStorage fJarEntryFile; 
-	
-	public JarEntryEditorInput(IStorage jarEntryFile) {
-		fJarEntryFile= jarEntryFile;
-	}
-	
-	/*
-	 */
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (!(obj instanceof JarEntryEditorInput))
-			return false;
-		JarEntryEditorInput other= (JarEntryEditorInput) obj;
-		return fJarEntryFile.equals(other.fJarEntryFile);
-	}
-		
-	/*
-	 * @see IEditorInput#getPersistable()
-	 */
-	public IPersistableElement getPersistable() {
-		return null;
-	}
-	
-	/*
-	 * @see IEditorInput#getName()
-	 */
-	public String getName() {
-		return fJarEntryFile.getName();
-	}
-	
-	/*
-	 * @see IEditorInput#getFullPath()
-	 */
-	public String getFullPath() {
-		return fJarEntryFile.getFullPath().toString();
-	}
-	
-	/*
-	 * @see IEditorInput#getContentType()
-	 */
-	public String getContentType() {
-		return fJarEntryFile.getFullPath().getFileExtension();
-	}
-	
-	/*
-	 * @see IEditorInput#getToolTipText()
-	 */
-	public String getToolTipText() {
-		return fJarEntryFile.getFullPath().toString();
-	}
-	
-	/*
-	 * @see IEditorInput#getImageDescriptor()
-	 */
-	public ImageDescriptor getImageDescriptor() {
-		IEditorRegistry registry= PlatformUI.getWorkbench().getEditorRegistry();
-		return registry.getImageDescriptor(fJarEntryFile.getFullPath().getFileExtension());
-	}
-	
-	/*
-	 * @see IEditorInput#exists()
-	 */
-	public boolean exists() {
-		// JAR entries can't be deleted
-		return true;
-	}
-	
-	/*
-	 * @see IAdaptable#getAdapter(Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		if (adapter.equals(File.class))
-			return fJarEntryFile.getAdapter(File.class);
-		return null;
-	}
-		
-	/*
-	 * see IStorageEditorInput#getStorage()
-	 */
-	 public IStorage getStorage() {
-	 	return fJarEntryFile;
-	 }
-}
-
-

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/JarEntryFile.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/JarEntryFile.java
deleted file mode 100644
index 06772fd..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/JarEntryFile.java
+++ /dev/null

@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-
-import java.io.*;
-import java.util.zip.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.pde.internal.ui.*;
-
-
-public class JarEntryFile extends PlatformObject implements IStorage {
-	
-	private ZipFile fZipFile;
-	private String fEntryName;
-
-	public JarEntryFile(ZipFile zipFile, String entryName) {
-		fZipFile = zipFile;
-		fEntryName = entryName;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.resources.IStorage#getContents()
-	 */
-	public InputStream getContents() throws CoreException {
-		try {
-			ZipEntry zipEntry = fZipFile.getEntry(fEntryName);
-			return fZipFile.getInputStream(zipEntry);
-		} catch (Exception e){
-			throw new CoreException(new Status(IStatus.ERROR, PDEPlugin.PLUGIN_ID, IStatus.ERROR, e.getMessage(), e));
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.resources.IStorage#getFullPath()
-	 */
-	public IPath getFullPath() {
-		return new Path(fEntryName);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.resources.IStorage#getName()
-	 */
-	public String getName() {
-		return getFullPath().lastSegment();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.resources.IStorage#isReadOnly()
-	 */
-	public boolean isReadOnly() {
-		return true;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		if (adapter.equals(ZipFile.class))
-			return fZipFile;
-		if (adapter.equals(File.class))
-			return new File(fZipFile.getName());
-		return super.getAdapter(adapter);
-	}
-	
-	public String toString() {
-		return "JarEntryFile["+ fZipFile.getName() + "::" + fEntryName + "]"; //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-1$
-	}
-	
-	public boolean equals(Object obj) {
-		if (!(obj instanceof JarEntryFile))
-			return false;
-		return toString().equals(obj.toString());
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/KeyValueSourcePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/KeyValueSourcePage.java
deleted file mode 100644
index 5b81da3..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/KeyValueSourcePage.java
+++ /dev/null

@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.reconciler.IReconciler;
-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.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.pde.internal.core.util.PropertiesUtil;
-import org.eclipse.pde.internal.ui.editor.text.AnnotationHover;
-import org.eclipse.pde.internal.ui.editor.text.IReconcilingParticipant;
-import org.eclipse.pde.internal.ui.editor.text.ReconcilingStrategy;
-import org.eclipse.pde.internal.ui.model.IDocumentKey;
-import org.eclipse.ui.editors.text.TextSourceViewerConfiguration;
-
-public abstract class KeyValueSourcePage extends PDESourcePage {
-
-	class KeyValueSourceViewerConfiguration extends TextSourceViewerConfiguration {
-		private AnnotationHover fAnnotationHover;
-		public IReconciler getReconciler(ISourceViewer sourceViewer) {
-			ReconcilingStrategy strategy = new ReconcilingStrategy();
-			strategy.addParticipant((IReconcilingParticipant) getInputContext()
-					.getModel());
-			strategy.addParticipant((SourceOutlinePage)getContentOutline());
-			MonoReconciler reconciler = new MonoReconciler(strategy, false);
-			reconciler.setDelay(500);
-			return reconciler;
-		}
-		public IAnnotationHover getAnnotationHover(ISourceViewer sourceViewer) {
-			if (fAnnotationHover == null)
-				fAnnotationHover = new AnnotationHover();
-			return fAnnotationHover;
-		}
-	}
-	public KeyValueSourcePage(PDEFormEditor editor, String id, String title) {
-		super(editor, id, title);
-		setSourceViewerConfiguration(new KeyValueSourceViewerConfiguration());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.PDESourcePage#createViewerSorter()
-	 */
-	protected ViewerSorter createDefaultOutlineSorter() {
-		return new ViewerSorter() {
-			public int compare(Viewer viewer, Object e1, Object e2) {
-				IDocumentKey key1 = (IDocumentKey)e1;
-				IDocumentKey key2 = (IDocumentKey)e2;
-				return key1.getOffset() < key2.getOffset() ? -1 : 1;
-			}
-		};
-	}
-	
-	protected void outlineSelectionChanged(SelectionChangedEvent event) {
-		ISelection selection= event.getSelection();
-		if (selection instanceof IStructuredSelection) {
-			IStructuredSelection structuredSelection= (IStructuredSelection) selection;
-			Object first= structuredSelection.getFirstElement();
-			if (first instanceof IDocumentKey) {
-				setHighlightRange((IDocumentKey)first);				
-			} else {
-				resetHighlightRange();
-			}
-		}
-	}
-	
-	public void setHighlightRange(IDocumentKey key) {
-		ISourceViewer sourceViewer = getSourceViewer();
-		if (sourceViewer == null)
-			return;
-
-		IDocument document = sourceViewer.getDocument();
-		if (document == null)
-			return;
-
-		int offset = key.getOffset();
-		int length = key.getLength();
-		setHighlightRange(offset, length, true);
-		int nameLength = PropertiesUtil.createWritableName(key.getName())
-				.length();
-		sourceViewer.setSelectedRange(offset, Math.min(nameLength, length));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESourcePage#createOutlineSorter()
-	 */
-	protected ViewerSorter createOutlineSorter() {
-		return new ViewerSorter();
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/LinkSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/LinkSection.java
deleted file mode 100644
index 50e8513..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/LinkSection.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.pde.internal.ui.parts.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.forms.events.*;
-import org.eclipse.ui.forms.widgets.*;
-/**
- * This class can be used to show a standard section with an array of links.
- * Links are objects from editor pages, and each one will select the owning
- * page and reveal the element in it. If the number of objects from the content
- * provider is greated than the preset limit, only the first 'limit' number of
- * links will be shown, and a 'More...' button will show up (this is a change
- * from 2.1 where 'More...' was visible all the time).
- */
-public class LinkSection extends PDESection {
-	private ILinkLabelProvider labelProvider;
-	private IStructuredContentProvider contentProvider;
-	private Composite linkContainer;
-	private Composite container;
-	private Button moreButton;
-	private String morePageId;
-	private int linkNumberLimit = 20;
-	private LinkHandler linkHandler;
-	class LinkHandler implements IHyperlinkListener {
-		public void linkActivated(HyperlinkEvent e) {
-			doLinkActivated((Hyperlink) e.widget);
-		}
-		public void linkEntered(HyperlinkEvent e) {
-			doEnter((Hyperlink) e.widget);
-		}
-		public void linkExited(HyperlinkEvent e) {
-			doExit((Hyperlink) e.widget);
-		}
-	}
-	/**
-	 * @param page
-	 * @param parent
-	 * @param style
-	 */
-	public LinkSection(PDEFormPage page, Composite parent, int style) {
-		super(page, parent, style);
-		FormToolkit toolkit = page.getManagedForm().getToolkit();
-		linkHandler = new LinkHandler();
-		createClient(getSection(), toolkit);
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.neweditor.PDESection#createClient(org.eclipse.ui.forms.widgets.Section,
-	 *      org.eclipse.ui.forms.widgets.FormToolkit)
-	 */
-	protected void createClient(Section section, FormToolkit toolkit) {
-		container = toolkit.createComposite(section);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		container.setLayout(layout);
-		section.setClient(container);
-		linkContainer = toolkit.createComposite(container);
-		linkContainer.setLayoutData(new GridData(GridData.FILL_BOTH));
-		GridLayout linkLayout = new GridLayout();
-		linkLayout.marginWidth = 0;
-		linkLayout.marginHeight = 0;
-		linkLayout.verticalSpacing = 0;
-		linkContainer.setLayout(linkLayout);
-	}
-	private void createMoreButton() {
-		moreButton = getManagedForm().getToolkit().createButton(container, "More...", //$NON-NLS-1$
-				SWT.PUSH);
-		moreButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				BusyIndicator.showWhile(getSection().getDisplay(),
-						new Runnable() {
-							public void run() {
-								getPage().getEditor().setActivePage(morePageId);
-							}
-						});
-			}
-		});
-		moreButton
-				.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-	}
-	public void add(Object[] links) {
-		for (int i = 0; i < links.length; i++) {
-			createLink(links[i]);
-		}
-		updateMoreState(linkContainer.getChildren().length > linkNumberLimit);
-		reflow();
-	}
-	public void remove(Object[] links) {
-		for (int i = 0; i < links.length; i++) {
-			disposeLink(links[i]);
-		}
-		updateMoreState(linkContainer.getChildren().length > linkNumberLimit);
-		reflow();
-	}
-	private void disposeLink(Object obj) {
-		Hyperlink link = find(obj);
-		if (link != null)
-			link.dispose();
-	}
-	private Hyperlink find(Object object) {
-		Control[] children = linkContainer.getChildren();
-		for (int i = 0; i < children.length; i++) {
-			Control child = children[i];
-			if (child.getData().equals(object))
-				return (Hyperlink) child;
-		}
-		return null;
-	}
-	public void update(Object[] links) {
-		for (int i = 0; i < links.length; i++) {
-			update(links[i]);
-		}
-		reflow();
-	}
-	private void update(Object object) {
-		Hyperlink link = find(object);
-		if (link != null)
-			update(link, object);
-	}
-	private void update(Hyperlink hyperlink, Object object) {
-		String text = labelProvider != null
-				? labelProvider.getText(object)
-				: object.toString();
-		Image image = labelProvider != null
-				? labelProvider.getImage(object)
-				: null;
-		String tooltip = labelProvider != null ? labelProvider
-				.getToolTipText(object) : text;
-		hyperlink.setText(text);
-		hyperlink.setToolTipText(tooltip);
-		if (hyperlink instanceof ImageHyperlink)
-			((ImageHyperlink) hyperlink).setImage(image);
-		reflow();
-	}
-	public void refresh() {
-		// dispose old links
-		Control[] children = linkContainer.getChildren();
-		for (int i = 0; i < children.length; i++) {
-			children[i].dispose();
-		}
-		createLinks();
-		reflow();
-	}
-	private void reflow() {
-		linkContainer.layout();
-		container.layout();
-		getManagedForm().reflow(true);
-	}
-	private void createLinks() {
-		if (contentProvider == null)
-			return;
-		Object[] objects = contentProvider.getElements(getManagedForm().getInput());
-		for (int i = 0; i < objects.length; i++) {
-			if (i == linkNumberLimit)
-				break;
-			createLink(objects[i]);
-		}
-		if (objects.length > linkNumberLimit)
-			getManagedForm().getToolkit().createLabel(linkContainer, "...", SWT.NULL); //$NON-NLS-1$
-		updateMoreState(objects.length > linkNumberLimit);
-	}
-	private void updateMoreState(boolean needMore) {
-		if (needMore && moreButton == null) {
-			createMoreButton();
-		}
-		else if (!needMore && moreButton != null) {
-			moreButton.dispose();
-			moreButton = null;
-		}
-	}
-	private void createLink(Object object) {
-		Image image = labelProvider != null
-				? labelProvider.getImage(object)
-				: null;
-		Hyperlink hyperlink;
-		if (image != null) {
-			hyperlink = getManagedForm().getToolkit().createImageHyperlink(
-					linkContainer, SWT.NULL);
-			((ImageHyperlink) hyperlink).setImage(image);
-		} else
-			hyperlink = getManagedForm().getToolkit().createHyperlink(linkContainer,
-					null, SWT.NULL);
-		update(hyperlink, object);
-		hyperlink.setData(object);
-		hyperlink.addHyperlinkListener(linkHandler);
-	}
-	private void doEnter(Hyperlink link) {
-		String statusText = labelProvider != null ? labelProvider
-				.getStatusText(link.getData()) : link.getText();
-		getPage().getEditorSite().getActionBars().getStatusLineManager()
-				.setMessage(statusText);
-	}
-	private void doExit(Hyperlink link) {
-		getPage().getEditorSite().getActionBars().getStatusLineManager()
-				.setMessage(null);
-	}
-	protected void doLinkActivated(Hyperlink link) {
-		Object object = link.getData();
-		getPage().getEditor().setActivePage(morePageId, object);
-	}
-	public void setMorePageId(String id) {
-		this.morePageId = id;
-	}
-	public void setLinkNumberLimit(int limit) {
-		this.linkNumberLimit = limit;
-	}
-	public void setContentProvider(IStructuredContentProvider contentProvider) {
-		this.contentProvider = contentProvider;
-	}
-	public void setLabelProvider(ILinkLabelProvider provider) {
-		this.labelProvider = provider;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/ModelDataTransfer.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/ModelDataTransfer.java
deleted file mode 100644
index 8435f41..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/ModelDataTransfer.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-
-import java.io.*;
-
-import org.eclipse.swt.dnd.*;
-
-/**
- * @version 	1.0
- * @author
- */
-public class ModelDataTransfer extends ByteArrayTransfer {
-	/**
-	 * Singleton instance.
-	 */
-	private static final ModelDataTransfer instance =
-		new ModelDataTransfer();
-	// Create a unique ID to make sure that different Eclipse
-	// applications use different "types" of <code>ModelDataTransfer</code>
-	
-	public static final String TYPE_PREFIX = "pde-model-transfer-format"; //$NON-NLS-1$
-	private static final String TYPE_NAME =
-		TYPE_PREFIX + ":" //$NON-NLS-1$
-			+ System.currentTimeMillis()
-			+ ":" //$NON-NLS-1$
-			+ instance.hashCode();
-
-	private static final int TYPEID = registerType(TYPE_NAME);
-	
-	public static ModelDataTransfer getInstance() {
-		return instance;
-	}
-
-	/**
-	 * Constructor for ModelDataTransfer.
-	 */
-	public ModelDataTransfer() {
-		super();
-	}
-
-	/* (non-Javadoc)
-	 * Method declared on Transfer.
-	 */
-	protected int[] getTypeIds() {
-		return new int[] { TYPEID };
-	}
-	/* (non-Javadoc)
-	 * Returns the type names.
-	 *
-	 * @return the list of type names
-	 */
-	protected String[] getTypeNames() {
-		return new String[] { TYPE_NAME };
-	}
-	/* (non-Javadoc)
-		* Method declared on Transfer.
-		*/
-	protected void javaToNative(Object data, TransferData transferData) {
-		if (!(data instanceof Object[])) {
-			return;
-		}
-		Object[] objects = (Object[]) data;
-		int count = objects.length;
-		
-		try {
-			ByteArrayOutputStream out = new ByteArrayOutputStream();
-			ObjectOutputStream objectOut = new ObjectOutputStream(out);
-
-			//write the number of resources
-			objectOut.writeInt(count);
-
-			//write each object
-			for (int i = 0; i < objects.length; i++) {
-				objectOut.writeObject(objects[i]);
-			}
-
-			//cleanup
-			objectOut.close();
-			out.close();
-			byte[] bytes = out.toByteArray();
-			super.javaToNative(bytes, transferData);
-		} catch (IOException e) {
-			//it's best to send nothing if there were problems
-			System.out.println(e);
-		}
-			
-	}
-	/* (non-Javadoc)
-	 * Method declared on Transfer.
-	 */
-	protected Object nativeToJava(TransferData transferData) {
-		byte[] bytes = (byte[]) super.nativeToJava(transferData);
-		if (bytes == null)
-			return null;
-		try {
-			ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bytes));
-
-			int count = in.readInt();
-			Object[] objects = new Object[count];
-			for (int i = 0; i < count; i++) {
-				objects[i] = in.readObject();
-			}
-			in.close();
-			return objects;
-		} catch (ClassNotFoundException e) {
-			return null;
-		} catch (IOException e) {
-			return null;
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/ModelUndoManager.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/ModelUndoManager.java
deleted file mode 100644
index 6af02f7..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/ModelUndoManager.java
+++ /dev/null

@@ -1,211 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-import java.util.*;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.ui.forms.editor.IFormPage;
-
-/**
- * @version 	1.0
- * @author
- */
-public abstract class ModelUndoManager
-	implements IModelUndoManager, IModelChangedListener {
-	private boolean ignoreChanges;
-	private List operations;
-	private int undoLevelLimit = 10;
-	private int cursor = -1;
-	private IAction undoAction;
-	private IAction redoAction;
-	private PDEFormEditor editor;
-	
-	public ModelUndoManager(PDEFormEditor editor) {
-		this.editor = editor;
-		operations = new Vector();
-	}
-
-	/*
-	 * @see IModelUndoManager#connect(IModelChangeProvider)
-	 */
-	public void connect(IModelChangeProvider provider) {
-		provider.addModelChangedListener(this);
-		if (operations==null) initialize();
-	}
-
-	/*
-	 * @see IModelUndoManager#disconnect(IModelChangeProvider)
-	 */
-	public void disconnect(IModelChangeProvider provider) {
-		provider.removeModelChangedListener(this);
-	}
-
-	private void initialize() {
-		operations = new Vector();
-		cursor = -1;
-		updateActions();
-	}
-
-	/*
-	 * @see IModelUndoManager#isUndoable()
-	 */
-	public boolean isUndoable() {
-		return cursor>=0;
-	}
-
-	/*
-	 * @see IModelUndoManager#isRedoable()
-	 */
-	public boolean isRedoable() {
-		if (operations == null) initialize();
-		return (cursor+1)<operations.size();
-	}
-
-	/*
-	 * @see IModelUndoManager#undo()
-	 */
-	public void undo() {
-		IModelChangedEvent op = getCurrentOperation();
-		if (op==null) return;
-		ignoreChanges = true;
-		openRelatedPage(op);
-		execute(op, true);
-		cursor --;
-		updateActions();
-		ignoreChanges = false;
-	}
-
-	/*
-	 * @see IModelUndoManager#redo()
-	 */
-	public void redo() {
-		cursor ++;
-		IModelChangedEvent op = getCurrentOperation();
-		if (op==null) return;
-		ignoreChanges = true;
-		openRelatedPage(op);
-		execute(op, false);
-		ignoreChanges = false;
-		updateActions();
-	}
-	
-	protected abstract String getPageId(Object object);
-	
-	protected abstract void execute(IModelChangedEvent op, boolean undo);
-	
-	private void openRelatedPage(IModelChangedEvent op) {
-		Object obj = op.getChangedObjects()[0];
-		String pageId = getPageId(obj);
-		if (pageId!=null) {
-			IFormPage cpage = editor.getActivePageInstance();
-			IFormPage newPage = editor.findPage(pageId);
-			if (cpage != newPage)
-				editor.setActivePage(newPage.getId());
-		}
-	}
-
-	/*
-	 * @see IModelChangedListener#modelChanged(IModelChangedEvent)
-	 */
-	public void modelChanged(IModelChangedEvent event) {
-		if (ignoreChanges)
-			return;
-			
-		if (event.getChangeType()==IModelChangedEvent.WORLD_CHANGED) {
-			initialize();
-			return;
-		}
-		addOperation(event);
-	}
-	
-	private IModelChangedEvent getCurrentOperation() {
-		if (cursor == -1 || cursor == operations.size()) return null;
-		return (IModelChangedEvent)operations.get(cursor);
-	}
-	
-	private IModelChangedEvent getNextOperation() {
-		int peekCursor = cursor+1;
-		if (peekCursor >= operations.size()) return null;
-		return (IModelChangedEvent)operations.get(peekCursor);
-	}
-	
-	private void addOperation(IModelChangedEvent operation) {
-		operations.add(operation);
-		int size = operations.size();
-		if (size > undoLevelLimit) {
-			int extra = size-undoLevelLimit;
-			// trim
-			for (int i=0; i<extra; i++) {
-				operations.remove(i);
-			}
-		}
-		cursor = operations.size() -1;
-		updateActions();
-	}
-	
-	public void setActions(IAction undoAction, IAction redoAction) {
-		this.undoAction = undoAction;
-		this.redoAction = redoAction;
-		updateActions();
-	}
-	
-	private void updateActions() {
-		if (undoAction!=null && redoAction!=null) {
-			undoAction.setEnabled(isUndoable());
-			undoAction.setText(getUndoText());
-			redoAction.setEnabled(isRedoable());
-			redoAction.setText(getRedoText());
-		}
-	}
-	
-	private String getUndoText() {
-		IModelChangedEvent op = getCurrentOperation();
-		if (op == null) {
-			return PDEUIMessages.UpdateManager_noUndo;
-		}
-		return NLS.bind(PDEUIMessages.UpdateManager_undo, getOperationText(op));	
-	}
-
-	private String getRedoText() {
-		IModelChangedEvent op = getNextOperation();
-		if (op == null) {
-			return PDEUIMessages.UpdateManager_noRedo;
-		}
-		return NLS.bind(PDEUIMessages.UpdateManager_redo, getOperationText(op));
-	}
-		
-	private String getOperationText(IModelChangedEvent op) {
-		String opText=""; //$NON-NLS-1$
-		switch (op.getChangeType()) {
-			case IModelChangedEvent.INSERT:
-			opText = PDEUIMessages.UpdateManager_op_add;
-			break;
-			case IModelChangedEvent.REMOVE:
-			opText = PDEUIMessages.UpdateManager_op_remove;
-			break;
-			case IModelChangedEvent.CHANGE:
-			opText = PDEUIMessages.UpdateManager_op_change;
-			break;
-		}
-		return opText;
-	}
-	
-	public void setUndoLevelLimit(int limit) {
-		this.undoLevelLimit = limit;
-	}
-
-	public void setIgnoreChanges(boolean ignore) {
-		this.ignoreChanges = ignore;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/ModifiedTextPropertyDescriptor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/ModifiedTextPropertyDescriptor.java
deleted file mode 100644
index 298a4e2..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/ModifiedTextPropertyDescriptor.java
+++ /dev/null

@@ -1,28 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-
-import org.eclipse.ui.views.properties.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.pde.internal.ui.parts.*;
-
-public class ModifiedTextPropertyDescriptor extends TextPropertyDescriptor {
-	public ModifiedTextPropertyDescriptor(String name, String displayName) {
-		super(name, displayName);
-	}
-	public CellEditor createPropertyEditor(Composite parent) {
-		CellEditor editor = new ModifiedTextCellEditor(parent);
-		if (getValidator() != null)
-			editor.setValidator(getValidator());
-		return editor;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/MultiSourceEditor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/MultiSourceEditor.java
deleted file mode 100644
index 67b0d9b..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/MultiSourceEditor.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.editor.context.*;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.forms.editor.IFormPage;
-
-public abstract class MultiSourceEditor extends PDEFormEditor {
-	protected void addSourcePage(String contextId) {
-		InputContext context = inputContextManager.findContext(contextId);
-		if (context == null)
-			return;
-		PDESourcePage sourcePage;
-		// Don't duplicate
-		if (findPage(contextId)!=null) return;
-		sourcePage = createSourcePage(this, contextId, context.getInput().getName(), context.getId());
-		sourcePage.setInputContext(context);
-		try {
-			addPage(sourcePage, context.getInput());
-		} catch (PartInitException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-	
-	protected void removePage(String pageId) {
-		IFormPage page = findPage(pageId);
-		if (page == null)
-			return;
-		if (page.isDirty()) {
-			// need to ask the user about this
-		} else {
-			removePage(page.getIndex());
-			if (!page.isEditor())
-				page.dispose();
-		}
-	}
-	
-	protected PDESourcePage createSourcePage(PDEFormEditor editor, String title, String name, String contextId) {
-		return new GenericSourcePage(editor, title, name);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/NullUndoManager.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/NullUndoManager.java
deleted file mode 100644
index 6519384..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/NullUndoManager.java
+++ /dev/null

@@ -1,76 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.pde.core.IModelChangeProvider;
-
-/**
- * @version 	1.0
- * @author
- */
-public class NullUndoManager implements IModelUndoManager {
-
-	/*
-	 * @see IModelUndoManager#connect(IModelChangeProvider)
-	 */
-	public void connect(IModelChangeProvider provider) {
-	}
-
-	/*
-	 * @see IModelUndoManager#disconnect(IModelChangeProvider)
-	 */
-	public void disconnect(IModelChangeProvider provider) {
-	}
-
-	/*
-	 * @see IModelUndoManager#isUndoable()
-	 */
-	public boolean isUndoable() {
-		return false;
-	}
-
-	/*
-	 * @see IModelUndoManager#isRedoable()
-	 */
-	public boolean isRedoable() {
-		return false;
-	}
-
-	/*
-	 * @see IModelUndoManager#undo()
-	 */
-	public void undo() {
-	}
-
-	/*
-	 * @see IModelUndoManager#redo()
-	 */
-	public void redo() {
-	}
-
-	/*
-	 * @see IModelUndoManager#setUndoLevelLimit(int)
-	 */
-	public void setUndoLevelLimit(int limit) {
-	}
-
-	/*
-	 * @see IModelUndoManager#setIgnoreChanges(boolean)
-	 */
-	public void setIgnoreChanges(boolean ignore) {
-	}
-	
-	public void setActions(IAction undoAction, IAction redoAction) {
-		if (undoAction!=null) undoAction.setEnabled(false);
-		if (redoAction!=null) redoAction.setEnabled(false);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEDetails.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEDetails.java
deleted file mode 100644
index 84b1cd1..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEDetails.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.forms.*;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-public abstract class PDEDetails extends AbstractFormPart implements IDetailsPage, IContextPart {
-
-	public PDEDetails() {
-	}
-	
-	public boolean canPaste(Clipboard clipboard) {
-		return true;
-	}
-	
-	public boolean doGlobalAction(String actionId) {
-		return false;
-	}
-	
-	protected void markDetailsPart(Control control) {
-		control.setData("part", this); //$NON-NLS-1$
-	}
-	
-	protected void createSpacer(FormToolkit toolkit, Composite parent, int span) {
-		Label spacer = toolkit.createLabel(parent, ""); //$NON-NLS-1$
-		GridData gd = new GridData();
-		gd.horizontalSpan = span;
-		spacer.setLayoutData(gd);
-	}
-	public void cancelEdit() {
-		super.refresh();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEDetailsSections.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEDetailsSections.java
deleted file mode 100644
index 4eb923b..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEDetailsSections.java
+++ /dev/null

@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IFormPart;
-
-/**
- * Wrapper for PDESections, implemens IDetailsPage for use in MasterDetailsBlock
- */
-public abstract class PDEDetailsSections extends PDEDetails {
-	private PDESection sections[];
-
-	protected abstract PDESection[] createSections(PDEFormPage page,
-			Composite parent);
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.forms.IDetailsPage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createContents(Composite parent) {
-		sections = createSections(getPage(), parent);
-		GridLayout layout = new GridLayout();
-		layout.verticalSpacing = 30;
-		parent.setLayout(layout);
-		for (int i = 0; i < sections.length; i++) {
-			getManagedForm().addPart(sections[i]);
-		}
-	}
-
-	public void dispose() {
-		for (int i = 0; i < sections.length; i++) {
-			sections[i].dispose();
-		}
-	}
-
-	public void fireSaveNeeded() {
-		markDirty();
-		getPage().getPDEEditor().fireSaveNeeded(getContextId(), false);
-	}
-
-	public abstract String getContextId();
-
-	public PDEFormPage getPage() {
-		return (PDEFormPage) getManagedForm().getContainer();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.forms.AbstractFormPart#isDirty()
-	 */
-	public boolean isDirty() {
-		for (int i = 0; i < sections.length; i++) {
-			if (sections[i].isDirty()) {
-				return true;
-			}
-		}
-		return super.isDirty();
-	}
-
-	public boolean isEditable() {
-		return getPage().getPDEEditor().getAggregateModel().isEditable();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.forms.AbstractFormPart#isStale()
-	 */
-	public boolean isStale() {
-		for (int i = 0; i < sections.length; i++) {
-			if (sections[i].isStale()) {
-				return true;
-			}
-		}
-		return super.isStale();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.core.IModelChangedListener#modelChanged(org.eclipse.pde.core.IModelChangedEvent)
-	 */
-	public void modelChanged(IModelChangedEvent event) {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.forms.IDetailsPage#inputChanged(org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	public void selectionChanged(IFormPart masterPart, ISelection selection) {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.forms.IDetailsPage#setFocus()
-	 */
-	public void setFocus() {
-		if (sections.length > 0) {
-			sections[0].setFocus();
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEFormEditor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEFormEditor.java
deleted file mode 100644
index 24da156..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEFormEditor.java
+++ /dev/null

@@ -1,731 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-import java.io.*;
-import java.util.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.text.*;
-import org.eclipse.jface.text.source.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.context.*;
-import org.eclipse.pde.internal.ui.preferences.*;
-import org.eclipse.search.ui.text.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.dnd.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.actions.*;
-import org.eclipse.ui.editors.text.*;
-import org.eclipse.ui.forms.*;
-import org.eclipse.ui.forms.editor.*;
-import org.eclipse.ui.forms.widgets.*;
-import org.eclipse.ui.ide.*;
-import org.eclipse.ui.part.*;
-import org.eclipse.ui.views.contentoutline.*;
-import org.eclipse.ui.views.properties.*;
-/**
- * A simple multi-page form editor that uses Eclipse Forms support. Example
- * plug-in is configured to create one instance of form colors that is shared
- * between multiple editor instances.
- */
-public abstract class PDEFormEditor extends FormEditor
-		implements
-			IInputContextListener,
-			IGotoMarker, ISearchEditorAccess {
-	/**
-	 * Updates the OutlinePage selection.
-	 * 
-	 * @since 3.0
-	 */
-	private class PDEFormEditorChangeListener implements
-			ISelectionChangedListener {
-
-		/**
-		 * Installs this selection changed listener with the given selection
-		 * provider. If the selection provider is a post selection provider,
-		 * post selection changed events are the preferred choice, otherwise
-		 * normal selection changed events are requested.
-		 * 
-		 * @param selectionProvider
-		 */
-		public void install(ISelectionProvider selectionProvider) {
-			if (selectionProvider == null) {
-				return;
-			}
-
-			if (selectionProvider instanceof IPostSelectionProvider) {
-				IPostSelectionProvider provider = (IPostSelectionProvider) selectionProvider;
-				provider.addPostSelectionChangedListener(this);
-			} else {
-				selectionProvider.addSelectionChangedListener(this);
-			}
-		}
-
-		/*
-		 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
-		 */
-		public void selectionChanged(SelectionChangedEvent event) {
-			if (PDEPlugin.getDefault().getPreferenceStore().getBoolean(
-					"ToggleLinkWithEditorAction.isChecked")) //$NON-NLS-1$
-				if (getFormOutline() != null) {
-					getFormOutline().setSelection(event.getSelection());
-				}
-		}
-
-		/**
-		 * Removes this selection changed listener from the given selection
-		 * provider.
-		 * 
-		 * @param selectionProviderstyle
-		 */
-		public void uninstall(ISelectionProvider selectionProvider) {
-			if (selectionProvider == null) {
-				return;
-			}
-
-			if (selectionProvider instanceof IPostSelectionProvider) {
-				IPostSelectionProvider provider = (IPostSelectionProvider) selectionProvider;
-				provider.removePostSelectionChangedListener(this);
-			} else {
-				selectionProvider.removeSelectionChangedListener(this);
-			}
-		}
-
-	}
-
-	/**
-	 * The editor selection changed listener.
-	 * 
-	 * @since 3.0
-	 */
-	private PDEFormEditorChangeListener fEditorSelectionChangedListener;
-	private Clipboard clipboard;
-	private Menu contextMenu;
-	protected InputContextManager inputContextManager;
-	private ISortableContentOutlinePage formOutline;
-	private PDEMultiPagePropertySheet propertySheet;
-	private PDEMultiPageContentOutline contentOutline;
-	private String lastActivePageId;
-	private boolean lastDirtyState;
-
-	private static class PDEMultiPageEditorSite extends MultiPageEditorSite {
-		public PDEMultiPageEditorSite(MultiPageEditorPart multiPageEditor,
-				IEditorPart editor) {
-			super(multiPageEditor, editor);
-		}
-		public IEditorActionBarContributor getActionBarContributor() {
-			PDEFormEditor editor = (PDEFormEditor) getMultiPageEditor();
-			PDEFormEditorContributor contributor = editor.getContributor();
-			return contributor.getSourceContributor();
-		}
-		
-		public IWorkbenchPart getPart() {
-			return getMultiPageEditor();
-		}
-	}
-	/**
-	 *  
-	 */
-	public PDEFormEditor() {
-		PDEPlugin.getDefault().getLabelProvider().connect(this);
-		inputContextManager = createInputContextManager();
-	}
-	/**
-	 * We must override nested site creation so that we properly pass the source
-	 * editor contributor when asked.
-	 */
-	protected IEditorSite createSite(IEditorPart editor) {
-		return new PDEMultiPageEditorSite(this, editor);
-	}
-	public IProject getCommonProject() {
-		return inputContextManager.getCommonProject();
-	}
-	public IBaseModel getAggregateModel() {
-		if (inputContextManager != null)
-			return inputContextManager.getAggregateModel();
-		return null;
-	}
-	protected abstract InputContextManager createInputContextManager();
-	/**
-	 * Tests whether this editor has a context with a provided id. The test can
-	 * be used to check whether to add certain pages.
-	 * 
-	 * @param contextId
-	 * @return <code>true</code> if provided context is present,
-	 *         <code>false</code> otherwise.
-	 */
-	public boolean hasInputContext(String contextId) {
-		return inputContextManager.hasContext(contextId);
-	}
-	public InputContextManager getContextManager() {
-		return inputContextManager;
-	}
-	protected void createInputContexts(InputContextManager contextManager) {
-		IEditorInput input = getEditorInput();
-		if (input instanceof IFileEditorInput) {
-			// resource - find the project
-			createResourceContexts(contextManager, (IFileEditorInput) input);
-		} else if (input instanceof SystemFileEditorInput) {
-			// system file - find the file system folder
-			createSystemFileContexts(contextManager,
-					(SystemFileEditorInput) input);
-		} else if (input instanceof IStorageEditorInput) {
-			createStorageContexts(contextManager, (IStorageEditorInput) input);
-		} else if (input instanceof ILocationProvider) {
-			IPath path = ((ILocationProvider) input).getPath(input);
-			File file = path.toFile();
-			SystemFileEditorInput sinput = new SystemFileEditorInput(file);
-			createSystemFileContexts(contextManager, sinput);
-		}
-	}
-	protected abstract void createResourceContexts(
-			InputContextManager contexts, IFileEditorInput input);
-	protected abstract void createSystemFileContexts(
-			InputContextManager contexts, SystemFileEditorInput input);
-	protected abstract void createStorageContexts(InputContextManager contexts,
-			IStorageEditorInput input);
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.forms.editor.FormEditor#createToolkit(org.eclipse.swt.widgets.Display)
-	 */
-	protected FormToolkit createToolkit(Display display) {
-		// Create a toolkit that shares colors between editors.
-		return new FormToolkit(PDEPlugin.getDefault().getFormColors(display));
-	}
-	/*
-	 * When subclassed, don't forget to call 'super'
-	 */
-	protected void createPages() {
-		clipboard = new Clipboard(getContainer().getDisplay());
-		MenuManager manager = new MenuManager();
-		IMenuListener listener = new IMenuListener() {
-			public void menuAboutToShow(IMenuManager manager) {
-				contextMenuAboutToShow(manager);
-			}
-		};
-		manager.setRemoveAllWhenShown(true);
-		manager.addMenuListener(listener);
-		contextMenu = manager.createContextMenu(getContainer());
-		getContainer().setMenu(contextMenu);
-		createInputContexts(inputContextManager);
-		super.createPages();
-		inputContextManager.addInputContextListener(this);
-		String pageToShow = computeInitialPageId();
-		if (pageToShow != null)
-			setActivePage(pageToShow);
-		updateTitle();
-	}
-	protected void pageChange(int newPageIndex) {
-		super.pageChange(newPageIndex);
-		IFormPage page = getActivePageInstance();
-		updateContentOutline(page);
-		updatePropertySheet(page);
-		if (page!=null)
-			lastActivePageId = page.getId();
-	}
-	public Clipboard getClipboard() {
-		return clipboard;
-	}
-	protected void contextMenuAboutToShow(IMenuManager manager) {
-		PDEFormEditorContributor contributor = getContributor();
-		IFormPage page = getActivePageInstance();
-		if (page instanceof PDEFormPage)
-			((PDEFormPage) page).contextMenuAboutToShow(manager);
-		if (contributor != null)
-			contributor.contextMenuAboutToShow(manager);
-	}
-	public PDEFormEditorContributor getContributor() {
-		return (PDEFormEditorContributor) getEditorSite()
-				.getActionBarContributor();
-	}
-	protected String computeInitialPageId() {
-		String firstPageId = null;
-		String storedFirstPageId = loadDefaultPage();
-		if (storedFirstPageId != null)
-			firstPageId = storedFirstPageId;
-		else if (EditorPreferencePage.getUseSourcePage())
-			firstPageId = getSourcePageId();
-		// Regardless what is the stored value,
-		// use source page if model is not valid
-		String invalidContextId = getFirstInvalidContextId();
-		if (invalidContextId != null)
-			return invalidContextId;
-		return firstPageId;
-	}
-	private String getSourcePageId() {
-		InputContext context = inputContextManager.getPrimaryContext();
-		if (context != null)
-			return context.getId();
-		return null;
-	}
-	private String getFirstInvalidContextId() {
-		InputContext[] invalidContexts = inputContextManager
-				.getInvalidContexts();
-		if (invalidContexts.length == 0)
-			return null;
-		// If primary context is among the invalid ones, return that.
-		for (int i = 0; i < invalidContexts.length; i++) {
-			if (invalidContexts[i].isPrimary())
-				return invalidContexts[i].getId();
-		}
-		// Return the first one
-		return invalidContexts[0].getId();
-	}
-
-	public String getTitle() {
-		if (inputContextManager == null)
-			return super.getTitle();
-		InputContext context = inputContextManager.getPrimaryContext();
-		if (context == null)
-			return super.getTitle();
-		return context.getInput().getName();
-	}
-	
-	public void updateTitle() {
-		firePropertyChange(IWorkbenchPart.PROP_TITLE);
-	}
-
-	public String getTitleProperty() {
-		return ""; //$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.ISaveablePart#doSave(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void doSave(IProgressMonitor monitor) {
-		commitFormPages(true);
-		inputContextManager.save(monitor);
-		editorDirtyStateChanged();
-	}
-	public void doRevert() {
-		IFormPage currentPage = getActivePageInstance();
-		if (currentPage != null && currentPage instanceof PDEFormPage)
-			((PDEFormPage) currentPage).cancelEdit();
-		IFormPage[] pages = getPages();
-		for (int i = 0; i < pages.length; i++) {
-			if (pages[i] instanceof PDESourcePage) {
-				((PDESourcePage) pages[i]).doRevertToSaved();
-			}
-		}
-		editorDirtyStateChanged();
-	}
-	public void doRevert(IEditorInput input) {
-		IFormPage currentPage = getActivePageInstance();
-		if (currentPage != null && currentPage instanceof PDEFormPage)
-			((PDEFormPage) currentPage).cancelEdit();
-		InputContext context = inputContextManager.getContext(input);
-		IFormPage page = findPage(context.getId());
-		if (page!=null && page instanceof PDESourcePage) {
-			PDESourcePage spage = (PDESourcePage) page;
-		    spage.doRevertToSaved();
-		}
-		editorDirtyStateChanged();
-	}
-	private void commitFormPages(boolean onSave) {
-		IFormPage[] pages = getPages();
-		for (int i = 0; i < pages.length; i++) {
-			IFormPage page = pages[i];
-			IManagedForm mform = page.getManagedForm();
-			if (mform != null && mform.isDirty())
-				mform.commit(true);
-		}
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.ISaveablePart#doSaveAs()
-	 */
-	public void doSaveAs() {
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.ISaveablePart#isSaveAsAllowed()
-	 */
-	public boolean isSaveAsAllowed() {
-		return false;
-	}
-
-	private void storeDefaultPage() {
-		IEditorInput input = getEditorInput();
-		String pageId = lastActivePageId;
-		if (pageId == null)
-			return;
-		if (input instanceof IFileEditorInput) {
-			IFile file = ((IFileEditorInput) input).getFile();
-			if (file != null) {
-				//set the settings on the resouce
-				try {
-					file
-							.setPersistentProperty(
-									IPDEUIConstants.DEFAULT_EDITOR_PAGE_KEY_NEW,
-									pageId);
-				} catch (CoreException e) {
-				}
-			}
-		} else if (input instanceof SystemFileEditorInput) {
-			File file = (File) ((SystemFileEditorInput) input)
-					.getAdapter(File.class);
-			if (file == null)
-				return;
-			IDialogSettings section = getSettingsSection();
-			section.put(file.getPath(), pageId);
-		}
-	}
-	private String loadDefaultPage() {
-		IEditorInput input = getEditorInput();
-		if (input instanceof IFileEditorInput) {
-			// load the setting from the resource
-			IFile file = ((IFileEditorInput) input).getFile();
-			try {
-				return file
-						.getPersistentProperty(IPDEUIConstants.DEFAULT_EDITOR_PAGE_KEY_NEW);
-			} catch (CoreException e) {
-				return null;
-			}
-		} else if (input instanceof SystemFileEditorInput) {
-			File file = (File) ((SystemFileEditorInput) input)
-					.getAdapter(File.class);
-			if (file == null)
-				return null;
-			IDialogSettings section = getSettingsSection();
-			String key = file.getPath();
-			return section.get(key);
-		}
-		return null;
-	}
-	public void dispose() {
-		storeDefaultPage();
-		if (fEditorSelectionChangedListener != null)  {
-			fEditorSelectionChangedListener.uninstall(getSite().getSelectionProvider());
-			fEditorSelectionChangedListener= null;
-		}
-		//setSelection(new StructuredSelection());
-		PDEPlugin.getDefault().getLabelProvider().disconnect(this);
-		if (clipboard != null) {
-			clipboard.dispose();
-			clipboard = null;
-		}
-		super.dispose();
-		inputContextManager.dispose();
-		inputContextManager = null;
-	}
-	public boolean isDirty() {
-		lastDirtyState = computeDirtyState();
-		return lastDirtyState;
-	}
-	
-	private boolean computeDirtyState() {
-		IFormPage page = getActivePageInstance();
-		if ((page != null && page.isDirty())
-				|| (inputContextManager != null && inputContextManager
-						.isDirty()))
-			return true;
-		return super.isDirty();
-	}
-	
-	public boolean getLastDirtyState() {
-		return lastDirtyState;
-	}
-
-	public void fireSaveNeeded(String contextId, boolean notify) {
-		if (contextId == null)
-			return;
-		InputContext context = inputContextManager.findContext(contextId);
-		if (context != null)
-			fireSaveNeeded(context.getInput(), notify);
-	}
-	public void fireSaveNeeded(IEditorInput input, boolean notify) {
-		if (notify)
-			editorDirtyStateChanged();
-		if (isDirty())
-			validateEdit(input);
-	}
-	public void editorDirtyStateChanged() {
-		super.editorDirtyStateChanged();
-		PDEFormEditorContributor contributor = getContributor();
-		if (contributor != null)
-			contributor.updateActions();
-	}
-	private void validateEdit(IEditorInput input) {
-		final InputContext context = inputContextManager.getContext(input);
-		if (!context.validateEdit()) {
-			getSite().getShell().getDisplay().asyncExec(new Runnable() {
-				public void run() {
-					doRevert(context.getInput());
-					context.setValidated(false);
-				}
-			});
-		}
-	}
-	private IDialogSettings getSettingsSection() {
-		// store the setting in dialog settings
-		IDialogSettings root = PDEPlugin.getDefault().getDialogSettings();
-		IDialogSettings section = root.getSection("multi-page-editor"); //$NON-NLS-1$
-		if (section == null)
-			section = root.addNewSection("multi-page-editor"); //$NON-NLS-1$
-		return section;
-	}
-	public void gotoMarker(IMarker marker) {
-		IResource resource = marker.getResource();
-		InputContext context = inputContextManager.findContext(resource);
-		if (context == null)
-			return;
-		IFormPage page = getActivePageInstance();
-		if (!context.getId().equals(page.getId()))
-			page = setActivePage(context.getId());
-		IDE.gotoMarker(page, marker);
-	}
-	
-	public void openToSourcePage(Object object, int offset, int length) {
-		InputContext context = getInputContext(object);
-		if (context != null) {
-			PDESourcePage page = (PDESourcePage)setActivePage(context.getId());
-			if (page != null)
-				page.selectAndReveal(offset, length);
-		}
-	}
-
-	public void setSelection(ISelection selection) {
-		getSite().getSelectionProvider().setSelection(selection);
-		getContributor().updateSelectableActions(selection);
-	}
-	public ISelection getSelection() {
-		return getSite().getSelectionProvider().getSelection();
-	}
-	public Object getAdapter(Class key) {
-		if (key.equals(IContentOutlinePage.class)) {
-			return getContentOutline();
-		}
-		if (key.equals(IPropertySheetPage.class)) {
-			return getPropertySheet();
-		}
-		if (key.equals(IGotoMarker.class)) {
-			return this;
-		}
-		if (key.equals(ISearchEditorAccess.class)) {
-			return this;
-		}
-		return super.getAdapter(key);
-	}
-	public Menu getContextMenu() {
-		return contextMenu;
-	}
-	public PDEMultiPageContentOutline getContentOutline() {
-		if (contentOutline == null || contentOutline.isDisposed()) {
-			contentOutline = new PDEMultiPageContentOutline(this);
-			updateContentOutline(getActivePageInstance());
-		}
-		return contentOutline;
-	}
-	public PDEMultiPagePropertySheet getPropertySheet() {
-		if (propertySheet == null || propertySheet.isDisposed()) {
-			propertySheet = new PDEMultiPagePropertySheet();
-			updatePropertySheet(getActivePageInstance());
-		}
-		return propertySheet;
-	}
-	/**
-	 * 
-	 * @return outline page or null
-	 */
-	protected ISortableContentOutlinePage getFormOutline() {
-		if (formOutline == null) {
-			formOutline = createContentOutline();
-			if (formOutline != null) {
-				fEditorSelectionChangedListener = new PDEFormEditorChangeListener();
-				fEditorSelectionChangedListener.install(getSite()
-						.getSelectionProvider());
-			}
-		}
-		return formOutline;
-	}
-	abstract protected ISortableContentOutlinePage createContentOutline();
-	
-	private void updateContentOutline(IFormPage page) {
-		if (contentOutline == null)
-			return;
-		ISortableContentOutlinePage outline = null;
-		if (page instanceof PDESourcePage) {
-			outline = ((PDESourcePage) page).getContentOutline();
-		} else {
-			outline = getFormOutline();
-			if (outline != null && outline instanceof FormOutlinePage)
-				((FormOutlinePage) outline).refresh();
-		}
-		contentOutline.setPageActive(outline);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.editor.FormEditor#setActivePage(java.lang.String)
-	 */
-	public IFormPage setActivePage(String pageId) {
-		IFormPage page = super.setActivePage(pageId);
-		if (page != null)
-			updateContentOutline(page);
-		return page;
-	}
-	protected IPropertySheetPage getPropertySheet(PDEFormPage page) {
-		return page.getPropertySheetPage();
-	}
-	void updatePropertySheet(IFormPage page) {
-		if (propertySheet == null)
-			return;
-		if (page instanceof PDEFormPage) {
-			IPropertySheetPage propertySheetPage = getPropertySheet((PDEFormPage) page);
-			if (propertySheetPage != null) {
-				propertySheet.setPageActive(propertySheetPage);
-			}
-		} else
-			propertySheet.setDefaultPageActive();
-	}
-	/* package */IFormPage[] getPages() {
-		ArrayList formPages = new ArrayList();
-		for (int i = 0; i < pages.size(); i++) {
-			Object page = pages.get(i);
-			if (page instanceof IFormPage)
-				formPages.add(page);
-		}
-		return (IFormPage[]) formPages.toArray(new IFormPage[formPages.size()]);
-	}
-	protected void performGlobalAction(String id) {
-		// preserve selection
-		ISelection selection = getSelection();
-		boolean handled = ((PDEFormPage) getActivePageInstance())
-				.performGlobalAction(id);
-		if (!handled) {
-			IFormPage page = getActivePageInstance();
-			if (page instanceof PDEFormPage) {
-				if (id.equals(ActionFactory.UNDO.getId())) {
-					inputContextManager.undo();
-					return;
-				}
-				if (id.equals(ActionFactory.REDO.getId())) {
-					inputContextManager.redo();
-					return;
-				}
-				if (id.equals(ActionFactory.CUT.getId())
-						|| id.equals(ActionFactory.COPY.getId())) {
-					copyToClipboard(selection);
-					return;
-				}
-			}
-		}
-	}
-	private void copyToClipboard(ISelection selection) {
-		Object[] objects = null;
-		String textVersion = null;		
-		if (selection instanceof IStructuredSelection) {
-			IStructuredSelection ssel = (IStructuredSelection) selection;
-			if (ssel == null || ssel.size() == 0)
-				return;
-			objects = ssel.toArray();
-			StringWriter writer = new StringWriter();
-			PrintWriter pwriter = new PrintWriter(writer);
-			Class objClass = null;
-			for (int i = 0; i < objects.length; i++) {
-				Object obj = objects[i];
-				if (objClass == null)
-					objClass = obj.getClass();
-				else if (objClass.equals(obj.getClass()) == false)
-					return;
-				if (obj instanceof IWritable) {
-					((IWritable) obj).write("", pwriter); //$NON-NLS-1$
-				}
-			}
-			pwriter.flush();
-			textVersion = writer.toString();
-			try {
-				pwriter.close();
-				writer.close();
-			} catch (IOException e) {
-			}
-		} else if (selection instanceof ITextSelection) {
-			textVersion = ((ITextSelection) selection).getText();
-		}
-		if ((textVersion == null || textVersion.length() == 0) && objects == null)
-			return;
-		// set the clipboard contents
-		Object[]o = null;
-		Transfer[] t = null;
-		if (objects == null ) {
-			o = new Object[] {textVersion};
-			t = new Transfer[] {TextTransfer.getInstance()};
-		} else if (textVersion == null || textVersion.length() == 0) {
-			o = new Object[] {objects};
-			t = new Transfer[] {ModelDataTransfer.getInstance()};
-		} else {
-			o = new Object[] {objects, textVersion};
-			t = new Transfer[] {ModelDataTransfer.getInstance(), TextTransfer.getInstance()};
-		}
-		clipboard.setContents(o, t);
-	}
-	public boolean canPasteFromClipboard() {
-		IFormPage page = getActivePageInstance();
-		if (page instanceof PDEFormPage) {
-			return ((PDEFormPage) page).canPaste(getClipboard());
-		}
-		return false;
-	}
-	public boolean canCopy(ISelection selection) {
-		if (selection == null)
-			return false;
-		if (selection instanceof IStructuredSelection)
-			return !selection.isEmpty();
-		if (selection instanceof ITextSelection) {
-			ITextSelection textSelection = (ITextSelection) selection;
-			return textSelection.getLength() > 0;
-		}
-		return false;
-	}
-	void updateUndo(IAction undoAction, IAction redoAction) {
-		IModelUndoManager undoManager = inputContextManager.getUndoManager();
-		if (undoManager != null)
-			undoManager.setActions(undoAction, redoAction);
-	}
-	void synchronizeOutlinePage() {
-		if (getFormOutline() != null) {
-			getFormOutline().setSelection(getSelection());
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.search.ui.text.ISearchEditorAccess#getDocument(org.eclipse.search.ui.text.Match)
-	 */
-	public IDocument getDocument(Match match) {
-		InputContext context = getInputContext(match.getElement());
-		return context == null ? null : context.getDocumentProvider().getDocument(context.getInput());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.search.ui.text.ISearchEditorAccess#getAnnotationModel(org.eclipse.search.ui.text.Match)
-	 */
-	public IAnnotationModel getAnnotationModel(Match match) {
-		InputContext context = getInputContext(match.getElement());
-		return context == null ? null : context.getDocumentProvider().getAnnotationModel(context.getInput());
-	}
-	
-	protected abstract InputContext getInputContext(Object object);
-	
-	public int getOrientation() {
-		return SWT.LEFT_TO_RIGHT;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEFormEditorContributor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEFormEditorContributor.java
deleted file mode 100644
index 57e0739..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEFormEditorContributor.java
+++ /dev/null

@@ -1,307 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-import java.util.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.ui.*;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.editors.text.TextEditorActionContributor;
-import org.eclipse.ui.forms.editor.IFormPage;
-import org.eclipse.ui.ide.IDEActionFactory;
-import org.eclipse.ui.part.MultiPageEditorActionBarContributor;
-import org.eclipse.ui.texteditor.IUpdate;
-
-public class PDEFormEditorContributor
-		extends
-			MultiPageEditorActionBarContributor {
-	private SubActionBars sourceActionBars;
-	private PDEFormEditor editor;
-	private IFormPage page;
-	private SaveAction saveAction;
-	private RevertAction revertAction;
-	private ClipboardAction cutAction;
-	private ClipboardAction copyAction;
-	private ClipboardAction pasteAction;
-	private Hashtable globalActions = new Hashtable();
-	private TextEditorActionContributor sourceContributor;
-	class GlobalAction extends Action implements IUpdate {
-		private String id;
-		public GlobalAction(String id) {
-			this.id = id;
-		}
-		public void run() {
-			editor.performGlobalAction(id);
-			updateSelectableActions(editor.getSelection());
-		}
-		public void update() {
-			getActionBars().updateActionBars();
-		}
-	}
-	class ClipboardAction extends GlobalAction {
-		public ClipboardAction(String id) {
-			super(id);
-			setEnabled(false);
-		}
-		public void selectionChanged(ISelection selection) {
-		}
-		public boolean isEditable() {
-			if (editor == null)
-				return false;
-			IBaseModel model = editor.getAggregateModel();
-			if (model instanceof IEditable)
-				return ((IEditable) model).isEditable();
-			return false;
-		}
-	}
-	class CutAction extends ClipboardAction {
-		public CutAction() {
-			super(ActionFactory.CUT.getId());
-			setText(PDEUIMessages.EditorActions_cut);
-		}
-		public void selectionChanged(ISelection selection) {
-			setEnabled(isEditable() && editor.canCopy(selection));
-		}
-	}
-	class CopyAction extends ClipboardAction {
-		public CopyAction() {
-			super(ActionFactory.COPY.getId());
-			setText(PDEUIMessages.EditorActions_copy);
-		}
-		public void selectionChanged(ISelection selection) {
-			setEnabled(editor.canCopy(selection));
-		}
-	}
-	class PasteAction extends ClipboardAction {
-		public PasteAction() {
-			super(ActionFactory.PASTE.getId());
-			setText(PDEUIMessages.EditorActions_paste);
-			//selectionChanged(null);
-		}
-		public void selectionChanged(ISelection selection) {
-			setEnabled(isEditable() && editor.canPasteFromClipboard());
-		}
-	}
-	class SaveAction extends Action implements IUpdate {
-		public SaveAction() {
-		}
-		public void run() {
-			if (editor != null)
-				PDEPlugin.getActivePage().saveEditor(editor, false);
-		}
-		public void update() {
-			if (editor != null) {
-				setEnabled(editor.isDirty());
-			} else
-				setEnabled(false);
-		}
-	}
-	class RevertAction extends Action implements IUpdate {
-		public RevertAction() {
-		}
-		public void run() {
-			if (editor != null)
-				editor.doRevert();
-		}
-		public void update() {
-			if (editor != null) {
-				setEnabled(editor.isDirty());
-			} else
-				setEnabled(false);
-		}
-	}
-	public PDEFormEditorContributor(String menuName) {
-		sourceContributor = new TextEditorActionContributor();
-		makeActions();
-	}
-	
-	public IEditorActionBarContributor getSourceContributor() {
-		return sourceContributor;
-	}
-	private void addGlobalAction(String id) {
-		GlobalAction action = new GlobalAction(id);
-		addGlobalAction(id, action);
-	}
-	private void addGlobalAction(String id, Action action) {
-		globalActions.put(id, action);
-	}
-	public void addClipboardActions(IMenuManager mng) {
-		mng.add(cutAction);
-		mng.add(copyAction);
-		mng.add(pasteAction);
-		mng.add(new Separator());
-		mng.add(revertAction);
-	}
-	public void contextMenuAboutToShow(IMenuManager mng) {
-		contextMenuAboutToShow(mng, true);
-	}
-	public void contextMenuAboutToShow(IMenuManager mng, boolean addClipboard) {
-		if (editor != null)
-			updateSelectableActions(editor.getSelection());
-		if (addClipboard) {
-			addClipboardActions(mng);
-		}
-		mng.add(saveAction);
-	}
-	public void contributeToMenu(IMenuManager mm) {
-	}
-	public void contributeToStatusLine(IStatusLineManager slm) {
-	}
-	public void contributeToToolBar(IToolBarManager tbm) {
-	}
-	public void contributeToCoolBar(ICoolBarManager cbm) {
-	}
-	public void dispose() {
-		sourceContributor.dispose();
-		sourceActionBars.dispose();
-		super.dispose();
-	}
-	public void init(IActionBars bars) {
-		super.init(bars);
-		sourceActionBars = new SubActionBars(bars);
-		sourceContributor.init(sourceActionBars);
-	}
-	
-	public PDEFormEditor getEditor() {
-		return editor;
-	}
-	public IAction getGlobalAction(String id) {
-		return (IAction) globalActions.get(id);
-	}
-	public IAction getSaveAction() {
-		return saveAction;
-	}
-	public IAction getRevertAction() {
-		return revertAction;
-	}
-	public IStatusLineManager getStatusLineManager() {
-		return getActionBars().getStatusLineManager();
-	}
-	protected void makeActions() {
-		// clipboard actions
-		cutAction = new CutAction();
-		copyAction = new CopyAction();
-		pasteAction = new PasteAction();
-		addGlobalAction(ActionFactory.CUT.getId(), cutAction);
-		addGlobalAction(ActionFactory.COPY.getId(), copyAction);
-		addGlobalAction(ActionFactory.PASTE.getId(), pasteAction);
-		addGlobalAction(ActionFactory.DELETE.getId());
-		// undo/redo
-		addGlobalAction(ActionFactory.UNDO.getId());
-		addGlobalAction(ActionFactory.REDO.getId());
-		// select/find
-		addGlobalAction(ActionFactory.SELECT_ALL.getId());
-		addGlobalAction(ActionFactory.FIND.getId());
-		// bookmark
-		addGlobalAction(IDEActionFactory.BOOKMARK.getId());
-		// save/revert
-		saveAction = new SaveAction();
-		saveAction.setText(PDEUIMessages.EditorActions_save);
-		revertAction = new RevertAction();
-		revertAction.setText(PDEUIMessages.EditorActions_revert);
-	}
-	public void setActiveEditor(IEditorPart targetEditor) {
-		//if (editor != null)
-		//	editor.updateUndo(null, null);
-		if (targetEditor instanceof PDESourcePage) {
-			// Fixing the 'goto line' problem -
-			// the action is thinking that source page
-			// is a standalone editor and tries to activate it
-			// #19361
-			PDESourcePage page = (PDESourcePage) targetEditor;
-			PDEPlugin.getActivePage().activate(page.getEditor());
-			return;
-		}
-		if (targetEditor instanceof PDEFormEditor)
-			this.editor = (PDEFormEditor) targetEditor;
-		else
-			return;
-		editor.updateUndo(getGlobalAction(ActionFactory.UNDO.getId()),
-				getGlobalAction(ActionFactory.REDO.getId()));
-		IEditorPart page = editor.getActiveEditor();
-		setActivePage(page);
-		updateSelectableActions(editor.getSelection());
-	}
-	public void setActivePage(IEditorPart newEditor) {
-		if (editor == null)
-			return;
-		IFormPage oldPage = page;
-		IFormPage newPage = editor.getActivePageInstance();
-		this.page = newPage;
-		if (newPage == null)
-			return;
-		updateActions();
-		if (oldPage != null && oldPage.isEditor() == false
-				&& newPage.isEditor() == false) {
-			getActionBars().updateActionBars();
-			return;
-		}
-		PDESourcePage sourcePage = null;
-		if (newPage instanceof PDESourcePage)
-			sourcePage = (PDESourcePage) newPage;
-		if (sourcePage != null && sourcePage.equals(oldPage))
-			return;
-		sourceContributor.setActiveEditor(sourcePage);
-		setSourceActionBarsActive(sourcePage != null);
-	}
-	private void setSourceActionBarsActive(boolean active) {
-		IActionBars rootBars = getActionBars();
-		rootBars.clearGlobalActionHandlers();
-		//PlatformUI.getWorkbench().getCommandSupport().removeHandlerSubmissions(new ArrayList());
-		rootBars.updateActionBars();
-		if (active) {
-			sourceActionBars.activate();
-			Map handlers = sourceActionBars.getGlobalActionHandlers();
-			if (handlers != null) {
-				Set keys = handlers.keySet();
-				for (Iterator iter = keys.iterator(); iter.hasNext();) {
-					String id = (String) iter.next();
-					rootBars.setGlobalActionHandler(id, (IAction) handlers
-							.get(id));
-				}
-			}
-		} else {
-			sourceActionBars.deactivate();
-			registerGlobalActionHandlers();
-		}
-		rootBars.updateActionBars();
-	}
-	private void registerGlobalActionHandlers() {
-		registerGlobalAction(ActionFactory.DELETE.getId());
-		registerGlobalAction(ActionFactory.UNDO.getId());
-		registerGlobalAction(ActionFactory.REDO.getId());
-		registerGlobalAction(ActionFactory.CUT.getId());
-		registerGlobalAction(ActionFactory.COPY.getId());
-		registerGlobalAction(ActionFactory.PASTE.getId());
-		registerGlobalAction(ActionFactory.SELECT_ALL.getId());
-		registerGlobalAction(ActionFactory.FIND.getId());
-		// hook revert
-		getActionBars().setGlobalActionHandler(ActionFactory.REVERT.getId(), revertAction);
-	}
-	private void registerGlobalAction(String id) {
-		IAction action = getGlobalAction(id);
-		getActionBars().setGlobalActionHandler(id, action);
-	}
-	public void updateActions() {
-		saveAction.update();
-		revertAction.update();
-	}
-	public void updateSelectableActions(ISelection selection) {
-		if (editor != null) {
-			cutAction.selectionChanged(selection);
-			copyAction.selectionChanged(selection);
-			pasteAction.selectionChanged(selection);
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEFormPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEFormPage.java
deleted file mode 100644
index bba6675..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEFormPage.java
+++ /dev/null

@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.pde.core.IBaseModel;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.forms.AbstractFormPart;
-import org.eclipse.ui.forms.IFormPart;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.editor.FormPage;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-
-public abstract class PDEFormPage extends FormPage {
-	/**
-	 * @param editor
-	 * @param id
-	 * @param title
-	 */
-	public PDEFormPage(FormEditor editor, String id, String title) {
-		super(editor, id, title);
-	}
-
-	protected void createFormContent(IManagedForm managedForm) {
-		final ScrolledForm form = managedForm.getForm();
-		//form.setBackgroundImage(PDEPlugin.getDefault().getLabelProvider().get(
-		//		PDEPluginImages.DESC_FORM_BANNER));
-		final String href = getHelpResource();
-		if (href != null) {
-			IToolBarManager manager = form.getToolBarManager();
-			Action helpAction = new Action("help") { //$NON-NLS-1$
-				public void run() {
-					BusyIndicator.showWhile(form.getDisplay(), new Runnable() {
-						public void run() {
-							PlatformUI.getWorkbench().getHelpSystem().displayHelpResource(href);
-						}
-					});
-				}
-			};
-			helpAction.setToolTipText(PDEUIMessages.PDEFormPage_help); 
-			helpAction.setImageDescriptor(PDEPluginImages.DESC_HELP);
-			manager.add(helpAction);
-			form.updateToolBar();
-		}
-	}
-	public PDEFormEditor getPDEEditor() {
-		return (PDEFormEditor) getEditor();
-	}
-	protected String getHelpResource() {
-		return null;
-	}
-	public IBaseModel getModel() {
-		return getPDEEditor().getAggregateModel();
-	}
-	public void contextMenuAboutToShow(IMenuManager menu) {
-	}
-	
-	protected Control getFocusControl() {
-		IManagedForm form = getManagedForm();
-		if (form == null)
-			return null;
-		Control control = form.getForm();
-		if (control == null || control.isDisposed())
-			return null;
-		Display display = control.getDisplay();
-		Control focusControl = display.getFocusControl();
-		if (focusControl == null || focusControl.isDisposed())
-			return null;
-		return focusControl;
-	}
-	public boolean performGlobalAction(String actionId) {
-		Control focusControl = getFocusControl();
-		if (focusControl == null)
-			return false;
-
-		if (canPerformDirectly(actionId, focusControl))
-			return true;
-		AbstractFormPart focusPart = getFocusSection();
-		if (focusPart!=null) {
-			if (focusPart instanceof PDESection)
-				return ((PDESection)focusPart).doGlobalAction(actionId);
-			if (focusPart instanceof PDEDetails)
-				return ((PDEDetails)focusPart).doGlobalAction(actionId);
-		}
-		return false;
-	}
-
-	public boolean canPaste(Clipboard clipboard) {
-		AbstractFormPart focusPart = getFocusSection();
-		if (focusPart != null) {
-			if (focusPart instanceof PDESection) {
-				return ((PDESection)focusPart).canPaste(clipboard);
-			}
-			if (focusPart instanceof PDEDetails) {
-				return ((PDEDetails)focusPart).canPaste(clipboard);
-			}
-		}
-		return false;
-	}
-	
-	private AbstractFormPart getFocusSection() {
-		Control focusControl = getFocusControl();
-		if (focusControl == null)
-			return null;
-		Composite parent = focusControl.getParent();
-		AbstractFormPart targetPart = null;
-		while (parent != null) {
-			Object data = parent.getData("part"); //$NON-NLS-1$
-			if (data != null && data instanceof AbstractFormPart) {
-				targetPart = (AbstractFormPart) data;
-				break;
-			}
-			parent = parent.getParent();
-		}
-		return targetPart;
-	}
-	public IPropertySheetPage getPropertySheetPage() {
-		return null;
-	}
-	protected boolean canPerformDirectly(String id, Control control) {
-		if (control instanceof Text) {
-			Text text = (Text) control;
-			if (id.equals(ActionFactory.CUT.getId())) {
-				text.cut();
-				return true;
-			}
-			if (id.equals(ActionFactory.COPY.getId())) {
-				text.copy();
-				return true;
-			}
-			if (id.equals(ActionFactory.PASTE.getId())) {
-				text.paste();
-				return true;
-			}
-			if (id.equals(ActionFactory.SELECT_ALL.getId())) {
-				text.selectAll();
-				return true;
-			}
-			if (id.equals(ActionFactory.DELETE.getId())) {
-				int count = text.getSelectionCount();
-				if (count == 0) {
-					int caretPos = text.getCaretPosition();
-					text.setSelection(caretPos, caretPos + 1);
-				}
-				text.insert(""); //$NON-NLS-1$
-				return true;
-			}
-		}
-		return false;
-	}	
-	public void cancelEdit() {
-		IFormPart [] parts = getManagedForm().getParts();
-		for (int i=0; i<parts.length; i++) {
-			IFormPart part = parts[i];
-			if (part instanceof IContextPart)
-				((IContextPart)part).cancelEdit();
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEMasterDetailsBlock.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEMasterDetailsBlock.java
deleted file mode 100644
index ac7ba07..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEMasterDetailsBlock.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.*;
-import org.eclipse.ui.forms.widgets.*;
-
-public abstract class PDEMasterDetailsBlock extends MasterDetailsBlock {
-	private PDEFormPage page;
-	
-	public PDEMasterDetailsBlock(PDEFormPage page) {
-		this.page = page;
-	}
-	
-	public PDEFormPage getPage() {
-		return page;
-	}
-	
-	protected abstract PDESection createMasterSection(IManagedForm managedForm, Composite parent);
-
-	protected void createMasterPart(final IManagedForm managedForm,
-			Composite parent) {
-		PDESection section = createMasterSection(managedForm, parent);
-		managedForm.addPart(section);
-		Section sc = section.getSection();
-		sc.marginWidth = 5;
-		sc.marginHeight = 5;
-	}
-	protected void createToolBarActions(IManagedForm managedForm) {
-		final ScrolledForm form = managedForm.getForm();
-	
-		Action haction = new Action("hor", Action.AS_RADIO_BUTTON) { //$NON-NLS-1$
-			public void run() {
-				sashForm.setOrientation(SWT.HORIZONTAL);
-				form.reflow(true);
-			}
-		};
-		haction.setChecked(true);
-		haction.setToolTipText(PDEUIMessages.DetailsBlock_horizontal); 
-		haction.setImageDescriptor(PDEPluginImages.DESC_HORIZONTAL);
-		haction.setDisabledImageDescriptor(PDEPluginImages.DESC_HORIZONTAL_DISABLED);
-
-		Action vaction = new Action("ver", Action.AS_RADIO_BUTTON) { //$NON-NLS-1$
-			public void run() {
-				sashForm.setOrientation(SWT.VERTICAL);
-				form.reflow(true);
-			}
-		};
-		vaction.setChecked(false);
-		vaction.setToolTipText(PDEUIMessages.DetailsBlock_vertical); 
-		vaction.setImageDescriptor(PDEPluginImages.DESC_VERTICAL);
-		vaction.setDisabledImageDescriptor(PDEPluginImages.DESC_VERTICAL_DISABLED);
-		form.getToolBarManager().add(haction);
-		form.getToolBarManager().add(vaction);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEMultiPageContentOutline.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEMultiPageContentOutline.java
deleted file mode 100644
index 1ec258e..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEMultiPageContentOutline.java
+++ /dev/null

@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-
-import java.util.ArrayList;
-
-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.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.IPreferenceConstants;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.FocusListener;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.Page;
-import org.eclipse.ui.part.PageBook;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-
-public class PDEMultiPageContentOutline extends Page 
-	implements IContentOutlinePage, ISelectionProvider, ISelectionChangedListener, IPreferenceConstants {
-	private PageBook pagebook;
-	private ISelection selection;
-	private ArrayList listeners;
-	private ISortableContentOutlinePage currentPage;
-	private ISortableContentOutlinePage emptyPage;
-	private IActionBars actionBars;
-	private boolean sortingOn;
-	private PDEFormEditor editor;
-
-	public PDEMultiPageContentOutline(PDEFormEditor editor) {
-		this.editor=editor;
-		listeners = new ArrayList();
-		sortingOn= PDEPlugin.getDefault().getPreferenceStore().getBoolean("PDEMultiPageContentOutline.SortingAction.isChecked"); //$NON-NLS-1$
-		
-	}
-	
-	public void addFocusListener(FocusListener listener) {
-	}
-	public void addSelectionChangedListener(ISelectionChangedListener listener) {
-		listeners.add(listener);
-	}
-	public void createControl(Composite parent) {
-		pagebook = new PageBook(parent, SWT.NONE);
-	}
-
-	public void dispose() {
-		if (pagebook != null && !pagebook.isDisposed())
-			pagebook.dispose();
-		if (emptyPage!=null) {
-			emptyPage.dispose();
-			emptyPage=null;
-		}
-		pagebook = null;
-		listeners = null;
-	}
-
-	public boolean isDisposed() {
-		return listeners==null;
-	}
-
-	public Control getControl() {
-		return pagebook;
-	}
-	public PageBook getPagebook() {
-		return pagebook;
-	}
-	public ISelection getSelection() {
-		return selection;
-	}
-	public void makeContributions(
-		IMenuManager menuManager,
-		IToolBarManager toolBarManager,
-		IStatusLineManager statusLineManager) {
-	}
-	public void removeFocusListener(FocusListener listener) {
-	}
-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
-		listeners.remove(listener);
-	}
-	public void selectionChanged(SelectionChangedEvent event) {
-		setSelection(event.getSelection());
-	}
-
-	public void setActionBars(IActionBars actionBars) {
-		this.actionBars = actionBars;
-		registerToolbarActions(actionBars);
-		if (currentPage != null)
-			setPageActive(currentPage);
-
-	}
-	public IActionBars getActionBars() {
-		return actionBars;
-	}
-	public void setFocus() {
-		if (currentPage != null)
-			currentPage.setFocus();
-	}
-	private ISortableContentOutlinePage getEmptyPage() {
-		if (emptyPage==null)
-			emptyPage = new EmptyOutlinePage();
-		return emptyPage;
-	}
-	public void setPageActive(ISortableContentOutlinePage page) {
-		if (page==null) {
-			page = getEmptyPage();
-		}
-		if (currentPage != null) {
-			currentPage.removeSelectionChangedListener(this);
-		}
-		//page.init(getSite());
-		page.sort(sortingOn);
-		page.addSelectionChangedListener(this);
-		this.currentPage = page;
-		if (pagebook == null) {
-			// still not being made
-			return;
-		}
-		Control control = page.getControl();
-		if (control == null || control.isDisposed()) {
-			// first time
-			page.createControl(pagebook);
-			page.setActionBars(getActionBars());			
-			control = page.getControl();
-		}
-		pagebook.showPage(control);
-		this.currentPage = page;
-	}
-	/**
-	 * Set the selection.
-	 */
-	public void setSelection(ISelection selection) {
-		this.selection =selection;
-		if (listeners == null)
-			return;
-		SelectionChangedEvent e = new SelectionChangedEvent(this, selection);
-		for (int i=0; i<listeners.size(); i++) {
-			((ISelectionChangedListener)listeners.get(i)).selectionChanged(e);
-		}	
-	}
-	private void registerToolbarActions(IActionBars actionBars) {
-		
-		IToolBarManager toolBarManager= actionBars.getToolBarManager();
-		if (toolBarManager != null) {	
-			toolBarManager.add(new ToggleLinkWithEditorAction(editor));
-			toolBarManager.add(new SortingAction());
-		}
-	}
-	
-	class SortingAction extends Action {
-		
-		public SortingAction() {
-			super();
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.OUTLINE_SORT_ACTION);
-			setText(PDEUIMessages.PDEMultiPageContentOutline_SortingAction_label); 
-			setImageDescriptor(PDEPluginImages.DESC_ALPHAB_SORT_CO);
-			setDisabledImageDescriptor(PDEPluginImages.DESC_ALPHAB_SORT_CO_DISABLED);
-			setToolTipText(PDEUIMessages.PDEMultiPageContentOutline_SortingAction_tooltip); 
-			setDescription(PDEUIMessages.PDEMultiPageContentOutline_SortingAction_description); 
-			setChecked(sortingOn);
-		}
-		
-		public void run() {
-			setChecked(isChecked());
-			valueChanged(isChecked());
-		}
-		private void valueChanged(final boolean on) {
-			sortingOn=on;
-			if(currentPage!=null)
-				currentPage.sort(on);
-			PDEPlugin.getDefault().getPreferenceStore().setValue("PDEMultiPageContentOutline.SortingAction.isChecked", on); //$NON-NLS-1$
-		}
-		
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEMultiPagePropertySheet.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEMultiPagePropertySheet.java
deleted file mode 100644
index 756f9dd..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDEMultiPagePropertySheet.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-
-import org.eclipse.ui.*;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.ui.part.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.views.properties.*;
-import org.eclipse.swt.*;
-import java.util.*;
-
-public class PDEMultiPagePropertySheet implements IPropertySheetPage {
-	private PageBook pagebook;
-	private Hashtable recMap = new Hashtable();
-	private PropertySheetPage defaultPage;
-	private IActionBars actionBars;
-	private IPropertySheetPage currentPage;
-	private boolean disposed = false;
-
-	class PageRec {
-		IPropertySheetPage page;
-		SubActionBars bars;
-		void setBarsActive(boolean active) {
-			if (active)
-				bars.activate();
-			else
-				bars.deactivate();
-		}
-		void dispose() {
-			if (bars!=null) {
-				bars.dispose();
-				bars = null;
-			}
-			if (page!=null) {
-				page.dispose();
-				page = null;
-			}
-		}
-	}
-
-	public PDEMultiPagePropertySheet() {
-		defaultPage = new PropertySheetPage();
-	}
-
-	public void createControl(Composite parent) {
-		disposed = false;
-		pagebook = new PageBook(parent, SWT.NULL);
-		defaultPage.createControl(pagebook);
-		if (currentPage != null)
-			setPageActive(currentPage);
-	}
-	private PageRec createPageRec(IPropertySheetPage page) {
-		if (actionBars == null)
-			return null;
-		PageRec rec = new PageRec();
-		rec.page = page;
-
-		rec.bars = new SubActionBars(actionBars);
-		getPageControl(page);
-
-		page.setActionBars(rec.bars);
-		recMap.put(page, rec);
-		return rec;
-	}
-	public void dispose() {
-		updateActionBars();
-		
-		for (Enumeration enm=recMap.elements(); enm.hasMoreElements();) {
-			PageRec rec = (PageRec)enm.nextElement();
-			rec.dispose();
-		}
-		recMap.clear();
-
-		if (pagebook != null && !pagebook.isDisposed()) {
-			pagebook.dispose();
-		}
-		if (defaultPage!=null) {
-			defaultPage.dispose();
-			defaultPage=null;
-		}
-		pagebook = null;
-		disposed = true;
-	}
-
-	public boolean isDisposed() {
-		return disposed;
-	}
-
-	public Control getControl() {
-		return pagebook;
-	}
-	
-	public void closeActiveEditor() {
-		if (currentPage==null) return;
-	}
-	
-	private Control getPageControl(IPropertySheetPage page) {
-		Control control = page.getControl();
-		if (control == null || control.isDisposed()) {
-			// first time
-			page.createControl(pagebook);
-			control = page.getControl();
-		}
-		return control;
-	}
-	public void selectionChanged(IWorkbenchPart part, ISelection sel) {
-		if (currentPage != null)
-			currentPage.selectionChanged(part, sel);
-	}
-	public void setActionBars(IActionBars bars) {
-		this.actionBars = bars;
-
-		createPageRec(defaultPage);
-
-		if (currentPage != null) {
-			PageRec rec = createPageRec(currentPage);
-			setPageActive(rec);
-			updateActionBars();
-		}
-	}
-	public void setDefaultPageActive() {
-		setPageActive(defaultPage);
-	}
-	public void setFocus() {
-		if (currentPage != null)
-			currentPage.setFocus();
-	}
-	private void setPageActive(PageRec pageRec) {
-		IPropertySheetPage page = pageRec.page;
-		Control control = getPageControl(page);
-		pagebook.showPage(control);
-		pageRec.setBarsActive(true);
-	}
-	public void setPageActive(IPropertySheetPage page) {
-		IPropertySheetPage oldPage = currentPage;
-		this.currentPage = page;
-		if (pagebook == null) {
-			// still not being made
-			return;
-		}
-		if (oldPage != null) {
-			PageRec oldRec = (PageRec) recMap.get(oldPage);
-			if (oldRec != null) {
-				oldRec.setBarsActive(false);
-			}
-		}
-		PageRec rec = (PageRec) recMap.get(page);
-		if (rec == null) {
-			rec = createPageRec(page);
-		}
-		if (rec != null) {
-			setPageActive(rec);
-			updateActionBars();
-		}
-	}
-	private void updateActionBars() {
-		refreshGlobalActionHandlers();
-		actionBars.updateActionBars();
-	}
-	private void refreshGlobalActionHandlers() {
-		// Clear old actions.
-		actionBars.clearGlobalActionHandlers();
-
-		// Set new actions.
-		if (recMap == null || currentPage == null)
-			return;
-		PageRec activeRec = (PageRec) recMap.get(currentPage);
-		Map newActionHandlers = activeRec.bars.getGlobalActionHandlers();
-		if (newActionHandlers != null) {
-			Set keys = newActionHandlers.entrySet();
-			Iterator iter = keys.iterator();
-			while (iter.hasNext()) {
-				Map.Entry entry = (Map.Entry) iter.next();
-				actionBars.setGlobalActionHandler(
-					(String) entry.getKey(),
-					(IAction) entry.getValue());
-			}
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDESection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDESection.java
deleted file mode 100644
index 7453c53..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDESection.java
+++ /dev/null

@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-
-import org.eclipse.pde.core.*;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.SectionPart;
-import org.eclipse.ui.forms.widgets.*;
-import org.eclipse.ui.forms.widgets.Section;
-
-public abstract class PDESection extends SectionPart implements IModelChangedListener, IContextPart {
-	public static final int CLIENT_VSPACING = 4;
-	private PDEFormPage page;
-	public PDESection(PDEFormPage page, Composite parent, int style) {
-		this(page, parent, style, true);
-	}	
-	/**
-	 * @param section
-	 *	 
-	 */
-	public PDESection(PDEFormPage page, Composite parent, int style, boolean titleBar) {
-		super(parent, page.getManagedForm().getToolkit(), titleBar?(ExpandableComposite.TITLE_BAR | style): style);
-		this.page = page;
-		initialize(page.getManagedForm());
-		getSection().clientVerticalSpacing = CLIENT_VSPACING;
-		getSection().setData("part", this); //$NON-NLS-1$
-		//createClient(getSection(), page.getManagedForm().getToolkit());
-	}
-	
-	protected abstract void createClient(Section section, FormToolkit toolkit);
-
-	public PDEFormPage getPage() {
-		return page;
-	}
-	
-	public boolean doGlobalAction(String actionId) {
-		return false;
-	}
-
-	public void modelChanged(IModelChangedEvent e) {
-		if (e.getChangeType()==IModelChangedEvent.WORLD_CHANGED)
-			markStale();
-	}
-	
-	public String getContextId() {
-		return null;
-	}
-	public void fireSaveNeeded() {
-		markDirty();
-		if (getContextId()!=null)
-			getPage().getPDEEditor().fireSaveNeeded(getContextId(), false);
-	}
-	public boolean isEditable() {
-		return getPage().getPDEEditor().getAggregateModel().isEditable();
-	}
-	public boolean canPaste(Clipboard clipboard) {
-		return false;
-	}
-	public void cancelEdit() {
-		super.refresh();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDESourcePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDESourcePage.java
deleted file mode 100644
index 90b0b02..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PDESourcePage.java
+++ /dev/null

@@ -1,323 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 26, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.pde.internal.ui.editor;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.IPostSelectionProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.editor.context.InputContext;
-import org.eclipse.pde.internal.ui.model.IDocumentRange;
-import org.eclipse.pde.internal.ui.model.IEditingModel;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.editors.text.EditorsUI;
-import org.eclipse.ui.editors.text.TextEditor;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.editor.IFormPage;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.ide.IGotoMarker;
-import org.eclipse.ui.texteditor.ChainedPreferenceStore;
-import org.eclipse.ui.texteditor.DefaultRangeIndicator;
-
-public abstract class PDESourcePage extends TextEditor implements IFormPage, IGotoMarker {
-	/**
-	 * Updates the OutlinePage selection and this editor's range indicator.
-	 * 
-	 * @since 3.0
-	 */
-	private class PDESourcePageChangedListener implements
-			ISelectionChangedListener {
-
-		/**
-		 * Installs this selection changed listener with the given selection
-		 * provider. If the selection provider is a post selection provider,
-		 * post selection changed events are the preferred choice, otherwise
-		 * normal selection changed events are requested.
-		 * 
-		 * @param selectionProvider
-		 */
-		public void install(ISelectionProvider selectionProvider) {
-			if (selectionProvider == null) {
-				return;
-			}
-
-			if (selectionProvider instanceof IPostSelectionProvider) {
-				IPostSelectionProvider provider = (IPostSelectionProvider) selectionProvider;
-				provider.addPostSelectionChangedListener(this);
-			} else {
-				selectionProvider.addSelectionChangedListener(this);
-			}
-		}
-
-		/*
-		 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
-		 */
-		public void selectionChanged(SelectionChangedEvent event) {
-			ISelection selection = event.getSelection();
-			if (!selection.isEmpty() && selection instanceof ITextSelection) {
-				IDocumentRange rangeElement = getRangeElement((ITextSelection) selection);
-				if (rangeElement != null) {
-					setHighlightRange(rangeElement, false);
-				} else {
-					resetHighlightRange();
-				}
-				// notify outline page
-				if (PDEPlugin.getDefault().getPreferenceStore().getBoolean(
-						"ToggleLinkWithEditorAction.isChecked")) { //$NON-NLS-1$
-					outlinePage
-							.removeSelectionChangedListener(outlineSelectionChangedListener);
-					if (rangeElement != null) {
-						outlinePage.setSelection(new StructuredSelection(
-								rangeElement));
-					} else {
-						outlinePage.setSelection(StructuredSelection.EMPTY);
-					}
-					outlinePage
-							.addSelectionChangedListener(outlineSelectionChangedListener);
-				}
-			}
-		}
-
-		/**
-		 * Removes this selection changed listener from the given selection
-		 * provider.
-		 * 
-		 * @param selectionProviderstyle
-		 */
-		public void uninstall(ISelectionProvider selectionProvider) {
-			if (selectionProvider == null) {
-				return;
-			}
-
-			if (selectionProvider instanceof IPostSelectionProvider) {
-				IPostSelectionProvider provider = (IPostSelectionProvider) selectionProvider;
-				provider.removePostSelectionChangedListener(this);
-			} else {
-				selectionProvider.removeSelectionChangedListener(this);
-			}
-		}
-
-	}
-
-	/**
-	 * The editor selection changed listener.
-	 * 
-	 * @since 3.0
-	 */
-	private PDESourcePageChangedListener fEditorSelectionChangedListener;
-	private PDEFormEditor editor;
-	private Control control;
-	private int index;
-	private String id;
-	private InputContext inputContext;
-	private ISortableContentOutlinePage outlinePage;
-	private ISelectionChangedListener outlineSelectionChangedListener;
-	/**
-	 * 
-	 */
-	public PDESourcePage(PDEFormEditor editor, String id, String title) {
-		this.id = id;
-		initialize(editor);
-		IPreferenceStore[] stores = new IPreferenceStore[2];
-		stores[0] = PDEPlugin.getDefault().getPreferenceStore();
-		stores[1] = EditorsUI.getPreferenceStore();
-		setPreferenceStore(new ChainedPreferenceStore(stores));
-		setRangeIndicator(new DefaultRangeIndicator());
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.editor.IFormPage#initialize(org.eclipse.ui.forms.editor.FormEditor)
-	 */
-	public void initialize(FormEditor editor) {
-		this.editor = (PDEFormEditor)editor;
-	}
-	public void dispose() {
-		if (fEditorSelectionChangedListener != null)  {
-			fEditorSelectionChangedListener.uninstall(getSelectionProvider());
-			fEditorSelectionChangedListener= null;
-		}
-		if (outlinePage != null) {
-			outlinePage.dispose();
-			outlinePage = null;
-		}
-		super.dispose();
-	}
-
-	protected void editorSaved() {
-		super.editorSaved();
-	}
-	
-	protected abstract ILabelProvider createOutlineLabelProvider();
-	protected abstract ITreeContentProvider createOutlineContentProvider();
-	protected abstract ViewerSorter createOutlineSorter();
-	protected abstract void outlineSelectionChanged(SelectionChangedEvent e);
-	protected ViewerSorter createDefaultOutlineSorter() {
-		return null;
-	}
-	protected ISortableContentOutlinePage createOutlinePage() {
-		SourceOutlinePage sourceOutlinePage=
-		new SourceOutlinePage(
-				(IEditingModel) getInputContext().getModel(),
-				createOutlineLabelProvider(), createOutlineContentProvider(),
-				createDefaultOutlineSorter(), createOutlineSorter());
-		outlinePage = sourceOutlinePage;
-		outlineSelectionChangedListener = new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				outlineSelectionChanged(event);
-			}
-		};
-		outlinePage.addSelectionChangedListener(outlineSelectionChangedListener);
-		getSelectionProvider().addSelectionChangedListener(sourceOutlinePage);
-		fEditorSelectionChangedListener= new PDESourcePageChangedListener();
-		fEditorSelectionChangedListener.install(getSelectionProvider());
-		return outlinePage;
-	}
-
-	public ISortableContentOutlinePage getContentOutline() {
-		if (outlinePage==null)
-			outlinePage = createOutlinePage();
-		return outlinePage;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.editor.IFormPage#getEditor()
-	 */
-	public FormEditor getEditor() {
-		return editor;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.editor.IFormPage#getManagedForm()
-	 */
-	public IManagedForm getManagedForm() {
-		// not a form page
-		return null;
-	}
-	protected void firePropertyChange(int type) {
-		if (type == PROP_DIRTY) {
-			editor.fireSaveNeeded(getEditorInput(), true);
-		} else
-			super.firePropertyChange(type);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.editor.IFormPage#setActive(boolean)
-	 */
-	public void setActive(boolean active) {
-		inputContext.setSourceEditingMode(active);
-	}
-
-	public boolean canLeaveThePage() {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.editor.IFormPage#isActive()
-	 */
-	public boolean isActive() {
-		return this.equals(editor.getActivePageInstance());
-	}
-	public void createPartControl(Composite parent) {
-		super.createPartControl(parent);
-		Control[] children = parent.getChildren();
-		control = children[children.length - 1];
-		
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(control, IHelpContextIds.MANIFEST_SOURCE_PAGE);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.editor.IFormPage#getPartControl()
-	 */
-	public Control getPartControl() {
-		return control;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.editor.IFormPage#getId()
-	 */
-	public String getId() {
-		return id;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.editor.IFormPage#getIndex()
-	 */
-	public int getIndex() {
-		return index;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.editor.IFormPage#setIndex(int)
-	 */
-	public void setIndex(int index) {
-		this.index = index;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.editor.IFormPage#isSource()
-	 */
-	public boolean isEditor() {
-		return true;
-	}
-	/**
-	 * @return Returns the inputContext.
-	 */
-	public InputContext getInputContext() {
-		return inputContext;
-	}
-	/**
-	 * @param inputContext The inputContext to set.
-	 */
-	public void setInputContext(InputContext inputContext) {
-		this.inputContext = inputContext;
-		setDocumentProvider(inputContext.getDocumentProvider());
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.editor.IFormPage#focusOn(java.lang.Object)
-	 */
-	public boolean selectReveal(Object object) {
-		if (object instanceof IMarker) {
-			IDE.gotoMarker(this, (IMarker)object);
-			return true;
-		}
-		return false;
-	}
-	
-	protected IDocumentRange getRangeElement(ITextSelection selection) {
-		return null;
-	}
-
-	public void setHighlightRange(IDocumentRange node, boolean moveCursor) {
-		ISourceViewer sourceViewer = getSourceViewer();
-		if (sourceViewer == null)
-			return;
-
-		IDocument document = sourceViewer.getDocument();
-		if (document == null)
-			return;
-
-		int offset = node.getOffset();
-		int length = node.getLength();
-		setHighlightRange(offset, length == -1 ? 1 : length, moveCursor);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PropertiesAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PropertiesAction.java
deleted file mode 100644
index cdd2022..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/PropertiesAction.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-import org.eclipse.jface.action.Action;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.ui.*;
-public class PropertiesAction extends Action {
-	private PDEFormEditor editor;
-	public PropertiesAction(PDEFormEditor editor) {
-		this.editor = editor;
-		setText(PDEUIMessages.Actions_properties_label);
-		setImageDescriptor(PDEPluginImages.DESC_PROPERTIES);
-		setDisabledImageDescriptor(PDEPluginImages.DESC_PROPERTIES_DISABLED);
-	}
-	public void run() {
-		try {
-			String viewId = IPageLayout.ID_PROP_SHEET;
-			IWorkbenchPage perspective = PDEPlugin.getActivePage();
-			IViewPart view = perspective.showView(viewId);
-			editor.updatePropertySheet(editor.getActivePageInstance());
-			perspective.activate(editor);
-			perspective.bringToTop(view);
-		} catch (PartInitException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/SourceOutlinePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/SourceOutlinePage.java
deleted file mode 100644
index 8e89f94..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/SourceOutlinePage.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.editor;
-
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.text.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.internal.ui.editor.text.*;
-import org.eclipse.pde.internal.ui.model.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.part.*;
-import org.eclipse.ui.views.contentoutline.*;
-
-/**
- * Content outline page for the XML editor.
- */
-public class SourceOutlinePage extends ContentOutlinePage implements IReconcilingParticipant, ISortableContentOutlinePage{
-	
-	private IEditingModel fModel;
-	private IBaseLabelProvider fLabelProvider;
-	private IContentProvider fContentProvider;
-	private ViewerSorter fDefaultSorter;
-	private ViewerSorter fViewerSorter;
-	private boolean sorted;
-	TreeViewer viewer;
-	
-	public SourceOutlinePage(IEditingModel model, IBaseLabelProvider lProvider,
-			IContentProvider cProvider, ViewerSorter defaultSorter,
-			ViewerSorter sorter) {
-		super();
-		fModel = model;
-		fLabelProvider = lProvider;
-		fContentProvider = cProvider;
-		fDefaultSorter = defaultSorter;
-		fViewerSorter = sorter;
-	}
-		
-	/**  
-	 * Creates the control for this outline page.
-	 */
-	public void createControl(Composite parent) {
-		super.createControl(parent);
-		viewer= getTreeViewer();
-		viewer.setContentProvider(fContentProvider);
-		viewer.setLabelProvider(fLabelProvider);
-		if(sorted)
-			viewer.setSorter(fViewerSorter);
-		else
-			viewer.setSorter(fDefaultSorter);
-		viewer.setInput(fModel);
-		viewer.expandAll();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.views.contentoutline.ContentOutlinePage#init(org.eclipse.ui.part.IPageSite)
-	 */
-	public void init(IPageSite pageSite) {
-		super.init(pageSite);
-	}
-	
-	public void makeContributions(
-			IMenuManager menuManager, 
-			IToolBarManager toolBarManager, 
-			IStatusLineManager statusLineManager) {
-		//Create actions and contribute into the provided managers
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.text.IReconcilingParticipant#reconciled(org.eclipse.jface.text.IDocument)
-	 */
-	public void reconciled(IDocument document) {
-		final Control control = getControl();
-		if (control == null)
-			return;
-		control.getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				if(control.isDisposed()){
-					return;
-				}
-				control.setRedraw(false);
-				getTreeViewer().refresh();
-				getTreeViewer().expandAll();
-				control.setRedraw(true);
-			}
-		});
-	}
-	public void sort (boolean sorting){
-		sorted = sorting;
-		if(viewer!=null)
-			if(sorting)
-				viewer.setSorter(fViewerSorter);
-			else
-				viewer.setSorter(fDefaultSorter);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/StorageDocumentProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/StorageDocumentProvider.java
deleted file mode 100644
index d62020e..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/StorageDocumentProvider.java
+++ /dev/null

@@ -1,57 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-
-import java.io.*;
-
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.*;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.ui.IStorageEditorInput;
-
-public class StorageDocumentProvider extends StreamDocumentProvider {
-
-	public StorageDocumentProvider(IDocumentPartitioner partitioner) {
-		this(partitioner, null);
-	}
-
-	public StorageDocumentProvider(
-		IDocumentPartitioner partitioner,
-		String encoding) {
-		super(partitioner, encoding);
-	}
-
-	protected IDocument createDocument(Object element) throws CoreException {
-		if (element instanceof IStorageEditorInput) {
-			IDocument document = createEmptyDocument();
-			IDocumentPartitioner part = getPartitioner();
-			if (part != null) {
-				part.connect(document);
-				document.setDocumentPartitioner(part);
-			}
-			IStorage storage = ((IStorageEditorInput)element).getStorage();
-			setDocumentContent(document, storage);
-			return document;
-		}
-		return null;
-	}
-	protected void setDocumentContent(IDocument document, IStorage storage) {
-		try {
-			InputStream contentStream = storage.getContents();
-			setDocumentContent(document, contentStream);
-			contentStream.close();
-		} catch (Exception e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/StreamDocumentProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/StreamDocumentProvider.java
deleted file mode 100644
index f9b15d5..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/StreamDocumentProvider.java
+++ /dev/null

@@ -1,99 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-
-import java.io.*;
-
-import org.eclipse.jface.operation.*;
-import org.eclipse.jface.text.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.text.source.*;
-import org.eclipse.ui.texteditor.*;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-
-public abstract class StreamDocumentProvider extends AbstractDocumentProvider {
-	private IDocumentPartitioner partitioner;
-
-	private String enc;
-
-	public StreamDocumentProvider(IDocumentPartitioner partitioner,
-			String encoding) {
-		this.partitioner = partitioner;
-		this.enc = encoding;
-	}
-
-	protected IDocumentPartitioner getPartitioner() {
-		return partitioner;
-	}
-
-	protected String getEncoding() {
-		return enc;
-	}
-
-	protected IAnnotationModel createAnnotationModel(Object element)
-			throws CoreException {
-		return new SystemFileMarkerAnnotationModel();
-	}
-
-	protected void doSaveDocument(IProgressMonitor monitor, Object element,
-			IDocument document, boolean force) throws CoreException {
-	}
-
-	protected void setDocumentContent(IDocument document,
-			InputStream contentStream) {
-		try {
-			Reader in;
-			if (enc == null)
-				in = new InputStreamReader(contentStream);
-			else
-				in = new InputStreamReader(contentStream, enc);
-			int chunkSize = contentStream.available();
-			StringBuffer buffer = new StringBuffer(chunkSize);
-			char[] readBuffer = new char[chunkSize];
-			int n = in.read(readBuffer);
-			while (n > 0) {
-				buffer.append(readBuffer);
-				n = in.read(readBuffer);
-			}
-			in.close();
-			document.set(buffer.toString());
-
-		} catch (IOException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	public long getSynchronizationStamp(Object element) {
-		return 0;
-	}
-
-	public long getModificationStamp(Object element) {
-		return 0;
-	}
-
-	public boolean isDeleted(Object element) {
-		return false;
-	}
-
-	protected IDocument createEmptyDocument() {
-		return new Document();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.texteditor.AbstractDocumentProvider#getOperationRunner(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected IRunnableContext getOperationRunner(IProgressMonitor monitor) {
-		// TODO figure out what this method does
-		return null;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/StructuredViewerSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/StructuredViewerSection.java
deleted file mode 100644
index 9ce1893..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/StructuredViewerSection.java
+++ /dev/null

@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.internal.ui.parts.*;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @version 	1.0
- * @author
- */
-public abstract class StructuredViewerSection extends PDESection {
-	protected StructuredViewerPart viewerPart;
-	/**
-	 * Constructor for StructuredViewerSection.
-	 * @param formPage
-	 */
-	public StructuredViewerSection(PDEFormPage formPage, Composite parent, int style, String [] buttonLabels) {
-		this(formPage, parent, style, true, buttonLabels);
-	}
-
-	/**
-	 * Constructor for StructuredViewerSection.
-	 * @param formPage
-	 */
-	public StructuredViewerSection(PDEFormPage formPage, Composite parent, int style, boolean titleBar, String [] buttonLabels) {
-		super(formPage, parent, style, titleBar);
-		viewerPart = createViewerPart(buttonLabels);
-		viewerPart.setMinimumSize(50, 50);
-		FormToolkit toolkit = formPage.getManagedForm().getToolkit();
-		createClient(getSection(), toolkit);
-	}
-
-	protected void createViewerPartControl(Composite parent, int style, int span, FormToolkit toolkit) {
-		viewerPart.createControl(parent, style, span, toolkit);
-		MenuManager popupMenuManager = new MenuManager();
-		IMenuListener listener = new IMenuListener() {
-			public void menuAboutToShow(IMenuManager mng) {
-				fillContextMenu(mng);
-			}
-		};
-		popupMenuManager.addMenuListener(listener);
-		popupMenuManager.setRemoveAllWhenShown(true);
-		Control control = viewerPart.getControl();
-		Menu menu = popupMenuManager.createContextMenu(control);
-		control.setMenu(menu);
-	}
-	
-	protected Composite createClientContainer(Composite parent, int span, FormToolkit toolkit) {
-		Composite container = toolkit.createComposite(parent);
-		GridLayout layout = new GridLayout();
-		layout.marginWidth = layout.marginHeight = 2;
-		layout.numColumns = span;
-		container.setLayout(layout);
-		return container;
-	}
-	
-	protected abstract StructuredViewerPart createViewerPart(String [] buttonLabels);
-	
-	protected void fillContextMenu(IMenuManager manager) {
-	}
-	
-	protected void buttonSelected(int index) {
-	}
-
-	protected void doPaste() {
-		ISelection selection = getViewerSelection();
-		IStructuredSelection ssel = (IStructuredSelection)selection;
-		if (ssel.size()>1) return;
-		
-		Object target = ssel.getFirstElement();
-		
-		Clipboard clipboard = getPage().getPDEEditor().getClipboard();
-		ModelDataTransfer modelTransfer = ModelDataTransfer.getInstance();
-		Object [] objects = (Object[])clipboard.getContents(modelTransfer);
-		if (objects!=null) {
-			doPaste(target, objects);
-		}
-	}
-	public boolean canPaste(Clipboard clipboard) {
-		ISelection selection = getViewerSelection();
-		IStructuredSelection ssel = (IStructuredSelection)selection;
-		if (ssel.size()>1) return false;
-			
-		Object target = ssel.getFirstElement();
-		ModelDataTransfer modelTransfer = ModelDataTransfer.getInstance();
-		Object [] objects = (Object[])clipboard.getContents(modelTransfer);
-		if (objects!=null && objects.length>0) {
-			return canPaste(target, objects);
-		}
-		return clipboard.getContents(TextTransfer.getInstance()) != null;
-	}
-	protected ISelection getViewerSelection() {
-		return viewerPart.getViewer().getSelection();
-	}
-	protected void doPaste(Object target, Object[] objects) {
-	}
-	
-	protected boolean canPaste(Object target, Object [] objects) {
-		return false;
-	}
-	public void setFocus() {
-		viewerPart.getControl().setFocus();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/SystemFileDocumentProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/SystemFileDocumentProvider.java
deleted file mode 100644
index e9a89da..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/SystemFileDocumentProvider.java
+++ /dev/null

@@ -1,76 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-
-import java.io.*;
-import org.eclipse.jface.text.*;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.core.runtime.*;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-
-public class SystemFileDocumentProvider extends StreamDocumentProvider {
-
-	public SystemFileDocumentProvider(IDocumentPartitioner partitioner) {
-		this(partitioner, null);
-	}
-
-	public SystemFileDocumentProvider(
-		IDocumentPartitioner partitioner,
-		String encoding) {
-		super(partitioner, encoding);
-	}
-	/*
-	 * @see AbstractDocumentProvider#createAnnotationModel(Object)
-	 */
-	protected IAnnotationModel createAnnotationModel(Object element) throws CoreException {
-		if (element instanceof SystemFileEditorInput) {
-			SystemFileEditorInput input= (SystemFileEditorInput) element;
-			File file = (File)input.getAdapter(File.class);
-			if (file!=null) {
-				return new SystemFileMarkerAnnotationModel();
-			}
-		}
-		return super.createAnnotationModel(element);
-	}
-
-	protected IDocument createDocument(Object element) throws CoreException {
-		if (element instanceof SystemFileEditorInput) {
-			IDocument document = createEmptyDocument();
-			IDocumentPartitioner part = getPartitioner();
-			if (part != null) {
-				part.connect(document);
-				document.setDocumentPartitioner(part);
-			}
-			File file =
-				(File) ((SystemFileEditorInput) element).getAdapter(File.class);
-			setDocumentContent(document, file);
-			return document;
-		}
-		return null;
-	}
-	protected void doSaveDocument(
-		IProgressMonitor monitor,
-		Object element,
-		IDocument document,
-		boolean force)
-		throws CoreException {
-	}
-	protected void setDocumentContent(IDocument document, File file) {
-		try {
-			InputStream contentStream = new FileInputStream(file);
-			setDocumentContent(document, contentStream);
-			contentStream.close();
-		} catch (IOException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/SystemFileEditorInput.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/SystemFileEditorInput.java
deleted file mode 100644
index d4f0ce6..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/SystemFileEditorInput.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-
-import java.io.*;
-import org.eclipse.ui.*;
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-
-public class SystemFileEditorInput implements IStorageEditorInput, IPersistableElement {
-	private SystemFileStorage storage;
-	private static final String FACTORY_ID = PDEPlugin.getPluginId()+".systemFileEditorInputFactory"; //$NON-NLS-1$
-
-	public SystemFileEditorInput(File file) {
-		storage = new SystemFileStorage(file);
-	}
-	public boolean exists() {
-		return storage.getFile().exists();
-	}
-	public Object getAdapter(Class adapter) {
-		if (adapter.equals(File.class))
-			return storage.getFile();
-		return null;
-	}
-	public ImageDescriptor getImageDescriptor() {
-		return null;
-	}
-	public String getName() {
-		return storage.getFile().getName();
-	}
-	public IPersistableElement getPersistable() {
-		return this;
-	}
-	public void saveState(IMemento memento) {
-		memento.putString("path", storage.getFile().getAbsolutePath()); //$NON-NLS-1$
-	}
-	public String getFactoryId() {
-		return FACTORY_ID;
-	}
-	public IStorage getStorage() {
-		return storage;
-	}
-	public String getToolTipText() {
-		return storage.getFile().getAbsolutePath();
-	}
-	public boolean equals(Object object) {
-		return object instanceof SystemFileEditorInput &&
-		 getStorage().equals(((SystemFileEditorInput)object).getStorage());
-	}
-	
-	public int hashCode() {
-		return getStorage().hashCode();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/SystemFileEditorInputFactory.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/SystemFileEditorInputFactory.java
deleted file mode 100644
index f4fdff8..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/SystemFileEditorInputFactory.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-
-import org.eclipse.ui.IElementFactory;
-import org.eclipse.ui.IMemento;
-import org.eclipse.core.runtime.IAdaptable;
-import java.io.*;
-
-/**
- * Insert the type's description here.
- */
-public class SystemFileEditorInputFactory implements IElementFactory {
-	/**
-	 * The constructor.
-	 */
-	public SystemFileEditorInputFactory() {
-	}
-	
-	public IAdaptable createElement (IMemento memento) {
-		String path = memento.getString("path"); //$NON-NLS-1$
-		File file = new File(path);
-		SystemFileEditorInput input = new SystemFileEditorInput(file);
-		return input;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/SystemFileMarkerAnnotationModel.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/SystemFileMarkerAnnotationModel.java
deleted file mode 100644
index 0a2e7a8..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/SystemFileMarkerAnnotationModel.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.ui.texteditor.*;
-
-/**
- * A marker annotation model whose underlying source of markers is 
- * a resource in the workspace.
- * <p>
- * This class may be instantiated; it is not intended to be subclassed.
- * </p>
- */
-public class SystemFileMarkerAnnotationModel
-	extends AbstractMarkerAnnotationModel {
-
-	protected IMarker[] retrieveMarkers() throws CoreException {
-		return null;
-	}
-
-	protected void deleteMarkers(IMarker[] markers) throws CoreException {
-	}
-
-	protected void listenToMarkerChanges(boolean listen) {
-	}
-
-	protected boolean isAcceptable(IMarker marker) {
-		return true;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/SystemFileStorage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/SystemFileStorage.java
deleted file mode 100644
index 9d031a6..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/SystemFileStorage.java
+++ /dev/null

@@ -1,57 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-
-import java.io.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.resources.*;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-
-public class SystemFileStorage extends PlatformObject implements IStorage {
-	private File file;
-	/**
-	 * Constructor for SystemFileStorage.
-	 */
-	public SystemFileStorage(File file) {
-		this.file = file;
-	}
-
-	public File getFile() {
-		return file;
-	}
-	public InputStream getContents() throws CoreException {
-		try {
-			return new FileInputStream(file);
-		} catch (FileNotFoundException e) {
-			IStatus status =
-				new Status(IStatus.ERROR, PDEPlugin.getPluginId(), IStatus.OK, null, e);
-			throw new CoreException(status);
-		}
-	}
-	public IPath getFullPath() {
-		return new Path(file.getAbsolutePath());
-	}
-	public String getName() {
-		return file.getName();
-	}
-	public boolean isReadOnly() {
-		return true;
-	}
-
-	public boolean equals(Object object) {
-		return object instanceof SystemFileStorage
-			&& getFile().equals(((SystemFileStorage) object).getFile());
-	}
-
-	public int hashCode() {
-		return getFile().hashCode();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/TableSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/TableSection.java
deleted file mode 100644
index c80aaf0..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/TableSection.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.pde.internal.ui.parts.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-/**
- * @version 1.0
- * @author
- */
-public abstract class TableSection extends StructuredViewerSection {
-	protected boolean handleDefaultButton = true;
-	class PartAdapter extends EditableTablePart {
-		public PartAdapter(String[] buttonLabels) {
-			super(buttonLabels);
-		}
-		public void entryModified(Object entry, String value) {
-			TableSection.this.entryModified(entry, value);
-		}
-		public void selectionChanged(IStructuredSelection selection) {
-			getManagedForm().fireSelectionChanged(TableSection.this, selection);
-			TableSection.this.selectionChanged(selection);
-		}
-		public void handleDoubleClick(IStructuredSelection selection) {
-			TableSection.this.handleDoubleClick(selection);
-		}
-		public void buttonSelected(Button button, int index) {
-			TableSection.this.buttonSelected(index);
-			if (handleDefaultButton)
-				button.getShell().setDefaultButton(null);
-		}
-		protected void createButtons(Composite parent, FormToolkit toolkit) {
-			super.createButtons(parent, toolkit);
-			enableButtons();
-		}
-	}
-	/**
-	 * Constructor for TableSection.
-	 * 
-	 * @param formPage
-	 */
-	public TableSection(PDEFormPage formPage, Composite parent, int style,
-			String[] buttonLabels) {
-		this (formPage, parent, style, true, buttonLabels);
-	}
-	/**
-	 * Constructor for TableSection.
-	 * 
-	 * @param formPage
-	 */
-	public TableSection(PDEFormPage formPage, Composite parent, int style,
-			boolean titleBar, String[] buttonLabels) {
-		super(formPage, parent, style, titleBar, buttonLabels);
-	}
-	protected StructuredViewerPart createViewerPart(String[] buttonLabels) {
-		return new PartAdapter(buttonLabels);
-	}
-	protected IAction getRenameAction() {
-		return getTablePart().getRenameAction();
-	}
-	protected EditableTablePart getTablePart() {
-		return (EditableTablePart) viewerPart;
-	}
-	protected void entryModified(Object entry, String value) {
-	}
-	protected void selectionChanged(IStructuredSelection selection) {
-	}
-	protected void handleDoubleClick(IStructuredSelection selection) {
-	}
-	protected void enableButtons() {
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/ToggleLinkWithEditorAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/ToggleLinkWithEditorAction.java
deleted file mode 100644
index dc443f1..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/ToggleLinkWithEditorAction.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.editor;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-
-/**
- * This action toggles whether the Outline page links its selection to the
- * active editor.
- * 
- * @since 3.0
- */
-public class ToggleLinkWithEditorAction extends Action {
-
-	PDEFormEditor fEditor;
-
-	public ToggleLinkWithEditorAction(PDEFormEditor editor) {
-		super(PDEUIMessages.ToggleLinkWithEditorAction_label); 
-		boolean isLinkingEnabled = PDEPlugin.getDefault().getPreferenceStore()
-				.getBoolean("ToggleLinkWithEditorAction.isChecked"); //$NON-NLS-1$
-		setChecked(isLinkingEnabled);
-		fEditor = editor;
-		setToolTipText(PDEUIMessages.ToggleLinkWithEditorAction_toolTip); 
-		setDescription(PDEUIMessages.ToggleLinkWithEditorAction_description); 
-		setImageDescriptor(PDEPluginImages.DESC_LINK_WITH_EDITOR);
-		setDisabledImageDescriptor(PDEPluginImages.DESC_LINK_WITH_EDITOR_DISABLED);
-	}
-
-	public void run() {
-		PDEPlugin.getDefault().getPreferenceStore().setValue(
-				"ToggleLinkWithEditorAction.isChecked", isChecked()); //$NON-NLS-1$
-		if (isChecked())
-			fEditor.synchronizeOutlinePage();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/TreeSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/TreeSection.java
deleted file mode 100644
index 30c11fd..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/TreeSection.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.pde.internal.ui.parts.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @version 	1.0
- * @author
- */
-public abstract class TreeSection extends StructuredViewerSection {
-	protected boolean handleDefaultButton=true;
-	class PartAdapter extends TreePart {
-		public PartAdapter(String[] buttonLabels) {
-			super(buttonLabels);
-		}
-		public void selectionChanged(IStructuredSelection selection) {
-			getManagedForm().fireSelectionChanged(TreeSection.this, selection);
-			TreeSection.this.selectionChanged(selection);
-		}
-		public void handleDoubleClick(IStructuredSelection selection) {
-			TreeSection.this.handleDoubleClick(selection);
-		}
-		public void buttonSelected(Button button, int index) {
-			TreeSection.this.buttonSelected(index);
-			if (handleDefaultButton)
-				button.getShell().setDefaultButton(null);
-		}
-		protected void createButtons(Composite parent, FormToolkit toolkit) {
-			super.createButtons(parent, toolkit);
-			enableButtons();
-		}
-	}
-	/**
-	 * Constructor for TableSection.
-	 * @param formPage
-	 */
-	public TreeSection(PDEFormPage formPage, Composite parent, int style, String[] buttonLabels) {
-		super(formPage, parent, style, buttonLabels);
-	}
-
-	protected StructuredViewerPart createViewerPart(String[] buttonLabels) {
-		return new PartAdapter(buttonLabels);
-	}
-
-	protected TreePart getTreePart() {
-		return (TreePart) viewerPart;
-	}
-
-	protected void selectionChanged(IStructuredSelection selection) {
-	}
-	protected void handleDoubleClick(IStructuredSelection selection) {
-	}
-	protected void enableButtons() {
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/XMLConfiguration.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/XMLConfiguration.java
deleted file mode 100644
index 2461982..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/XMLConfiguration.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextDoubleClickStrategy;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.jface.text.presentation.IPresentationReconciler;
-import org.eclipse.jface.text.presentation.PresentationReconciler;
-import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
-import org.eclipse.jface.text.rules.Token;
-import org.eclipse.jface.text.source.IAnnotationHover;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.pde.internal.ui.editor.text.AnnotationHover;
-import org.eclipse.pde.internal.ui.editor.text.IColorManager;
-import org.eclipse.pde.internal.ui.editor.text.IPDEColorConstants;
-import org.eclipse.pde.internal.ui.editor.text.NonRuleBasedDamagerRepairer;
-import org.eclipse.pde.internal.ui.editor.text.XMLPartitionScanner;
-import org.eclipse.pde.internal.ui.editor.text.XMLScanner;
-import org.eclipse.pde.internal.ui.editor.text.XMLTagScanner;
-import org.eclipse.ui.editors.text.TextSourceViewerConfiguration;
-
-public class XMLConfiguration extends TextSourceViewerConfiguration {
-	private XMLDoubleClickStrategy doubleClickStrategy;
-	private XMLTagScanner tagScanner;
-	private XMLScanner pdeScanner;
-	private IColorManager colorManager;
-
-	public XMLConfiguration(IColorManager colorManager) {
-		setColorManager(colorManager);
-	}
-	
-	public void setColorManager(IColorManager colorManager) {
-		this.colorManager = colorManager;
-	}
-	
-	public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
-		return new String[] {
-			IDocument.DEFAULT_CONTENT_TYPE,
-			XMLPartitionScanner.XML_COMMENT,
-			XMLPartitionScanner.XML_TAG };
-	}
-	public ITextDoubleClickStrategy getDoubleClickStrategy(
-		ISourceViewer sourceViewer,
-		String contentType) {
-		if (doubleClickStrategy == null)
-			doubleClickStrategy = new XMLDoubleClickStrategy();
-		return doubleClickStrategy;
-	}
-	protected XMLScanner getPDEScanner() {
-		if (pdeScanner == null) {
-			pdeScanner = new XMLScanner(colorManager);
-			pdeScanner.setDefaultReturnToken(
-				new Token(
-					new TextAttribute(colorManager.getColor(IPDEColorConstants.P_DEFAULT))));
-		}
-		return pdeScanner;
-	}
-	protected XMLTagScanner getPDETagScanner() {
-		if (tagScanner == null) {
-			tagScanner = new XMLTagScanner(colorManager);
-			tagScanner.setDefaultReturnToken(
-				new Token(new TextAttribute(colorManager.getColor(IPDEColorConstants.P_TAG))));
-		}
-		return tagScanner;
-	}
-	public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) {
-		PresentationReconciler reconciler = new PresentationReconciler();
-
-		DefaultDamagerRepairer dr = new DefaultDamagerRepairer(getPDEScanner());
-		reconciler.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE);
-		reconciler.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);
-
-		dr = new DefaultDamagerRepairer(getPDETagScanner());
-		reconciler.setDamager(dr, XMLPartitionScanner.XML_TAG);
-		reconciler.setRepairer(dr, XMLPartitionScanner.XML_TAG);
-
-		NonRuleBasedDamagerRepairer ndr =
-			new NonRuleBasedDamagerRepairer(
-				new TextAttribute(colorManager.getColor(IPDEColorConstants.P_XML_COMMENT)));
-		reconciler.setDamager(ndr, XMLPartitionScanner.XML_COMMENT);
-		reconciler.setRepairer(ndr, XMLPartitionScanner.XML_COMMENT);
-
-		return reconciler;
-	}
-	
-	public IAnnotationHover getAnnotationHover(ISourceViewer sourceViewer) {
-		return new AnnotationHover();
-	}
-	
-	public IColorManager getColorManager(){
-		return colorManager;
-	
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/XMLDoubleClickStrategy.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/XMLDoubleClickStrategy.java
deleted file mode 100644
index 9bd1997..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/XMLDoubleClickStrategy.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-
-import org.eclipse.jface.text.*;
-
-public class XMLDoubleClickStrategy implements ITextDoubleClickStrategy {
-	protected ITextViewer fText;
-
-	public void doubleClicked(ITextViewer part) {
-		int pos = part.getSelectedRange().x;
-		if (pos > 0) {
-			fText = part;
-			selectWord(pos);
-		}
-	}
-	
-	protected boolean selectWord(int caretPos) {
-
-		IDocument doc = fText.getDocument();
-		int startPos, endPos;
-
-		try {
-
-			int pos = caretPos;
-			char c;
-
-			while (pos >= 0) {
-				c = doc.getChar(pos);
-				if (!Character.isJavaIdentifierPart(c) && c != '.')
-					break;
-				--pos;
-			}
-
-			startPos = pos;
-
-			pos = caretPos;
-			int length = doc.getLength();
-
-			while (pos < length) {
-				c = doc.getChar(pos);
-				if (!Character.isJavaIdentifierPart(c) && c != '.')
-					break;
-				++pos;
-			}
-
-			endPos = pos;
-			selectRange(startPos, endPos);
-			return true;
-
-		} catch (BadLocationException x) {
-		}
-
-		return false;
-	}
-	
-	private void selectRange(int startPos, int stopPos) {
-		int offset = startPos+1;
-		int length = stopPos - offset;
-		fText.setSelectedRange(offset, length);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/XMLSourcePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/XMLSourcePage.java
deleted file mode 100644
index 6322ad9..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/XMLSourcePage.java
+++ /dev/null

@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor;
-
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.util.*;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.text.*;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.texteditor.DefaultRangeIndicator;
-
-public abstract class XMLSourcePage extends PDESourcePage {
-	protected IColorManager colorManager;
-	/**
-	 * @param editor
-	 * @param id
-	 * @param title
-	 */
-	public XMLSourcePage(PDEFormEditor editor, String id, String title) {
-		super(editor, id, title);
-		setSourceViewerConfiguration(createXMLConfiguration());
-		setRangeIndicator(new DefaultRangeIndicator());
-	}
-
-	protected XMLSourceViewerConfiguration createXMLConfiguration() {
-		if (colorManager != null)
-			colorManager.dispose();
-		colorManager = ColorManager.getDefault();
-		return new XMLSourceViewerConfiguration(this, colorManager);
-	}
-	
-	public void dispose() {
-		super.dispose();
-		colorManager.dispose();
-	}
-	
-	public boolean canLeaveThePage() {
-		boolean cleanModel = getInputContext().isModelCorrect();
-		if (!cleanModel) {
-			Display.getCurrent().beep();
-			String title = getEditor().getSite().getRegisteredName();
-			MessageDialog.openError(
-				PDEPlugin.getActiveWorkbenchShell(),
-				title,
-				PDEUIMessages.SourcePage_errorMessage);
-		}
-		return cleanModel;
-	}
-
-	protected boolean affectsTextPresentation(PropertyChangeEvent event){
-		String property = event.getProperty();
-		return property.equals(IPDEColorConstants.P_DEFAULT) 
-		|| property.equals(IPDEColorConstants.P_PROC_INSTR) 
-		|| property.equals(IPDEColorConstants.P_STRING) 
-		|| property.equals(IPDEColorConstants.P_TAG) 
-		|| property.equals(IPDEColorConstants.P_XML_COMMENT);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.AbstractDecoratedTextEditor#handlePreferenceStoreChanged(org.eclipse.jface.util.PropertyChangeEvent)
-	 */
-	protected void handlePreferenceStoreChanged(PropertyChangeEvent event) {
-		XMLSourceViewerConfiguration sourceViewerConfiguration= (XMLSourceViewerConfiguration)getSourceViewerConfiguration();
-		if (affectsTextPresentation(event)) {
-			sourceViewerConfiguration.adaptToPreferenceChange(event);
-			setSourceViewerConfiguration(sourceViewerConfiguration);
-		}
-							
-		super.handlePreferenceStoreChanged(event);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/AddLibraryDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/AddLibraryDialog.java
deleted file mode 100644
index 4466be5..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/AddLibraryDialog.java
+++ /dev/null

@@ -1,180 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.build;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.dialogs.SelectionStatusDialog;
-
-public class AddLibraryDialog extends SelectionStatusDialog {
-	private String newName;
-	private String[] libraries;
-	private IPluginModelBase model;
-	private static String init = "library.jar"; //$NON-NLS-1$
-	private Text text;
-	private Image libImage;
-	private TableViewer libraryViewer;
-	private DuplicateStatusValidator validator;
-
-	class DuplicateStatusValidator {
-		public IStatus validate (String text){
-			if(libraries==null || libraries.length==0)
-			return new Status(
-				IStatus.OK,
-				PDEPlugin.getPluginId(),
-				IStatus.OK,
-				"", //$NON-NLS-1$
-				null);
-			
-			if (!text.endsWith(".jar") && !text.endsWith("/") && !text.equals("."))  //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				text += "/"; //$NON-NLS-1$
-				
-			for (int i =0;i<libraries.length; i++){
-				if (libraries[i].equals(text))
-				return new Status(
-					IStatus.ERROR,
-					PDEPlugin.getPluginId(),
-					IStatus.ERROR,
-					PDEUIMessages.BuildEditor_RuntimeInfoSection_duplicateLibrary, 
-					null);
-			}
-			return new Status(
-				IStatus.OK,
-				PDEPlugin.getPluginId(),
-				IStatus.OK,
-				"", //$NON-NLS-1$
-				null);
-
-		}
-	}
-	class TableContentProvider extends DefaultContentProvider implements IStructuredContentProvider{
-		public Object[] getElements(Object input){
-			if (input instanceof IPluginModelBase){
-				return ((IPluginModelBase)input).getPluginBase().getLibraries();
-			}
-			return new Object[0];
-		}
-	}
-	
-	class TableLabelProvider extends LabelProvider implements ITableLabelProvider{
-		public String getColumnText(Object obj, int index){
-			return ((IPluginLibrary)obj).getName();
-		}
-		
-		public Image getColumnImage(Object obj, int index){
-			return libImage;
-		}
-	}
-	
-	public AddLibraryDialog(Shell shell, String[] libraries, IPluginModelBase model) {
-		super(shell);
-		setShellStyle(getShellStyle() | SWT.RESIZE);
-		setLibraryNames(libraries);
-		setPluginModel(model);
-		initializeImages();
-		initializeValidator();
-		setStatusLineAboveButtons(true);
-	}
-	
-	public void setPluginModel(IPluginModelBase model){
-		this.model = model;
-	}
-	
-	private void initializeImages(){
-		PDELabelProvider provider = PDEPlugin.getDefault().getLabelProvider();
-		libImage= provider.get(PDEPluginImages.DESC_JAVA_LIB_OBJ);	
-	}
-	
-	public void setLibraryNames(String[] libraries) {
-		this.libraries = libraries;
-	}
-	
-	protected Control createDialogArea(Composite parent) {
-		Composite container = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		layout.marginWidth = 10;
-		layout.marginHeight = 10;
-		container.setLayout(layout);
-		
-		container.setLayoutData(new GridData(GridData.FILL_BOTH));
-		
-		Label label = new Label(container, SWT.NULL);
-		label.setText(PDEUIMessages.BuildEditor_AddLibraryDialog_label); 
-		label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		text = new Text(container, SWT.SINGLE|SWT.BORDER);
-		text.addModifyListener(new ModifyListener() {
-		public void modifyText(ModifyEvent e) {
-			updateStatus(validator.validate(text.getText()));
-			}
-		});
-		text.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		Table table = new Table(container, SWT.FULL_SELECTION | SWT.BORDER);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.heightHint = 125;
-		table.setLayoutData(gd);
-		
-		libraryViewer = new TableViewer(table);
-		libraryViewer.setContentProvider(new TableContentProvider());
-		libraryViewer.setLabelProvider(new TableLabelProvider());
-		libraryViewer.addSelectionChangedListener(new ISelectionChangedListener(){
-			public void selectionChanged(SelectionChangedEvent e){
-				ISelection sel = e.getSelection();
-				IPluginLibrary obj = (IPluginLibrary)((IStructuredSelection)sel).getFirstElement();
-				text.setText(obj!=null ? obj.getName() : ""); //$NON-NLS-1$
-			}
-		});
-		libraryViewer.setInput(model);
-		applyDialogFont(container);
-		return container;
-	}
-	
-	public int open() {
-		text.setText(init);
-		text.selectAll();
-		return super.open();
-	}
-
-	protected void computeResult(){
-		
-	}
-	  
-	public String getNewName() {
-		return newName;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-	 */
-	protected void okPressed() {
-		newName = text.getText();
-		super.okPressed();
-	}
-	
-	private void initializeValidator(){
-		this.validator = new DuplicateStatusValidator();
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BinSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BinSection.java
deleted file mode 100644
index d5e77cb..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BinSection.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.editor.build;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.core.build.*;
-import org.eclipse.pde.internal.build.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.swt.widgets.*;
-
-public class BinSection extends BuildContentsSection
-		implements
-			IModelChangedListener {
-
-	public BinSection(BuildPage page, Composite parent) {
-		super(page, parent);
-		getSection().setText(PDEUIMessages.BuildEditor_BinSection_title);
-		getSection().setDescription(PDEUIMessages.BuildEditor_BinSection_desc);
-	}
-
-	protected void initializeCheckState() {
-		super.initializeCheckState();
-		IBuild build = fBuildModel.getBuild();
-		IBuildEntry binIncl = build
-				.getEntry(IBuildPropertiesConstants.PROPERTY_BIN_INCLUDES);
-		IBuildEntry binExcl = build
-				.getEntry(IBuildPropertiesConstants.PROPERTY_BIN_EXCLUDES);
-
-		if (binIncl == null)
-			return;
-
-		super.initializeCheckState(binIncl, binExcl);
-	}
-
-	protected void deleteFolderChildrenFromEntries(IFolder folder) {
-		IBuild build = fBuildModel.getBuild();
-		IBuildEntry binIncl = build
-				.getEntry(IBuildPropertiesConstants.PROPERTY_BIN_INCLUDES);
-		IBuildEntry binExcl = build
-				.getEntry(IBuildPropertiesConstants.PROPERTY_BIN_EXCLUDES);
-		String parentFolder = getResourceFolderName(folder
-				.getProjectRelativePath().toString());
-
-		removeChildren(binIncl, parentFolder);
-		removeChildren(binExcl, parentFolder);
-	}
-
-	protected void handleBuildCheckStateChange(boolean wasTopParentChecked) {
-		IResource resource = fParentResource;
-		String resourceName = fParentResource.getProjectRelativePath()
-				.toString();
-		IBuild build = fBuildModel.getBuild();
-		IBuildEntry includes = build
-				.getEntry(IBuildPropertiesConstants.PROPERTY_BIN_INCLUDES);
-		IBuildEntry excludes = build
-				.getEntry(IBuildPropertiesConstants.PROPERTY_BIN_EXCLUDES);
-
-		resourceName = handleResourceFolder(resource, resourceName);
-
-		if (isChecked)
-			handleCheck(includes, excludes, resourceName, resource,
-					wasTopParentChecked,
-					IBuildPropertiesConstants.PROPERTY_BIN_INCLUDES);
-		else
-			handleUncheck(includes, excludes, resourceName, resource,
-					IBuildPropertiesConstants.PROPERTY_BIN_EXCLUDES);
-
-		deleteEmptyEntries();
-		fParentResource = fOriginalResource = null;
-	}
-
-	public void modelChanged(IModelChangedEvent event) {
-		if (event.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			markStale();
-		}
-		Object changeObject = event.getChangedObjects()[0];
-
-		if (!(changeObject instanceof IBuildEntry && (((IBuildEntry) changeObject)
-				.getName().equals(
-						IBuildPropertiesConstants.PROPERTY_BIN_EXCLUDES) || ((IBuildEntry) changeObject)
-				.getName().equals(
-						IBuildPropertiesConstants.PROPERTY_BIN_INCLUDES))))
-			return;
-
-		if ((fParentResource == null && fOriginalResource != null)
-				|| (fOriginalResource == null && fParentResource != null)) {
-			initializeCheckState();
-			return;
-		}
-		if (fParentResource == null && fOriginalResource == null){
-			if (event.getChangedProperty() != null && event
-					.getChangedProperty()
-					.equals(IBuildPropertiesConstants.PROPERTY_BIN_INCLUDES)) {
-				
-				if (event.getOldValue() == null && event.getNewValue() != null) {
-					if (event.getNewValue().equals(".")) //$NON-NLS-1$
-						return;
-					// adding token
-					IFile file = fProject.getFile(new Path(event.getNewValue()
-							.toString()));
-					if (!file.exists())
-						return;
-					fParentResource = fOriginalResource = file;
-					isChecked = true;
-				} else if (event.getOldValue() != null
-						&& event.getNewValue() == null) {
-					if (event.getOldValue().equals(".")) //$NON-NLS-1$
-						return;
-					// removing token
-					IFile file = fProject.getFile(new Path(event.getOldValue()
-							.toString()));
-					if (!file.exists())
-						return;
-					fParentResource = fOriginalResource = file;
-					isChecked = false;
-				} else {
-					return;
-				}
-			}
-			return;
-		}
-		fTreeViewer.setChecked(fParentResource, isChecked);
-		fTreeViewer.setGrayed(fOriginalResource, false);
-		fTreeViewer.setParentsGrayed(fParentResource, true);
-		setParentsChecked(fParentResource);
-		fTreeViewer.setGrayed(fParentResource, false);
-		if (fParentResource instanceof IFolder) {
-			fTreeViewer.setSubtreeChecked(fParentResource, isChecked);
-			setChildrenGrayed(fParentResource, false);
-		}
-		while (!fOriginalResource.equals(fParentResource)) {
-			fTreeViewer.setChecked(fOriginalResource, isChecked);
-			fOriginalResource = fOriginalResource.getParent();
-		}
-		fParentResource = null;
-		fOriginalResource = null;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildClasspathSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildClasspathSection.java
deleted file mode 100644
index 7ae9e82..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildClasspathSection.java
+++ /dev/null

@@ -1,376 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.build;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.util.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.core.build.*;
-import org.eclipse.pde.internal.build.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.editor.context.*;
-import org.eclipse.pde.internal.ui.elements.*;
-import org.eclipse.pde.internal.ui.parts.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.actions.*;
-import org.eclipse.ui.dialogs.*;
-import org.eclipse.ui.forms.widgets.*;
-import org.eclipse.ui.model.*;
-import org.eclipse.ui.views.navigator.*;
-
-public class BuildClasspathSection
-	extends TableSection
-	implements IModelChangedListener {
-
-	private TableViewer fTableViewer;
-	private boolean fEnabled = true;
-	private IStructuredSelection fCurrentSelection;
-	private IStructuredSelection fOldSelection;
-	
-
-	/**
-	 * Implementation of a <code>ISelectionValidator</code> to validate the
-	 * type of an element.
-	 * Empty selections are not accepted.
-	 */
-	class ElementSelectionValidator implements ISelectionStatusValidator {
-
-		private Class[] fAcceptedTypes;
-		private boolean fAllowMultipleSelection;
-
-	
-		/**
-		 * @param acceptedTypes The types accepted by the validator
-		 * @param allowMultipleSelection If set to <code>true</code>, the validator
-		 * allows multiple selection.
-		 */
-		public ElementSelectionValidator(Class[] acceptedTypes, boolean allowMultipleSelection) {
-			Assert.isNotNull(acceptedTypes);
-			fAcceptedTypes= acceptedTypes;
-			fAllowMultipleSelection= allowMultipleSelection;
-		}
-	
-
-		/*
-		 * @see org.eclipse.ui.dialogs.ISelectionValidator#isValid(java.lang.Object)
-		 */
-		public IStatus validate(Object[] elements) {
-			if (isValid(elements)) {
-				return new Status(
-					IStatus.OK,
-					PDEPlugin.getPluginId(),
-					IStatus.OK,
-					"", //$NON-NLS-1$
-					null);
-			}
-			return new Status(
-				IStatus.ERROR,
-				PDEPlugin.getPluginId(),
-				IStatus.ERROR,
-				"", //$NON-NLS-1$
-				null);
-		}	
-
-		private boolean isOfAcceptedType(Object o) {
-			for (int i= 0; i < fAcceptedTypes.length; i++) {
-				if (fAcceptedTypes[i].isInstance(o)) {
-					return true;
-				}
-			}
-			return false;
-		}
-	
-		private boolean isValid(Object[] selection) {
-			if (selection.length == 0) {
-				return false;
-			}
-		
-			if (!fAllowMultipleSelection && selection.length != 1) {
-				return false;
-			}
-		
-			for (int i= 0; i < selection.length; i++) {
-				Object o= selection[i];	
-				if (!isOfAcceptedType(o)) {
-					return false;
-				}
-			}
-			return true;
-		}
-	}
-
-	class TableContentProvider
-		extends DefaultContentProvider
-		implements IStructuredContentProvider {
-		public Object[] getElements(Object parent) {
-			if (parent instanceof IBuildModel) {
-				IBuild build = ((IBuildModel)parent).getBuild();
-				IBuildEntry entry = build.getEntry(IBuildPropertiesConstants.PROPERTY_JAR_EXTRA_CLASSPATH);
-				if (entry != null) {
-					return entry.getTokens();
-				}
-			}
-			return new Object[0];
-		}
-	}
-
-	class TableLabelProvider
-		extends LabelProvider
-		implements ITableLabelProvider {
-		public String getColumnText(Object obj, int index) {
-			return obj.toString();
-		}
-		public Image getColumnImage(Object obj, int index) {
-			ISharedImages sharedImages = PlatformUI.getWorkbench().getSharedImages();
-			return sharedImages.getImage(ISharedImages.IMG_OBJ_FILE);
-		}
-	}
-	public BuildClasspathSection(PDEFormPage page, Composite parent) {
-		super(
-			page,
-			parent,
-			Section.DESCRIPTION | Section.TWISTIE,
-			new String[] {
-				PDEUIMessages.BuildEditor_ClasspathSection_add,
-				PDEUIMessages.BuildEditor_ClasspathSection_remove,
-				null,
-				null });
-		getSection().setText(PDEUIMessages.BuildEditor_ClasspathSection_title);
-		getSection().setDescription(PDEUIMessages.BuildEditor_ClasspathSection_desc);
-		initialize();
-
-	}
-	
-	private IBuildModel getBuildModel() {
-		InputContext context = getPage().getPDEEditor().getContextManager()
-				.findContext(BuildInputContext.CONTEXT_ID);
-		if (context==null) return null;
-		return (IBuildModel) context.getModel();
-	}
-
-	public void initialize(){
-		getBuildModel().addModelChangedListener(this);
-		IBuildEntry entry = getBuildModel().getBuild().getEntry(IBuildPropertiesConstants.PROPERTY_JAR_EXTRA_CLASSPATH);
-		getSection().setExpanded(entry!=null && entry.getTokens().length>0);
-	}
-
-	public void createClient(
-		Section section,
-		FormToolkit toolkit) {
-		Composite container = createClientContainer(section, 2, toolkit);
-		createViewerPartControl(container, SWT.FULL_SELECTION, 2, toolkit);
-
-		EditableTablePart tablePart = getTablePart();
-		tablePart.setEditable(true);
-		fTableViewer = tablePart.getTableViewer();
-
-		fTableViewer.setContentProvider(new TableContentProvider());
-		fTableViewer.setLabelProvider(new TableLabelProvider());
-		fTableViewer.setInput(getBuildModel());
-
-		toolkit.paintBordersFor(container);
-		enableSection(true);
-		section.setClient(container);
-	}
-	
-	protected void fillContextMenu(IMenuManager manager) {
-		ISelection selection = fTableViewer.getSelection();
-
-		// add NEW action
-		Action action =
-			new Action(PDEUIMessages.BuildEditor_ClasspathSection_add) {
-				public void run() {
-					handleNew();
-				}
-			};
-		action.setEnabled(fEnabled);
-		manager.add(action);
-
-		manager.add(new Separator());
-
-		// add DELETE action
-		action =
-			new Action(PDEUIMessages.BuildEditor_ClasspathSection_remove) {
-				public void run() {
-					handleDelete();
-				}
-			};
-		action.setEnabled(!selection.isEmpty() && fEnabled);
-		manager.add(action);
-
-		getPage().getPDEEditor().getContributor().contextMenuAboutToShow(
-			manager, false);
-	}
-	
-	public void dispose() {
-		IBuildModel model = getBuildModel();
-		if (model!=null)
-			model.removeModelChangedListener(this);
-		super.dispose();
-	}
-	
-	public void refresh() {
-		fTableViewer.refresh();
-	}
-	
-	public boolean doGlobalAction(String actionId) {
-		if (actionId.equals(ActionFactory.DELETE.getId())) {
-			if (fEnabled) {
-				handleDelete();
-			}
-			return true;
-		}
-		return false;
-	}
-	
-	public void enableSection(boolean enable){
-		fEnabled = enable;
-		EditableTablePart tablePart = getTablePart();
-		tablePart.setButtonEnabled(1, enable && !fTableViewer.getSelection().isEmpty());
-		tablePart.setButtonEnabled(0, enable);
-	}
-
-	protected void selectionChanged(IStructuredSelection selection) {
-		getPage().getPDEEditor().setSelection(selection);
-		getTablePart().setButtonEnabled(1, selection != null && selection.size() > 0 && fEnabled);
-	}
-
-	private void handleDelete() {
-		Object selection =
-			((IStructuredSelection) fTableViewer.getSelection())
-				.getFirstElement();
-		fOldSelection = (IStructuredSelection) fTableViewer.getSelection();
-		int index = fTableViewer.getTable().getSelectionIndex();
-		if (selection != null && selection instanceof String) {
-			IBuild build = getBuildModel().getBuild();
-			IBuildEntry entry = build.getEntry(IBuildPropertiesConstants.PROPERTY_JAR_EXTRA_CLASSPATH);
-			if (entry != null) {
-				try {
-					entry.removeToken(selection.toString());
-
-					String[] tokens=entry.getTokens();
-					if (tokens.length == 0) {
-						build.remove(entry);
-					} else if (tokens.length >index){
-						fCurrentSelection = new StructuredSelection(tokens[index]);
-					} else {
-						fCurrentSelection = new StructuredSelection(tokens[index-1]);
-					}
-					
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		}
-	}
-
-	private void initializeDialogSettings(ElementTreeSelectionDialog dialog){
-		Class[] acceptedClasses = new Class[] { IFile.class };
-		dialog.setValidator(new ElementSelectionValidator(acceptedClasses, true));
-		dialog.setTitle(PDEUIMessages.BuildEditor_ClasspathSection_jarsTitle); 
-		dialog.setMessage(PDEUIMessages.BuildEditor_ClasspathSection_jarsDesc); 
-		dialog.addFilter(new JARFileFilter());
-		dialog.setInput(PDEPlugin.getWorkspace().getRoot());
-		dialog.setSorter(new ResourceSorter(ResourceSorter.NAME));
-		dialog.setInitialSelection(getBuildModel().getUnderlyingResource().getProject());
-
-	}
-	private void handleNew() {
-		ElementTreeSelectionDialog dialog =
-			new ElementTreeSelectionDialog(
-				getSection().getShell(),
-				new WorkbenchLabelProvider(),
-				new WorkbenchContentProvider());
-				
-		initializeDialogSettings(dialog);
-
-		if (dialog.open() == ElementTreeSelectionDialog.OK) {
-			
-			Object[] elements = dialog.getResult();
-
-			for (int i = 0; i < elements.length; i++) {
-				IResource elem = (IResource) elements[i];
-				String tokenName = getRelativePathTokenName(elem);
-				addClasspathToken(tokenName);
-				fCurrentSelection = new StructuredSelection(tokenName);
-				fOldSelection = null;
-			}
-		}
-	}
-	
-	private void addClasspathToken(String tokenName){
-		IBuildModel model = getBuildModel();
-		IBuildEntry entry = model.getBuild().getEntry(IBuildPropertiesConstants.PROPERTY_JAR_EXTRA_CLASSPATH);
-		try {
-			if (entry==null){
-				entry = model.getFactory().createEntry(IBuildPropertiesConstants.PROPERTY_JAR_EXTRA_CLASSPATH);
-				model.getBuild().add(entry);
-			}
-			if (!entry.contains(tokenName))
-				entry.addToken(tokenName);
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-	
-	private String getRelativePathTokenName(IResource elem){
-		IPath path = elem.getFullPath();
-		IPath projectPath =
-			getBuildModel().getUnderlyingResource().getProject().getFullPath();
-		int sameSegments = path.matchingFirstSegments(projectPath);
-		if (sameSegments > 0)
-			return path.removeFirstSegments(sameSegments).toString();
-		return ".."+path.toString(); //$NON-NLS-1$
-	}
-
-	protected void buttonSelected(int index) {
-		switch (index) {
-			case 0 :
-				handleNew();
-				break;
-			case 1 :
-				handleDelete();
-				break;
-			default :
-				break;
-		}
-	}
-	public void modelChanged(IModelChangedEvent event) {
-		if (event.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			markStale();
-		} else if (event.getChangeType() == IModelChangedEvent.INSERT){
-			
-		} else if (event.getChangeType() == IModelChangedEvent.REMOVE){
-			
-		} else if (event.getChangeType() == IModelChangedEvent.CHANGE){
-			Object changeObject = event.getChangedObjects()[0];
-			
-			if (changeObject instanceof IBuildEntry && ((IBuildEntry)changeObject).getName().equals(IBuildEntry.JARS_EXTRA_CLASSPATH)){
-				if (fOldSelection == null){
-					fTableViewer.refresh();
-					fTableViewer.setSelection(fCurrentSelection);
-				} else {
-					fTableViewer.remove(fOldSelection);
-					fTableViewer.refresh();
-					fTableViewer.setSelection(fCurrentSelection);
-				}
-			}
-		}
-	}
-}
-

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildContentsSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildContentsSection.java
deleted file mode 100644
index af653d8..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildContentsSection.java
+++ /dev/null

@@ -1,612 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.editor.build;
-
-import java.util.*;
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.core.build.*;
-import org.eclipse.pde.internal.build.IBuildPropertiesConstants;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.editor.context.*;
-import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.forms.widgets.*;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-public abstract class BuildContentsSection extends TableSection
-		implements
-			IModelChangedListener,
-			IResourceChangeListener,
-			IResourceDeltaVisitor {
-
-	protected CheckboxTreeViewer fTreeViewer;
-	private boolean fDoRefresh = false;
-	protected IProject fProject;
-	protected IBuildModel fBuildModel;
-	protected IResource fOriginalResource, fParentResource;
-	protected boolean isChecked;
-
-	public class TreeContentProvider extends DefaultContentProvider
-			implements
-				ITreeContentProvider {
-
-		public Object[] getElements(Object parent) {
-			if (parent instanceof IProject) {
-				try {
-					return ((IProject) parent).members();
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-			return new Object[0];
-		}
-
-		/**
-		 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
-		 */
-		public Object[] getChildren(Object parent) {
-			try {
-				if (parent instanceof IFolder)
-					return ((IFolder) parent).members();
-			} catch (CoreException e) {
-				PDEPlugin.logException(e);
-			}
-			return new Object[0];
-		}
-
-		public Object[] getFolderChildren(Object parent) {
-			IResource[] members = null;
-			try {
-				if (!(parent instanceof IFolder))
-					return new Object[0];
-				members = ((IFolder) parent).members();
-				ArrayList results = new ArrayList();
-				for (int i = 0; i < members.length; i++) {
-					if ((members[i].getType() == IResource.FOLDER)) {
-						results.add(members[i]);
-					}
-				}
-				return results.toArray();
-			} catch (CoreException e) {
-				PDEPlugin.logException(e);
-			}
-			return new Object[0];
-		}
-
-		/**
-		 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
-		 */
-		public Object getParent(Object element) {
-			if (element != null && element instanceof IResource) {
-				return ((IResource) element).getParent();
-			}
-			return null;
-		}
-
-		/**
-		 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
-		 */
-		public boolean hasChildren(Object element) {
-			if (element instanceof IFolder)
-				return getChildren(element).length > 0;
-			return false;
-		}
-	}
-	protected void createViewerPartControl(Composite parent, int style, int span, FormToolkit toolkit) {
-		MenuManager popupMenuManager = new MenuManager();
-		IMenuListener listener = new IMenuListener() {
-			public void menuAboutToShow(IMenuManager mng) {
-				fillContextMenu(mng);
-			}
-		};
-		popupMenuManager.addMenuListener(listener);
-		popupMenuManager.setRemoveAllWhenShown(true);
-		Control control = fTreeViewer.getControl();
-		Menu menu = popupMenuManager.createContextMenu(control);
-		control.setMenu(menu);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#fillContextMenu(org.eclipse.jface.action.IMenuManager)
-	 */
-	protected void fillContextMenu(IMenuManager manager) {
-		manager.add(getPage().getPDEEditor().getContributor().getRevertAction());
-		getPage().getPDEEditor().getContributor().contextMenuAboutToShow(
-				manager, false);
-	}
-	private IBuildModel getBuildModel() {
-		InputContext context = getPage().getPDEEditor().getContextManager()
-				.findContext(BuildInputContext.CONTEXT_ID);
-		return (IBuildModel) context.getModel();
-	}
-
-	public BuildContentsSection(PDEFormPage page, Composite parent) {
-		super(page, parent, Section.DESCRIPTION, new String[0]);
-		PDEPlugin.getWorkspace().addResourceChangeListener(this);
-	}
-
-	public void createClient(final Section section, FormToolkit toolkit) {
-		Composite container = createClientContainer(section, 2, toolkit);
-		fBuildModel = getBuildModel();
-		if (fBuildModel.getUnderlyingResource() != null)
-			fProject = fBuildModel.getUnderlyingResource().getProject();
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = layout.marginWidth = 2;
-		container.setLayout(layout);
-		fTreeViewer = new CheckboxTreeViewer(toolkit.createTree(container,
-				SWT.CHECK));
-		fTreeViewer.setContentProvider(new TreeContentProvider());
-		fTreeViewer.setLabelProvider(new WorkbenchLabelProvider());
-		fTreeViewer.setAutoExpandLevel(0);
-		fTreeViewer.addCheckStateListener(new ICheckStateListener() {
-
-			public void checkStateChanged(final CheckStateChangedEvent event) {
-				final Object element = event.getElement();
-				BusyIndicator.showWhile(section.getDisplay(), new Runnable() {
-
-					public void run() {
-						if (element instanceof IFile) {
-							IFile file = (IFile) event.getElement();
-							handleCheckStateChanged(file, event.getChecked());
-						} else if (element instanceof IFolder) {
-							IFolder folder = (IFolder) event.getElement();
-							handleCheckStateChanged(folder, event.getChecked());
-						}
-					}
-				});
-			}
-		});
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.heightHint = 100;
-		gd.widthHint = 100;
-		fTreeViewer.getTree().setLayoutData(gd);
-		initialize();
-		initializeCheckState();
-		toolkit.paintBordersFor(container);
-		createViewerPartControl(container, SWT.FULL_SELECTION, 2, toolkit);
-		section.setClient(container);
-	}
-
-	public void enableSection(boolean enable) {
-		fTreeViewer.getTree().setEnabled(enable);
-	}
-
-	protected void handleCheckStateChanged(IResource resource, boolean checked) {
-		fOriginalResource = resource;
-		isChecked = checked;
-		boolean wasTopParentChecked = fTreeViewer.getChecked(fOriginalResource
-				.getParent());
-		if (!isChecked) {
-			resource = handleAllUnselected(resource, resource.getName());
-		}
-		fParentResource = resource;
-		handleBuildCheckStateChange(wasTopParentChecked);
-	}
-
-	protected IResource handleAllUnselected(IResource resource, String name) {
-		IResource parent = resource.getParent();
-		if (parent == resource.getProject()) {
-			return resource;
-		}
-		try {
-			boolean uncheck = true;
-			IResource[] members = ((IFolder) parent).members();
-			for (int i = 0; i < members.length; i++) {
-				if (fTreeViewer.getChecked(members[i])
-						&& !members[i].getName().equals(name))
-					uncheck = false;
-			}
-			if (uncheck) {
-				return handleAllUnselected(parent, parent.getName());
-			}
-			return resource;
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-			return null;
-		}
-	}
-
-	protected void setChildrenGrayed(IResource folder, boolean isGray) {
-		fTreeViewer.setGrayed(folder, isGray);
-		if (((TreeContentProvider) fTreeViewer.getContentProvider())
-				.hasChildren(folder)) {
-			Object[] members = ((TreeContentProvider) fTreeViewer
-					.getContentProvider()).getFolderChildren(folder);
-			for (int i = 0; i < members.length; i++) {
-				setChildrenGrayed((IFolder) members[i], isGray);
-			}
-		}
-	}
-
-	protected void setParentsChecked(IResource resource) {
-		if (resource.getParent() != resource.getProject()) {
-			fTreeViewer.setChecked(resource.getParent(), true);
-			setParentsChecked(resource.getParent());
-		}
-	}
-
-	/**
-	 * removes all child resources of the specified folder from build entries
-	 * 
-	 * @param folder -
-	 *            current folder being modified in tree
-	 * 
-	 * note: does not remove folder itself
-	 */
-	protected abstract void deleteFolderChildrenFromEntries(IFolder folder);
-
-	protected void initializeCheckState() {
-		uncheckAll();
-	}
-
-	protected void initializeCheckState(final IBuildEntry includes,
-			final IBuildEntry excludes) {
-		fTreeViewer.getTree().getDisplay().asyncExec(new Runnable() {
-
-			public void run() {
-				if (fTreeViewer.getTree().isDisposed()) return;
-				Vector fileExt = new Vector();
-				String[] inclTokens, exclTokens = new String[0];
-				if (fProject == null || includes == null)
-					return;
-				inclTokens = includes.getTokens();
-				if (excludes != null)
-					exclTokens = excludes.getTokens();
-				Set temp = new TreeSet();
-				for (int i = 0; i < inclTokens.length; i++)
-					temp.add(inclTokens[i]);
-				for (int i = 0; i < exclTokens.length; i++)
-					temp.add(exclTokens[i]);
-				Iterator iter = temp.iterator();
-				while (iter.hasNext()) {
-					String resource = iter.next().toString();
-					boolean isIncluded = includes.contains(resource);
-					if (resource.equals(".") || resource.equals("./") || resource.equals(".\\")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-						// ignore - should be root directory
-					} else if (resource.lastIndexOf(Path.SEPARATOR) == resource
-							.length() - 1) {
-						IFolder folder = fProject.getFolder(resource);
-						fTreeViewer.setSubtreeChecked(folder, isIncluded);
-						fTreeViewer.setParentsGrayed(folder, true);
-						if (isIncluded && folder.exists()) {
-							setParentsChecked(folder);
-							fTreeViewer.setGrayed(folder, false);
-						}
-					} else if (resource.startsWith("*.")) { //$NON-NLS-1$
-						if (isIncluded)
-							fileExt.add(resource.substring(2));
-					} else {
-						IFile file = fProject.getFile(resource);
-						fTreeViewer.setChecked(file, isIncluded);
-						fTreeViewer.setParentsGrayed(file, true);
-						if (isIncluded && file.exists()) {
-							fTreeViewer.setGrayed(file, false);
-							setParentsChecked(file);
-						}
-					}
-				}
-				if (fileExt.size() == 0)
-					return;
-				try {
-					IResource[] members = fProject.members();
-					for (int i = 0; i < members.length; i++) {
-						if (!(members[i] instanceof IFolder)
-								&& (fileExt.contains(members[i]
-										.getFileExtension()))) {
-							fTreeViewer.setChecked(members[i], includes
-									.contains("*." //$NON-NLS-1$
-											+ members[i].getFileExtension()));
-						}
-					}
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		});
-	}
-
-	protected abstract void handleBuildCheckStateChange(
-			boolean wasTopParentChecked);
-
-	protected void handleCheck(IBuildEntry includes, IBuildEntry excludes,
-			String resourceName, IResource resource,
-			boolean wasTopParentChecked, String PROPERTY_INCLUDES) {
-
-		try {
-			if (includes == null) {
-				includes = fBuildModel.getFactory().createEntry(
-						PROPERTY_INCLUDES);
-				IBuild build = fBuildModel.getBuild();
-				build.add(includes);
-			}
-			if ((!wasTopParentChecked && !includes.contains(resourceName))
-					|| isValidIncludeEntry(includes, excludes, resource,
-							resourceName)) {
-				includes.addToken(resourceName);
-			}
-			if (excludes != null && excludes.contains(resourceName))
-				excludes.removeToken(resourceName);
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	protected boolean isValidIncludeEntry(IBuildEntry includes,
-			IBuildEntry excludes, IResource resource, String resourceName) {
-		if (excludes == null)
-			return true;
-		IPath resPath = resource.getProjectRelativePath();
-		while (resPath.segmentCount() > 1) {
-			resPath = resPath.removeLastSegments(1);
-			if (includes.contains(resPath.toString() + Path.SEPARATOR))
-				return false;
-			else if (excludes != null
-					&& excludes.contains(resPath.toString() + Path.SEPARATOR))
-				return true;
-		}
-		return !excludes.contains(resourceName);
-	}
-
-	protected void handleUncheck(IBuildEntry includes, IBuildEntry excludes,
-			String resourceName, IResource resource, String PROPERTY_EXCLUDES) {
-
-		try {
-			if (fTreeViewer.getChecked(resource.getParent())) {
-				if (excludes == null) {
-					excludes = fBuildModel.getFactory().createEntry(
-							PROPERTY_EXCLUDES);
-					IBuild build = fBuildModel.getBuild();
-					build.add(excludes);
-				}
-				if (!excludes.contains(resourceName)
-						&& (includes != null
-								? !includes.contains(resourceName)
-								: true))
-					excludes.addToken(resourceName);
-			}
-			if (includes != null) {
-				if (includes.contains(resourceName))
-					includes.removeToken(resourceName);
-				if (includes.contains("*." + resource.getFileExtension())) { //$NON-NLS-1$
-					IResource[] members = fProject.members();
-					for (int i = 0; i < members.length; i++) {
-						if (!(members[i] instanceof IFolder)
-								&& !members[i].getName().equals(
-										resource.getName())
-								&& (resource.getFileExtension()
-										.equals(members[i].getFileExtension()))) {
-							includes.addToken(members[i].getName());
-						}
-						IBuildEntry[] libraries = BuildUtil
-								.getBuildLibraries(fBuildModel.getBuild()
-										.getBuildEntries());
-						if (resource.getFileExtension().equals("jar") //$NON-NLS-1$
-								&& libraries.length != 0) {
-							for (int j = 0; j < libraries.length; j++) {
-								String libName = libraries[j].getName()
-										.substring(7);
-								IPath path = fProject.getFile(libName)
-										.getProjectRelativePath();
-								if (path.segmentCount() == 1
-										&& !includes.contains(libName)
-										&& !libName.equals(resource.getName()))
-									includes.addToken(libName);
-							}
-						}
-					}
-					includes.removeToken("*." + resource.getFileExtension()); //$NON-NLS-1$
-				}
-			}
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	protected String getResourceFolderName(String resourceName) {
-		return resourceName + Path.SEPARATOR;
-	}
-
-	/**
-	 * @param resource -
-	 *            file/folder being modified in tree
-	 * @param resourceName -
-	 *            name file/folder
-	 * @return relative path of folder if resource is folder, otherwise, return
-	 *         resourceName
-	 */
-	protected String handleResourceFolder(IResource resource,
-			String resourceName) {
-		if (resource instanceof IFolder) {
-			deleteFolderChildrenFromEntries((IFolder) resource);
-			return getResourceFolderName(resourceName);
-		}
-		return resourceName;
-	}
-
-	public void initialize() {
-		if (fTreeViewer.getInput() == null) {
-			fTreeViewer.setUseHashlookup(true);
-			fTreeViewer.setInput(fProject);
-		}
-		fBuildModel.addModelChangedListener(this);
-	}
-
-	public void dispose() {
-		fBuildModel.removeModelChangedListener(this);
-		PDEPlugin.getWorkspace().removeResourceChangeListener(this);
-		super.dispose();
-	}
-
-	protected void deleteEmptyEntries() {
-		IBuild build = fBuildModel.getBuild();
-		IBuildEntry[] entries = {
-				build.getEntry(IBuildPropertiesConstants.PROPERTY_BIN_EXCLUDES),
-				build.getEntry(IBuildPropertiesConstants.PROPERTY_BIN_INCLUDES),
-				build.getEntry(IBuildPropertiesConstants.PROPERTY_SRC_EXCLUDES),
-				build.getEntry(IBuildPropertiesConstants.PROPERTY_SRC_INCLUDES)};
-		try {
-			for (int i = 0; i < entries.length; i++) {
-				if (entries[i] != null && entries[i].getTokens().length == 0)
-					build.remove(entries[i]);
-			}
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	public CheckboxTreeViewer getTreeViewer() {
-		return fTreeViewer;
-	}
-
-	protected ISelection getViewerSelection() {
-		return getTreeViewer().getSelection();
-	}
-
-	public void refresh() {
-		initializeCheckState();
-		super.refresh();
-	}
-
-	public void uncheckAll() {
-		fTreeViewer.setCheckedElements(new Object[0]);
-	}
-
-	protected void removeChildren(IBuildEntry entry, String parentFolder) {
-		try {
-			if (entry != null) {
-				String[] tokens = entry.getTokens();
-				for (int i = 0; i < tokens.length; i++) {
-					if (tokens[i].indexOf(Path.SEPARATOR) != -1
-							&& tokens[i].startsWith(parentFolder)
-							&& !tokens[i].equals(parentFolder)) {
-						entry.removeToken(tokens[i]);
-					}
-				}
-			}
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	public void resourceChanged(IResourceChangeEvent event) {
-		if (fTreeViewer.getControl().isDisposed())
-			return;
-		fDoRefresh = false;
-		IResourceDelta delta = event.getDelta();
-		try {
-			if (delta != null)
-				delta.accept(this);
-			if (fDoRefresh) {
-				asyncRefresh();
-				fDoRefresh = false;
-			}
-		} catch (CoreException e) {
-		}
-	}
-
-	public boolean visit(IResourceDelta delta) throws CoreException {
-		IResource resource = delta.getResource();
-		IProject project = fBuildModel.getUnderlyingResource().getProject();
-		
-		if ((resource instanceof IFile || resource instanceof IFolder)
-				&& resource.getProject().equals(project)) {
-			if (delta.getKind() == IResourceDelta.ADDED
-					|| delta.getKind() == IResourceDelta.REMOVED) {
-				fDoRefresh = true;
-				return false;
-			}
-		} else if (resource instanceof IProject && ((IProject)resource).equals(project)) {
-			return delta.getKind() != IResourceDelta.REMOVED;
-		}
-		return true;
-	}
-
-	private void asyncRefresh() {
-		Control control = fTreeViewer.getControl();
-		if (!control.isDisposed()) {
-			control.getDisplay().asyncExec(new Runnable() {
-
-				public void run() {
-					if (!fTreeViewer.getControl().isDisposed()) {
-						fTreeViewer.refresh(true);
-						initializeCheckState();
-					}
-				}
-			});
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.editor.TableSection#selectionChanged(org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	protected void selectionChanged(IStructuredSelection selection) {
-		getPage().getPDEEditor().setSelection(selection);
-
-	}
-
-	public void modelChanged(IModelChangedEvent event) {
-
-		if (event.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			markStale();
-		}
-		Object changeObject = event.getChangedObjects()[0];
-
-		if (!(changeObject instanceof IBuildEntry && (((IBuildEntry) changeObject)
-				.getName().equals(
-						IBuildPropertiesConstants.PROPERTY_BIN_EXCLUDES)
-				|| ((IBuildEntry) changeObject).getName().equals(
-						IBuildPropertiesConstants.PROPERTY_BIN_INCLUDES)
-				|| ((IBuildEntry) changeObject).getName().equals(
-						IBuildPropertiesConstants.PROPERTY_SRC_EXCLUDES) || ((IBuildEntry) changeObject)
-				.getName().equals(
-						IBuildPropertiesConstants.PROPERTY_SRC_INCLUDES))))
-			return;
-
-		if ((fParentResource == null && fOriginalResource != null)
-				|| (fOriginalResource == null && fParentResource != null)) {
-			initializeCheckState();
-			return;
-		}
-		if ((fParentResource == null && fOriginalResource == null)
-				|| (event.getChangedProperty() != null && event
-						.getChangedProperty()
-						.equals(IBuildPropertiesConstants.PROPERTY_BIN_INCLUDES))) {
-
-			return;
-		}
-
-		fTreeViewer.setChecked(fParentResource, isChecked);
-		fTreeViewer.setGrayed(fOriginalResource, false);
-		fTreeViewer.setParentsGrayed(fParentResource, true);
-		setParentsChecked(fParentResource);
-		fTreeViewer.setGrayed(fParentResource, false);
-		if (fParentResource instanceof IFolder) {
-			fTreeViewer.setSubtreeChecked(fParentResource, isChecked);
-			setChildrenGrayed(fParentResource, false);
-		}
-		while (!fOriginalResource.equals(fParentResource)) {
-			fTreeViewer.setChecked(fOriginalResource, isChecked);
-			fOriginalResource = fOriginalResource.getParent();
-		}
-		fParentResource = null;
-		fOriginalResource = null;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildEditor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildEditor.java
deleted file mode 100644
index fe9fb8f..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildEditor.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.build;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.core.build.*;
-import org.eclipse.pde.internal.core.build.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.editor.context.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.dnd.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.forms.editor.*;
-import org.eclipse.ui.part.*;
-import org.eclipse.ui.views.properties.*;
-
-public class BuildEditor extends MultiSourceEditor {
-	public BuildEditor() {
-	}
-	protected void createResourceContexts(InputContextManager manager,
-			IFileEditorInput input) {
-		IFile file = input.getFile();
-
-		manager.putContext(input, new BuildInputContext(this, input, true));
-		manager.monitorFile(file);
-	}
-	
-	protected InputContextManager createInputContextManager() {
-		BuildInputContextManager manager =  new BuildInputContextManager(this);
-		manager.setUndoManager(new BuildUndoManager(this));
-		return manager;
-	}
-	
-	public void monitoredFileAdded(IFile file) {
-		String name = file.getName();
-		if (name.equalsIgnoreCase("build.properties")) { //$NON-NLS-1$
-			if (!inputContextManager.hasContext(BuildInputContext.CONTEXT_ID)) {
-				IEditorInput in = new FileEditorInput(file);
-				inputContextManager.putContext(in, new BuildInputContext(this, in, false));
-			}
-		}
-	}
-
-	public boolean monitoredFileRemoved(IFile file) {
-		//TODO may need to check with the user if there
-		//are unsaved changes in the model for the
-		//file that just got removed under us.
-		return true;
-	}
-	public void contextAdded(InputContext context) {
-		addSourcePage(context.getId());
-	}
-	public void contextRemoved(InputContext context) {
-		if (context.isPrimary()) {
-			close(true);
-			return;
-		}
-		IFormPage page = findPage(context.getId());
-		if (page!=null)
-			removePage(context.getId());
-	}
-
-	protected void createSystemFileContexts(InputContextManager manager,
-			SystemFileEditorInput input) {
-		manager.putContext(input, new BuildInputContext(this, input, true));
-	}
-
-	protected void createStorageContexts(InputContextManager manager,
-			IStorageEditorInput input) {
-		manager.putContext(input, new BuildInputContext(this, input, true));
-	}
-
-	public boolean canCopy(ISelection selection) {
-		return true;
-	}
-	
-	protected void addPages() {
-		try {
-			if (getEditorInput() instanceof IFileEditorInput)
-				addPage(new BuildPage(this));			
-		} catch (PartInitException e) {
-			PDEPlugin.logException(e);
-		}
-		addSourcePage(BuildInputContext.CONTEXT_ID);
-	}
-
-	protected String computeInitialPageId() {
-		String firstPageId = super.computeInitialPageId();
-		if (firstPageId == null) {
-			InputContext primary = inputContextManager.getPrimaryContext();
-			if (primary.getId().equals(BuildInputContext.CONTEXT_ID))
-				firstPageId = BuildPage.PAGE_ID;
-			if (firstPageId == null)
-				firstPageId = BuildPage.PAGE_ID;
-		}
-		return firstPageId;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.MultiSourceEditor#createXMLSourcePage(org.eclipse.pde.internal.ui.neweditor.PDEFormEditor, java.lang.String, java.lang.String)
-	 */
-	protected PDESourcePage createSourcePage(PDEFormEditor editor, String title, String name, String contextId) {
-		return new BuildSourcePage(editor, title, name);
-	}
-	
-	protected ISortableContentOutlinePage createContentOutline() {
-		return new BuildOutlinePage(this);
-	}
-	
-	protected IPropertySheetPage getPropertySheet(PDEFormPage page) {
-		return null;
-	}
-
-	public String getTitle() {
-		return super.getTitle();
-	}
-
-	protected boolean isModelCorrect(Object model) {
-		return model != null ? ((IBuildModel) model).isValid() : false;
-	}
-	protected boolean hasKnownTypes() {
-		try {
-			TransferData[] types = getClipboard().getAvailableTypes();
-			Transfer[] transfers =
-				new Transfer[] { TextTransfer.getInstance(), RTFTransfer.getInstance()};
-			for (int i = 0; i < types.length; i++) {
-				for (int j = 0; j < transfers.length; j++) {
-					if (transfers[j].isSupportedType(types[i]))
-						return true;
-				}
-			}
-		} catch (SWTError e) {
-		}
-		return false;
-	}
-
-	public Object getAdapter(Class key) {
-		//No property sheet needed - block super
-		if (key.equals(IPropertySheetPage.class)) {
-			return null;
-		}
-		return super.getAdapter(key);
-	}	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#getInputContext(java.lang.Object)
-	 */
-	protected InputContext getInputContext(Object object) {
-		InputContext context = null;
-		if (object instanceof IBuildObject) {
-			context = inputContextManager.findContext(BuildInputContext.CONTEXT_ID);
-		} 
-		return context;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildEditorContributor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildEditorContributor.java
deleted file mode 100644
index 975e447..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildEditorContributor.java
+++ /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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.build;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.swt.dnd.Clipboard;
-
-public class BuildEditorContributor extends PDEFormEditorContributor {
-
-	public BuildEditorContributor() {
-		super("&Build"); //$NON-NLS-1$
-	}
-	protected boolean hasKnownTypes(Clipboard clipboard) {
-		return true;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildInputContext.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildInputContext.java
deleted file mode 100644
index eeb423d..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildInputContext.java
+++ /dev/null

@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.build;
-
-import java.io.*;
-import java.util.*;
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.text.*;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.editor.context.*;
-import org.eclipse.pde.internal.ui.model.*;
-import org.eclipse.pde.internal.ui.model.build.*;
-import org.eclipse.text.edits.*;
-import org.eclipse.ui.*;
-
-public class BuildInputContext extends InputContext {
-	public static final String CONTEXT_ID = "build-context"; //$NON-NLS-1$
-	
-	private HashMap fOperationTable = new HashMap();
-
-	public BuildInputContext(PDEFormEditor editor, IEditorInput input, boolean primary) {
-		super(editor, input, primary);
-		create();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.context.InputContext#getCharSet()
-	 */
-	protected String getDefaultCharset() {
-		return "ISO-8859-1"; //$NON-NLS-1$
-	}
-
-	protected IBaseModel createModel(IEditorInput input) throws CoreException {
-		BuildModel model = null;
-		if (input instanceof IStorageEditorInput) {
-			boolean isReconciling = input instanceof IFileEditorInput;
-			IDocument document = getDocumentProvider().getDocument(input);
-			model = new BuildModel(document, isReconciling);
-			if (input instanceof IFileEditorInput) {
-				IFile file = ((IFileEditorInput)input).getFile();
-				model.setUnderlyingResource(file);
-				model.setCharset(file.getCharset());
-			} else if (input instanceof SystemFileEditorInput){
-				File file = (File)((SystemFileEditorInput)input).getAdapter(File.class);
-				model.setInstallLocation(file.getParent());
-				model.setCharset(getDefaultCharset());
-			} else {
-				model.setCharset(getDefaultCharset());				
-			}
-			model.load();
-		}
-		return model;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.InputContext#getId()
-	 */
-	public String getId() {
-		return CONTEXT_ID;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.context.InputContext#addTextEditOperation(java.util.ArrayList, org.eclipse.pde.core.IModelChangedEvent)
-	 */
-	protected void addTextEditOperation(ArrayList ops, IModelChangedEvent event) {
-		Object[] objects = event.getChangedObjects();
-		if (objects != null) {
-			for (int i = 0; i < objects.length; i++) {
-				Object object = objects[i];
-				IDocumentKey key = (IDocumentKey)object;
-				TextEdit op = (TextEdit)fOperationTable.get(key);
-				if (op != null) {
-					fOperationTable.remove(key);
-					ops.remove(op);
-				}
-				switch (event.getChangeType()) {
-					case IModelChangedEvent.REMOVE :
-						deleteKey(key, ops);
-						break;
-					case IModelChangedEvent.INSERT :
-						insertKey(key, ops);
-						break;
-					case IModelChangedEvent.CHANGE :
-						modifyKey(key, ops);
-					default:
-						break;
-				}
-			}
-		}
-	}
-	
-	private void insertKey(IDocumentKey key, ArrayList ops) {
-		IDocument doc = getDocumentProvider().getDocument(getInput());
-		String preTermination = ""; //$NON-NLS-1$
-		if (doc.getNumberOfLines() > 0) {
-			try {
-				if (doc.getLineDelimiter(doc.getNumberOfLines() - 1) == null
-						&& doc.getLineLength(doc.getNumberOfLines() - 1) > 0) {
-					preTermination = getLineDelimiter(); 
-				}
-			} catch (BadLocationException ble) {
-			}
-		}
-		InsertEdit op = new InsertEdit(doc.getLength(), preTermination
-				+ key.write());
-		fOperationTable.put(key, op);
-		ops.add(op);
-	}
-	
-	private void deleteKey(IDocumentKey key, ArrayList ops) {
-		if (key.getOffset() >= 0) {
-			TextEdit op = new DeleteEdit(key.getOffset(), key.getLength());
-			fOperationTable.put(key, op);
-			ops.add(op);
-		}
-	}
-	
-	private void modifyKey(IDocumentKey key, ArrayList ops) {		
-		if (key.getOffset() == -1) {
-			insertKey(key, ops);
-		} else {
-			TextEdit op = new ReplaceEdit(key.getOffset(), key.getLength(), key.write());
-			fOperationTable.put(key, op);
-			ops.add(op);
-		}	
-	}
-	public void doRevert() {
-		fEditOperations.clear();
-		fOperationTable.clear();
-		AbstractEditingModel model = (AbstractEditingModel)getModel();
-		model.reconciled(model.getDocument());
-	}
-
-	protected String getPartitionName() {
-		return "___build_partition"; //$NON-NLS-1$
-	}	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildInputContextManager.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildInputContextManager.java
deleted file mode 100644
index e27d9a5..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildInputContextManager.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.build;
-
-import org.eclipse.pde.core.IBaseModel;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.pde.internal.ui.editor.context.*;
-
-public class BuildInputContextManager extends InputContextManager {
-	/**
-	 * 
-	 */
-	public BuildInputContextManager(PDEFormEditor editor) {
-		super(editor);
-	}
-
-	public IBaseModel getAggregateModel() {
-		return findBuildModel();
-	}
-
-	private IBaseModel findBuildModel() {
-		InputContext bcontext = findContext(BuildInputContext.CONTEXT_ID);
-		return (bcontext != null) ? bcontext.getModel() : null;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildOutlinePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildOutlinePage.java
deleted file mode 100644
index dddf4b6..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildOutlinePage.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.build;
-import org.eclipse.pde.core.build.*;
-import org.eclipse.pde.internal.ui.editor.*;
-
-public class BuildOutlinePage extends FormOutlinePage {
-	/**
-	 * @param editor
-	 */
-	public BuildOutlinePage(PDEFormEditor editor) {
-		super(editor);
-	}
-	protected Object[] getChildren(Object parent) {
-		if (parent instanceof PDEFormPage) {
-			PDEFormPage page = (PDEFormPage) parent;
-			IBuildModel model = (IBuildModel) page.getModel();
-			if (model.isValid()) {
-				IBuild build = model.getBuild();
-				if (page.getId().equals(BuildPage.PAGE_ID))
-					return build.getBuildEntries();
-			}
-		}
-		return new Object[0];
-	}
-	protected String getParentPageId(Object item) {
-		String pageId = null;
-		if (item instanceof IBuildEntry)
-			pageId = BuildPage.PAGE_ID;
-		if (pageId != null)
-			return pageId;
-		return super.getParentPageId(item);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildPage.java
deleted file mode 100644
index cfef31a..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildPage.java
+++ /dev/null

@@ -1,180 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.build;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.pde.core.build.IBuild;
-import org.eclipse.pde.core.build.IBuildEntry;
-import org.eclipse.pde.core.build.IBuildModel;
-import org.eclipse.pde.internal.build.IBuildPropertiesConstants;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.context.InputContext;
-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.Label;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-
-public class BuildPage extends PDEFormPage {
-	public static final String PAGE_ID = "build"; //$NON-NLS-1$
-	private BuildClasspathSection classpathSection;
-	private BuildContentsSection srcSection;
-	private BuildContentsSection binSection;
-	private RuntimeInfoSection runtimeSection;
-	
-	private Button customButton;
-	
-	public BuildPage(FormEditor editor) {
-		super(editor, PAGE_ID, PDEUIMessages.BuildPage_name);  
-	}
-
-	protected void createFormContent(IManagedForm mform) {
-		super.createFormContent(mform);
-		FormToolkit toolkit = mform.getToolkit();
-		GridLayout layout = new GridLayout();
-		ScrolledForm form = mform.getForm();
-		form.setText(PDEUIMessages.BuildEditor_BuildPage_title);
-		layout.numColumns = 2;
-		layout.marginWidth = 10;
-		layout.horizontalSpacing = 15;
-		layout.verticalSpacing = 10;
-		layout.makeColumnsEqualWidth = true;
-		form.getBody().setLayout(layout);
-
-		customButton =
-			toolkit.createButton(
-				form.getBody(),
-				getCustomText(),
-				SWT.CHECK);
-		customButton.setAlignment(SWT.LEFT);
-		GridData gd = new GridData (GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan =1;
-		customButton.setLayoutData(gd);
-		
-		Label label = toolkit.createLabel(form.getBody(), null);
-		gd = new GridData (GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan =1;
-		label.setLayoutData(gd);
-		
-		customButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				boolean isCustom = customButton.getSelection();
-				IBuildEntry customEntry = getCustomBuildEntry();
-				setCustomEntryValue(customEntry, isCustom);
-				handleCustomCheckState(isCustom);
-			}
-		});
-		
-		runtimeSection = new RuntimeInfoSection(this, form.getBody());
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		runtimeSection.getSection().setLayoutData(gd);
-		
-		binSection = new BinSection(this, form.getBody());
-		gd = new GridData(GridData.FILL_BOTH);
-		binSection.getSection().setLayoutData(gd);
-
-		srcSection = new SrcSection(this, form.getBody());
-		gd = new GridData(GridData.FILL_BOTH);
-		srcSection.getSection().setLayoutData(gd);
-
-		classpathSection = new BuildClasspathSection(this, form.getBody());
-		gd = new GridData(GridData.FILL_HORIZONTAL|GridData.VERTICAL_ALIGN_BEGINNING);
-		gd.horizontalSpan=2;
-		//gd.widthHint = 100;
-		//gd.heightHint = 100;
-		classpathSection.getSection().setLayoutData(gd);
-		
-		mform.addPart(runtimeSection);
-		mform.addPart(srcSection);
-		mform.addPart(binSection);
-		mform.addPart(classpathSection);
-
-		handleCustomCheckState(getCustomSelection());
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.BUILD_PAGE);
-	}
-
-	private IBuildModel getBuildModel() {
-		InputContext context = getPDEEditor().getContextManager()
-				.findContext(BuildInputContext.CONTEXT_ID);
-		return (IBuildModel) context.getModel();
-	}
-
-	private IBuildEntry getCustomBuildEntry(){
-		IBuildModel buildModel = getBuildModel();
-		IBuildEntry customEntry =
-			buildModel.getBuild().getEntry(IBuildPropertiesConstants.PROPERTY_CUSTOM);
-			
-		if (customEntry!=null)
-			return customEntry;
-							
-		try {
-			customEntry =
-				buildModel.getFactory().createEntry(IBuildPropertiesConstants.PROPERTY_CUSTOM);
-			buildModel.getBuild().add(customEntry);
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-		return customEntry;
-	}
-	
-	private boolean getCustomSelection(){
-		IBuildModel model = getBuildModel();
-		IBuild build = model.getBuild();
-		IBuildEntry customEntry = build.getEntry(IBuildPropertiesConstants.PROPERTY_CUSTOM);
-		if (customEntry ==null || customEntry.getTokens().length ==0)
-			return false;
-		return customEntry.getTokens()[0].equals("true");  //$NON-NLS-1$
-	}
-	
-	private void handleCustomCheckState(boolean isCustom){
-		customButton.setSelection(isCustom);
-		enableAllSections(!isCustom);
-	}
-	
-	public void enableAllSections(boolean enable){
-		runtimeSection.enableSection(enable);
-		binSection.enableSection(enable);
-		srcSection.enableSection(enable);
-		classpathSection.enableSection(enable);
-	}
-
-	private void setCustomEntryValue(IBuildEntry customEntry, boolean isCustom){
-		String[] tokens = customEntry.getTokens();
-		try {
-			if (tokens.length != 0) {
-				for (int i = 0; i < tokens.length; i++)
-					customEntry.removeToken(tokens[i]);
-			}
-			if (isCustom)
-				customEntry.addToken("true"); //$NON-NLS-1$
-			else
-				getBuildModel().getBuild().remove(customEntry);
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}	
-	}
-	
-	private String getCustomText() {
-		return PDEUIMessages.BuildPage_custom; 
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildSourcePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildSourcePage.java
deleted file mode 100644
index 5d2beea..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildSourcePage.java
+++ /dev/null

@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.build;
-import org.eclipse.jface.text.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.core.build.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.elements.*;
-import org.eclipse.pde.internal.ui.model.*;
-import org.eclipse.pde.internal.ui.model.build.*;
-import org.eclipse.swt.graphics.*;
-
-public class BuildSourcePage extends KeyValueSourcePage {
-	class BuildOutlineContentProvider extends DefaultContentProvider
-			implements
-				ITreeContentProvider {
-		public Object[] getChildren(Object parent) {
-			return new Object[0];
-		}
-		public boolean hasChildren(Object parent) {
-			return false;
-		}
-		public Object getParent(Object child) {
-			if (child instanceof IBuildEntry)
-				return ((IBuildEntry) child).getModel();
-			return null;
-		}
-		public Object[] getElements(Object parent) {
-			if (parent instanceof IBuildModel) {
-				IBuildModel model = (IBuildModel) parent;
-				IBuild build = model.getBuild();
-				return build.getBuildEntries();
-			}
-			return new Object[0];
-		}
-	}
-	class BuildLabelProvider extends LabelProvider {
-		public String getText(Object obj) {
-			if (obj instanceof IBuildEntry) {
-				return ((IBuildEntry) obj).getName();
-			}
-			return super.getText(obj);
-		}
-		public Image getImage(Object obj) {
-			if (obj instanceof IBuildEntry)
-				return PDEPlugin.getDefault().getLabelProvider().get(
-					PDEPluginImages.DESC_BUILD_VAR_OBJ);
-			return null;
-		}
-	}
-	public BuildSourcePage(PDEFormEditor editor, String id, String title) {
-		super(editor, id, title);
-	}
-	
-	protected ILabelProvider createOutlineLabelProvider() {
-		return new BuildLabelProvider();
-	}
-	
-	protected ITreeContentProvider createOutlineContentProvider() {
-		return new BuildOutlineContentProvider();
-	}
-	protected IDocumentRange getRangeElement(ITextSelection selection) {
-		if (selection.isEmpty())
-			return null;
-		IBuildModel model = (IBuildModel) getInputContext().getModel();
-		return findBuildNode(model.getBuild().getBuildEntries(), selection.getOffset());
-	}
-
-	private BuildEntry findBuildNode(IBuildEntry[] nodes, int offset) {
-		for (int i = 0; i < nodes.length; i++) {
-			BuildEntry node = (BuildEntry) nodes[i];
-			if (offset >= node.getOffset()
-					&& offset < node.getOffset() + node.getLength()) {
-				return node;
-			}
-		}
-		return null;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildUndoManager.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildUndoManager.java
deleted file mode 100644
index 2fce62f..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildUndoManager.java
+++ /dev/null

@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.build;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.core.build.*;
-import org.eclipse.pde.internal.core.build.*;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.editor.*;
-
-public class BuildUndoManager extends ModelUndoManager {
-
-	public BuildUndoManager(PDEFormEditor editor) {
-		super(editor);
-		setUndoLevelLimit(30);
-	}
-
-	protected String getPageId(Object obj) {
-		if (obj instanceof IBuildEntry)
-			return BuildPage.PAGE_ID;
-		return null;
-	}
-
-	protected void execute(IModelChangedEvent event, boolean undo) {
-		Object[] elements = event.getChangedObjects();
-		int type = event.getChangeType();
-		String propertyName = event.getChangedProperty();
-		IBuildModel model = (IBuildModel)event.getChangeProvider();
-
-		switch (type) {
-			case IModelChangedEvent.INSERT :
-				if (undo)
-					executeRemove(model, elements);
-				else
-					executeAdd(model, elements);
-				break;
-			case IModelChangedEvent.REMOVE :
-				if (undo)
-					executeAdd(model, elements);
-				else
-					executeRemove(model, elements);
-				break;
-			case IModelChangedEvent.CHANGE :
-				if (undo)
-					executeChange(
-						elements[0],
-						propertyName,
-						event.getNewValue(),
-						event.getOldValue());
-				else
-					executeChange(
-						elements[0],
-						propertyName,
-						event.getOldValue(),
-						event.getNewValue());
-		}
-	}
-
-	private void executeAdd(IBuildModel model, Object[] elements) {
-		IBuild build = model.getBuild();
-
-		try {
-			for (int i = 0; i < elements.length; i++) {
-				Object element = elements[i];
-
-				if (element instanceof IBuildEntry) {
-					build.add((IBuildEntry)element);
-				}
-			}
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	private void executeRemove(IBuildModel model, Object[] elements) {
-		IBuild build = model.getBuild();
-
-		try {
-			for (int i = 0; i < elements.length; i++) {
-				Object element = elements[i];
-
-				if (element instanceof IBuildEntry) {
-					build.remove((IBuildEntry)element);
-				}
-			}
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	private void executeChange(
-		Object element,
-		String propertyName,
-		Object oldValue,
-		Object newValue) {
-		if (element instanceof BuildObject) {
-			BuildObject bobj = (BuildObject) element;
-			try {
-				bobj.restoreProperty(propertyName, oldValue, newValue);
-			} catch (CoreException e) {
-				PDEPlugin.logException(e);
-			}
-		}
-	}
-
-	public void modelChanged(IModelChangedEvent event) {
-		if (event.getChangeType() == IModelChangedEvent.CHANGE) {
-			Object obj = event.getChangedObjects()[0];
-			if (obj instanceof IBuildObject) {
-				IBuildObject bobj = (IBuildObject) event.getChangedObjects()[0];
-				//Ignore events from objects that are not yet in the model.
-				if (!(bobj instanceof IBuild) && bobj.isInTheModel() == false)
-					return;
-			}
-		}
-		super.modelChanged(event);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildUtil.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildUtil.java
deleted file mode 100644
index 4aeaf76..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/BuildUtil.java
+++ /dev/null

@@ -1,30 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.build;
-
-import java.util.Vector;
-
-import org.eclipse.pde.core.build.IBuildEntry;
-
-public class BuildUtil {
-
-	public static IBuildEntry[] getBuildLibraries(IBuildEntry[] entries) {
-		Vector temp = new Vector();
-		for (int i = 0; i < entries.length; i++) {
-			if (entries[i].getName().startsWith(IBuildEntry.JAR_PREFIX))
-				temp.add(entries[i]);
-		}
-		IBuildEntry[] result = new IBuildEntry[temp.size()];
-		temp.copyInto(result);
-		return result;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/JARFileFilter.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/JARFileFilter.java
deleted file mode 100644
index 44b5e34..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/JARFileFilter.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.editor.build;
-
-import java.util.*;
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-
-
-public class JARFileFilter extends ViewerFilter{
-	private final static String jarExt = "jar"; //$NON-NLS-1$
-	private HashSet fPaths;
-	
-	public JARFileFilter(){
-		fPaths = new HashSet();
-	}
-	
-	public JARFileFilter(HashSet names) {
-		fPaths = names;
-	}
-	
-	public boolean select(Viewer viewer, Object parent, Object element){
-		if (element instanceof IFile)
-			return isFileValid(((IFile)element).getProjectRelativePath());
-
-			if (element instanceof IContainer){ // i.e. IProject, IFolder
-			try {
-				IResource[] resources = ((IContainer)element).members();
-				for (int i = 0; i < resources.length; i++){
-					if (select(viewer, parent, resources[i]))
-						return true;
-				}
-			} catch (CoreException e) {
-				PDEPlugin.logException(e);
-			}
-		}
-		return false;
-	}
-	
-	public boolean isFileValid(IPath path){
-		String ext = path.getFileExtension();
-		if (isPathValid(path) && ext!=null && ext.length()!=0)
-			return ext.equals(jarExt);
-		return false;
-	}
-	
-	public boolean isPathValid(IPath path) {
-		return !fPaths.contains(path);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/RuntimeInfoSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/RuntimeInfoSection.java
deleted file mode 100644
index 9d85f46..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/RuntimeInfoSection.java
+++ /dev/null

@@ -1,1160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.editor.build;
-
-import java.util.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.core.build.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.build.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.editor.context.*;
-import org.eclipse.pde.internal.ui.elements.*;
-import org.eclipse.pde.internal.ui.parts.*;
-import org.eclipse.pde.internal.ui.wizards.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.custom.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.actions.*;
-import org.eclipse.ui.dialogs.*;
-import org.eclipse.ui.forms.widgets.*;
-import org.eclipse.ui.model.*;
-import org.eclipse.core.runtime.Path;
-
-public class RuntimeInfoSection extends PDESection
-implements
-IModelChangedListener {
-	
-	protected TableViewer fLibraryViewer;
-	protected TableViewer fFolderViewer;
-	
-	protected StructuredViewerPart fLibraryPart;
-	protected StructuredViewerPart fFolderPart;
-	private IBuildEntry fCurrentLibrary;
-	private IStructuredSelection fCurrentSelection;
-	
-	private Button fIncludeLibraryButton;
-	private boolean fEnabled = true;
-	
-	class RenameAction extends Action {
-		
-		public RenameAction() {
-			super(PDEUIMessages.EditableTablePart_renameAction); 
-		}
-		
-		public void run() {
-			doRename();
-		}
-	}
-	
-	class PartAdapter extends TablePart {
-		
-		public PartAdapter(String[] buttonLabels) {
-			super(buttonLabels);
-		}
-		
-		public void selectionChanged(IStructuredSelection selection) {
-			if (selection.size() != 0)
-				RuntimeInfoSection.this.selectionChanged(selection);
-		}
-		
-		public void handleDoubleClick(IStructuredSelection selection) {
-			RuntimeInfoSection.this.handleDoubleClick(selection);
-		}
-		
-		public void buttonSelected(Button button, int index) {
-			if (getViewer() == fLibraryPart.getViewer()) {
-				switch (index) {
-				case 0 :
-					handleNew();
-					break;
-				case 2 :
-					handleUp();
-					break;
-				case 3 :
-					handleDown();
-					break;
-				}
-			} else if (getViewer() == fFolderPart.getViewer()) {
-				if (index == 0)
-					handleNewFolder();
-			} else {
-				button.getShell().setDefaultButton(null);
-			}
-		}
-	}
-	
-	public class LibraryContentProvider extends DefaultContentProvider
-	implements
-	IStructuredContentProvider {
-		
-		public Object[] getElements(Object parent) {
-			if (parent instanceof IBuildModel) {
-				IBuild build = ((IBuildModel) parent).getBuild();
-				IBuildEntry jarOrderEntry = build
-				.getEntry(IBuildPropertiesConstants.PROPERTY_JAR_ORDER);
-				IBuildEntry[] libraries = BuildUtil.getBuildLibraries(build
-						.getBuildEntries());
-				if (jarOrderEntry == null) {
-					return libraries;
-				}
-				
-				Vector libList = new Vector();
-				String[] tokens = jarOrderEntry.getTokens();
-				for (int i = 0; i < tokens.length; i++) {
-					IBuildEntry entry = build.getEntry(IBuildEntry.JAR_PREFIX
-							+ tokens[i]);
-					if (entry != null)
-						libList.add(entry);
-				}
-				for (int i = 0; i < libraries.length; i++) {
-					if (!libList.contains(libraries[i]))
-						libList.add(libraries[i]);
-				}
-				return (IBuildEntry[]) libList.toArray(new IBuildEntry[libList
-																	   .size()]);
-			}
-			return new Object[0];
-		}
-	}
-	
-	public class LibraryLabelProvider extends LabelProvider
-	implements
-	ITableLabelProvider {
-		
-		public String getColumnText(Object obj, int index) {
-			String name = ((IBuildEntry) obj).getName();
-			if (name.startsWith(IBuildEntry.JAR_PREFIX))
-				return name.substring(IBuildEntry.JAR_PREFIX.length());
-			return name;
-		}
-		
-		public Image getColumnImage(Object obj, int index) {
-			PDELabelProvider provider = PDEPlugin.getDefault()
-			.getLabelProvider();
-			return provider.get(PDEPluginImages.DESC_JAVA_LIB_OBJ);
-		}
-	}
-	
-	class JarsNewContentProvider extends WorkbenchContentProvider {
-		
-		public boolean hasChildren(Object element) {
-			Object[] children = getChildren(element);
-			for (int i = 0; i < children.length; i++) {
-				if (children[i] instanceof IFolder) {
-					return true;
-				}
-			}
-			return false;
-		}
-	}
-	
-	public class FolderContentProvider extends DefaultContentProvider
-	implements
-	IStructuredContentProvider {
-		
-		public Object[] getElements(Object parent) {
-			return (parent instanceof IBuildEntry) ? ((IBuildEntry) parent)
-					.getTokens() : new Object[0];
-		}
-	}
-	
-	public class FolderLabelProvider extends LabelProvider
-	implements
-	ITableLabelProvider {
-		
-		public String getColumnText(Object obj, int index) {
-			return obj.toString();
-		}
-		
-		public Image getColumnImage(Object obj, int index) {
-			ISharedImages sharedImages = PlatformUI.getWorkbench()
-			.getSharedImages();
-			return sharedImages.getImage(ISharedImages.IMG_OBJ_FOLDER);
-		}
-	}
-	
-	public RuntimeInfoSection(PDEFormPage page, Composite parent) {
-		super(page, parent, Section.DESCRIPTION);
-		getSection().setText(PDEUIMessages.BuildEditor_RuntimeInfoSection_title);
-		getSection().setDescription(PDEUIMessages.BuildEditor_RuntimeInfoSection_desc);
-		getBuildModel().addModelChangedListener(this);
-		createClient(getSection(), page.getManagedForm().getToolkit());
-		PDEPlugin.getDefault().getLabelProvider().connect(this);
-	}
-	
-	private IBuildModel getBuildModel() {
-		InputContext context = getPage().getPDEEditor().getContextManager()
-		.findContext(BuildInputContext.CONTEXT_ID);
-		if (context==null)
-			return null;
-		return (IBuildModel) context.getModel();
-	}
-	
-	protected void handleLibInBinBuild(boolean isSelected, String libName) {
-		IBuildModel model = getBuildModel();
-		IBuildEntry binIncl = model.getBuild().getEntry(
-				IBuildPropertiesConstants.PROPERTY_BIN_INCLUDES);
-		IProject project = model.getUnderlyingResource().getProject();
-		IPath libPath;
-		if (libName.equals(".")) //$NON-NLS-1$
-			libPath = null;
-		else
-			libPath = project.getFile(libName).getProjectRelativePath();
-		try {
-			if (binIncl == null && !isSelected)
-				return;
-			if (binIncl == null) {
-				binIncl = model.getFactory().createEntry(
-						IBuildPropertiesConstants.PROPERTY_BIN_INCLUDES);
-				model.getBuild().add(binIncl);
-			}
-			if (libPath != null){
-				if (!isSelected && libPath.segmentCount() == 1	&& binIncl.contains("*.jar")) { //$NON-NLS-1$
-					addAllJarsToBinIncludes(binIncl, project, model);
-				} else if (!isSelected && libPath.segmentCount() > 1){
-					IPath parent = libPath.removeLastSegments(1);
-					String parentPath = parent.toString() + Path.SEPARATOR;
-					if (binIncl.contains(parentPath) && !project.exists(parent)){
-						binIncl.removeToken(parentPath);
-					} else if (parent.segmentCount() > 1){
-						parent = parent.removeLastSegments(1);
-						parentPath = parent.toString() + Path.SEPARATOR;
-						if (binIncl.contains(parentPath) && !project.exists(parent))
-							binIncl.removeToken(parentPath);
-					}
-				}
-			}
-			if (isSelected && !binIncl.contains(libName)) {
-				binIncl.addToken(libName);
-			} else if (!isSelected && binIncl.contains(libName)) {
-				binIncl.removeToken(libName);
-			}
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-		
-	}
-	
-	protected void addAllJarsToBinIncludes(IBuildEntry binIncl,
-			IProject project, IBuildModel model) {
-		try {
-			IResource[] members = project.members();
-			for (int i = 0; i < members.length; i++) {
-				if (!(members[i] instanceof IFolder)
-						&& members[i].getFileExtension().equals("jar")) { //$NON-NLS-1$
-					binIncl.addToken(members[i].getName());
-				}
-			}
-			
-			IBuildEntry[] libraries = BuildUtil.getBuildLibraries(model
-					.getBuild().getBuildEntries());
-			if (libraries.length != 0) {
-				for (int j = 0; j < libraries.length; j++) {
-					String libraryName = libraries[j].getName().substring(7);
-					IPath path = project.getFile(libraryName).getProjectRelativePath();
-					if (path.segmentCount() == 1
-							&& !binIncl.contains(libraryName))
-						binIncl.addToken(libraryName);
-				}
-			}
-			binIncl.removeToken("*.jar"); //$NON-NLS-1$
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-	
-	private void setOutputEntryTokens(Set outputFolders, IBuildEntry outputEntry) {
-		Iterator iter = outputFolders.iterator();
-		try {
-			while (iter.hasNext()) {
-				String outputFolder = iter.next().toString();
-				if (!outputFolder.endsWith("" + Path.SEPARATOR)) //$NON-NLS-1$
-					outputFolder = outputFolder.concat("" + Path.SEPARATOR); //$NON-NLS-1$
-				if (!outputEntry.contains(outputFolder.toString()))
-					outputEntry.addToken(outputFolder.toString());
-			}
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-	
-	private IPackageFragmentRoot[] computeSourceFolders() {
-		ArrayList folders = new ArrayList();
-		IBuildModel buildModel = getBuildModel();
-		IProject project = buildModel.getUnderlyingResource().getProject();
-		try {
-			if (project.hasNature(JavaCore.NATURE_ID)) {
-				IJavaProject jProject = JavaCore.create(project);
-				IPackageFragmentRoot[] roots = jProject
-				.getPackageFragmentRoots();
-				for (int i = 0; i < roots.length; i++) {
-					if (roots[i].getKind() == IPackageFragmentRoot.K_SOURCE) {
-						folders.add(roots[i]);
-					}
-				}
-			}
-		} catch (JavaModelException e) {
-			PDEPlugin.logException(e);
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-		return (IPackageFragmentRoot[]) folders
-		.toArray(new IPackageFragmentRoot[folders.size()]);
-	}
-	
-	public void createClient(Section section, FormToolkit toolkit) {
-		Composite container = toolkit.createComposite(section);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginHeight = layout.marginWidth = 0;
-		layout.makeColumnsEqualWidth = true;
-		container.setLayout(layout);
-		
-		createLeftSection(container, toolkit);
-		createRightSection(container, toolkit);
-		
-		fIncludeLibraryButton = toolkit.createButton(container, PDEUIMessages.BuildEditor_RuntimeInfoSection_buildInclude, SWT.CHECK);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		fIncludeLibraryButton.setLayoutData(gd);
-		fIncludeLibraryButton.setVisible(false);
-		fIncludeLibraryButton.addSelectionListener(new SelectionAdapter() {
-			
-			public void widgetSelected(SelectionEvent e) {
-				handleLibInBinBuild(fIncludeLibraryButton.getSelection(),
-						fCurrentLibrary.getName().substring(7));
-			}
-		});
-		toolkit.paintBordersFor(container);
-		section.setClient(container);
-	}
-	
-	private void createLeftSection(Composite parent, FormToolkit toolkit) {
-		Composite container = toolkit.createComposite(parent);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = layout.marginWidth = 2;
-		layout.numColumns = 2;
-		container.setLayout(layout);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.widthHint = 100;
-		container.setLayoutData(gd);
-		
-		fLibraryPart = new PartAdapter(new String[]{
-				PDEUIMessages.BuildEditor_RuntimeInfoSection_addLibrary, null,
-				PDEUIMessages.ManifestEditor_LibrarySection_up,
-				PDEUIMessages.ManifestEditor_LibrarySection_down});
-		fLibraryPart.createControl(container, SWT.FULL_SELECTION, 2, toolkit);
-		fLibraryViewer = (TableViewer) fLibraryPart.getViewer();
-		fLibraryViewer.setContentProvider(new LibraryContentProvider());
-		fLibraryViewer.setLabelProvider(new LibraryLabelProvider());
-		fLibraryPart.setButtonEnabled(2, false);
-		fLibraryPart.setButtonEnabled(3, false);
-		fLibraryViewer.setInput(getBuildModel());
-		toolkit.paintBordersFor(container);
-		
-		MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
-		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(new IMenuListener() {
-			
-			public void menuAboutToShow(IMenuManager manager) {
-				fillLibraryContextMenu(manager);
-			}
-		});
-		
-		fLibraryViewer.getControl().setMenu(
-				menuMgr.createContextMenu(fLibraryViewer.getControl()));
-	}
-	
-	private void createRightSection(Composite parent, FormToolkit toolkit) {
-		Composite container = toolkit.createComposite(parent);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginHeight = layout.marginWidth = 2;
-		container.setLayout(layout);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.widthHint = 100;
-		container.setLayoutData(gd);
-		
-		fFolderPart = new PartAdapter(new String[]{PDEUIMessages.BuildEditor_RuntimeInfoSection_addFolder});
-		fFolderPart.createControl(container, SWT.FULL_SELECTION, 2, toolkit);
-		fFolderViewer = (TableViewer) fFolderPart.getViewer();
-		fFolderViewer.setContentProvider(new FolderContentProvider());
-		fFolderViewer.setLabelProvider(new FolderLabelProvider());
-		toolkit.paintBordersFor(container);
-		
-		MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
-		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(new IMenuListener() {
-			
-			public void menuAboutToShow(IMenuManager manager) {
-				fillFolderViewerContextMenu(manager);
-			}
-		});
-		fFolderViewer.getControl().setMenu(
-				menuMgr.createContextMenu(fFolderViewer.getControl()));
-	}
-	
-	protected void fillFolderViewerContextMenu(IMenuManager manager) {
-		ISelection selection = fFolderViewer.getSelection();
-		if (fCurrentLibrary != null) {
-			Action newAction = new Action(PDEUIMessages.BuildEditor_RuntimeInfoSection_popupFolder) {
-				
-				public void run() {
-					handleNewFolder();
-				}
-			};
-			newAction.setEnabled(fEnabled);
-			manager.add(newAction);
-		}
-		
-		manager.add(new Separator());
-		Action deleteAction = new Action(PDEUIMessages.Actions_delete_label) {
-			
-			public void run() {
-				handleDeleteFolder();
-			}
-		};
-		deleteAction.setEnabled(!selection.isEmpty() && fEnabled);
-		manager.add(deleteAction);
-		
-		// defect 19550
-		getPage().getPDEEditor().getContributor().contextMenuAboutToShow(
-				manager, false);
-		
-	}
-	
-	protected void fillLibraryContextMenu(IMenuManager manager) {
-		ISelection selection = fLibraryViewer.getSelection();
-		Action newAction = new Action(PDEUIMessages.BuildEditor_RuntimeInfoSection_popupAdd) {
-			
-			public void run() {
-				handleNew();
-			}
-		};
-		newAction.setEnabled(fEnabled);
-		manager.add(newAction);
-		
-		manager.add(new Separator());
-		IAction renameAction = new RenameAction();
-		renameAction.setEnabled(!selection.isEmpty() && fEnabled);
-		manager.add(renameAction);
-		
-		Action deleteAction = new Action(PDEUIMessages.Actions_delete_label) {
-			
-			public void run() {
-				handleDelete();
-			}
-		};
-		deleteAction.setEnabled(!selection.isEmpty() && fEnabled);
-		manager.add(deleteAction);
-		
-		getPage().getPDEEditor().getContributor().contextMenuAboutToShow(
-				manager, false);
-	}
-	
-	protected void entryModified(IBuildEntry oldEntry, String newValue) {
-		final IBuildEntry entry = oldEntry;
-		IBuildModel buildModel = getBuildModel();
-		IBuild build = buildModel.getBuild();
-		String oldName = entry.getName().substring(7);
-		
-		try {
-			if (newValue.equals(entry.getName()))
-				return;
-			if (!newValue.startsWith(IBuildEntry.JAR_PREFIX))
-				newValue = IBuildEntry.JAR_PREFIX + newValue;
-			if (!newValue.endsWith(".jar") && !newValue.endsWith("/") && !newValue.equals(IBuildEntry.JAR_PREFIX + ".")) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				newValue +="/"; //$NON-NLS-1$
-			
-			// jars.compile.order
-			IBuildEntry tempEntry = build
-			.getEntry(IBuildPropertiesConstants.PROPERTY_JAR_ORDER);
-			if (tempEntry != null && tempEntry.contains(oldName)){
-				tempEntry.renameToken(oldName, newValue.substring(7));
-			}
-			
-			// output.{source folder}.jar
-			tempEntry = build
-			.getEntry(IBuildPropertiesConstants.PROPERTY_OUTPUT_PREFIX
-					+ oldName);
-			if (tempEntry != null) {
-				tempEntry
-				.setName(IBuildPropertiesConstants.PROPERTY_OUTPUT_PREFIX
-						+ newValue.substring(7));
-				
-			}
-			// bin.includes
-			tempEntry = build
-			.getEntry(IBuildPropertiesConstants.PROPERTY_BIN_INCLUDES);
-			if (tempEntry != null && tempEntry.contains(oldName)){
-				tempEntry.renameToken(oldName, newValue.substring(7));
-			}
-			
-			// bin.excludes
-			tempEntry = build
-			.getEntry(IBuildPropertiesConstants.PROPERTY_BIN_EXCLUDES);
-			if (tempEntry != null && tempEntry.contains(oldName)){
-				tempEntry.renameToken(oldName, newValue.substring(7));
-				
-			}
-			
-			// rename
-			entry.setName(newValue);
-			
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-	
-	public void expandTo(Object object) {
-		fLibraryViewer.setSelection(new StructuredSelection(object), true);
-	}
-	
-	public void handleDoubleClick(IStructuredSelection selection) {
-		doRename();
-	}
-	
-	public void enableSection(boolean enable) {
-		fEnabled = enable;
-		fLibraryPart.setButtonEnabled(0, enable);
-		fLibraryPart.setButtonEnabled(2, false);
-		fLibraryPart.setButtonEnabled(3, false);
-		fIncludeLibraryButton.setEnabled(enable);
-		
-		fFolderPart.setButtonEnabled(0, enable
-				&& !fLibraryViewer.getSelection().isEmpty());
-	}
-	
-	public boolean doGlobalAction(String actionId) {
-		if (actionId.equals(ActionFactory.DELETE.getId())) {
-			if (fEnabled) {
-				if (fLibraryViewer.getControl().isFocusControl()) {
-					handleDelete();
-				} else {
-					handleDeleteFolder();
-				}
-			}
-			return true;
-		}
-		return false;
-	}
-	
-	private void doRename() {
-		IStructuredSelection selection = (IStructuredSelection) fLibraryViewer
-		.getSelection();
-		if (selection.size() == 1) {
-			IBuildEntry entry = (IBuildEntry) selection.getFirstElement();
-			String oldName = entry.getName().substring(7);
-			RenameDialog dialog = new RenameDialog(fLibraryViewer.getControl()
-					.getShell(), oldName);
-			dialog.create();
-            dialog.setTitle(PDEUIMessages.RuntimeInfoSection_rename); 
-			dialog.getShell().setSize(300, 150);
-			if (dialog.open() == Dialog.OK) {
-				entryModified(entry, dialog.getNewName());
-			}
-		}
-	}
-	
-	public void dispose() {
-		IBuildModel buildModel = getBuildModel();
-		if (buildModel!=null)
-			buildModel.removeModelChangedListener(this);
-		PDEPlugin.getDefault().getLabelProvider().disconnect(this);
-		super.dispose();
-	}
-	
-	private void refreshOutputKeys() {
-		if (!isJavaProject())
-			return;
-		IPackageFragmentRoot[] sourceFolders = computeSourceFolders();
-		
-		String[] jarFolders = fCurrentLibrary.getTokens();
-		IPackageFragmentRoot sourceFolder;
-		IClasspathEntry entry;
-		IPath outputPath;
-		Set outputFolders;
-		
-		try {
-			outputFolders = new HashSet();
-			for (int j = 0; j < jarFolders.length; j++) {
-				sourceFolder = getSourceFolder(jarFolders[j], sourceFolders);
-				if (sourceFolder != null) {
-					entry = sourceFolder.getRawClasspathEntry();
-					outputPath = entry.getOutputLocation();
-					if (outputPath == null) {
-						outputFolders.add("bin"); //$NON-NLS-1$
-					} else {
-						outputPath = outputPath.removeFirstSegments(1);
-						outputFolders.add(outputPath.toString());
-					}
-				}
-			}
-			if (outputFolders.size() != 0) {
-				String libName = fCurrentLibrary.getName().substring(7);
-				IBuildModel buildModel = getBuildModel();
-				IBuild build = buildModel.getBuild();
-				String outputName = IBuildPropertiesConstants.PROPERTY_OUTPUT_PREFIX
-				+ libName;
-				
-				IBuildEntry outputEntry = build.getEntry(outputName);
-				
-				if (outputEntry == null) {
-					outputEntry = buildModel.getFactory().createEntry(
-							outputName);
-					build.add(outputEntry);
-				}
-				setOutputEntryTokens(outputFolders, outputEntry);
-				
-			}
-		} catch (JavaModelException e) {
-			PDEPlugin.logException(e);
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-		
-	}
-	
-	private boolean isJavaProject() {
-		try {
-			IBuildModel buildModel = getBuildModel();
-			IProject project = buildModel.getUnderlyingResource().getProject();
-			return project.hasNature(JavaCore.NATURE_ID);
-		} catch (CoreException e) {
-		}
-		return false;
-	}
-	
-	private boolean isReadOnly() {
-		IBuildModel model = getBuildModel();
-		if (model instanceof IEditable)
-			return !((IEditable) model).isEditable();
-		return true;
-	}
-	
-	private void update(IBuildEntry variable) {
-		fCurrentLibrary = variable;
-		fFolderViewer.setInput(fCurrentLibrary);
-		fFolderPart.setButtonEnabled(0, !isReadOnly() && fEnabled
-				&& variable != null);
-	}
-	
-	protected void selectionChanged(IStructuredSelection selection) {
-		Object item = selection.getFirstElement();
-		getPage().getPDEEditor().setSelection(selection);
-		if (item instanceof IBuildEntry) {
-			update((IBuildEntry) item);
-			updateDirectionalButtons();
-			String name = ((IBuildEntry) item).getName();
-			fIncludeLibraryButton.setVisible(true);
-			if (name.startsWith(IBuildEntry.JAR_PREFIX))
-				name = name.substring(IBuildEntry.JAR_PREFIX.length());
-			fIncludeLibraryButton.setSelection(isJarIncluded(name));
-		}
-	}
-	
-	protected void updateDirectionalButtons() {
-		Table table = fLibraryViewer.getTable();
-		TableItem[] selection = table.getSelection();
-		boolean hasSelection = selection.length > 0;
-		boolean canMove = table.getItemCount() > 1;
-		fLibraryPart.setButtonEnabled(2, canMove && hasSelection
-				&& table.getSelectionIndex() > 0);
-		fLibraryPart.setButtonEnabled(3, canMove && hasSelection
-				&& table.getSelectionIndex() < table.getItemCount() - 1);
-	}
-	
-	private boolean isJarIncluded(String libName) {
-		IBuildModel model = getBuildModel();
-		IProject project = model.getUnderlyingResource().getProject();
-		IPath libPath;
-		if (libName.equals(".") || libName.equals("./") || libName.equals(".\\")) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			libPath = null;
-		else 
-			libPath = project.getFile(libName).getProjectRelativePath();
-		IBuildEntry binIncl = model.getBuild().getEntry(
-				IBuildPropertiesConstants.PROPERTY_BIN_INCLUDES);
-		IBuildEntry binExcl = model.getBuild().getEntry(
-				IBuildPropertiesConstants.PROPERTY_BIN_EXCLUDES);
-		if (binIncl == null)
-			return false;
-		if (libPath == null)
-			return binIncl.contains(libName);
-		if (libPath.segmentCount() == 1) {
-			return binIncl.contains(libName) || binIncl.contains("*.jar"); //$NON-NLS-1$
-		} else if (binIncl.contains(libName)) {
-			return true;
-		} else if (binExcl != null && binExcl.contains(libName)) {
-			return false;
-		} else {
-			return isParentIncluded(libPath, binIncl, binExcl);
-		}
-	}
-	
-	protected boolean isParentIncluded(IPath libPath, IBuildEntry binIncl,
-			IBuildEntry binExcl) {
-		while (libPath.segmentCount() > 1) {
-			libPath = libPath.removeLastSegments(1);
-			if (binIncl.contains(libPath.toString() + Path.SEPARATOR))
-				return true;
-			else if (binExcl != null
-					&& binExcl.contains(libPath.toString() + Path.SEPARATOR))
-				return false;
-		}
-		return false;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.forms.AbstractFormPart#refresh()
-	 */
-	public void refresh() {
-		fLibraryViewer.refresh();
-		fFolderViewer.refresh();
-		fLibraryViewer.setSelection(null);
-		fFolderViewer.setInput(null);
-		fFolderPart.setButtonEnabled(0, false);
-		fIncludeLibraryButton.setVisible(false);
-		updateDirectionalButtons();
-		super.refresh();
-	}
-	
-	protected String[] getLibraryNames() {
-		String[] libNames = new String[fLibraryViewer.getTable().getItemCount()];
-		for (int i = 0; i < libNames.length; i++)
-			libNames[i] = fLibraryViewer.getTable().getItem(i).getText();
-		return libNames;
-	}
-	
-	protected void handleNew() {
-		final String[] libNames = getLibraryNames();
-		IBaseModel pmodel = getPage().getModel();
-		final IPluginModelBase pluginModelBase = (pmodel instanceof IPluginModelBase)
-		? (IPluginModelBase) pmodel
-				: null;
-		
-		BusyIndicator.showWhile(fLibraryViewer.getTable().getDisplay(),
-				new Runnable() {
-			
-			public void run() {
-				IBuildModel buildModel = getBuildModel();
-				IBuild build = buildModel.getBuild();
-				AddLibraryDialog dialog = new AddLibraryDialog(
-						getSection().getShell(), libNames,
-						pluginModelBase);
-				dialog.create();
-				dialog.getShell().setText(PDEUIMessages.RuntimeInfoSection_addEntry);  
-				
-				try {
-					if (dialog.open() == Dialog.OK) {
-						
-						String name = dialog.getNewName();
-						
-						if (!name.endsWith(".jar") && !name.equals(".") && !name.endsWith("/")) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-							name += "/"; //$NON-NLS-1$
-						
-						String keyName = name;
-						if (!keyName.startsWith(IBuildEntry.JAR_PREFIX))
-							keyName = IBuildEntry.JAR_PREFIX + name;
-						if (name.startsWith(IBuildEntry.JAR_PREFIX))
-							name = name.substring(7);
-						
-						if (!name.endsWith(".")) //$NON-NLS-1$
-							handleLibInBinBuild(true, name);
-						
-						// add library to jars compile order
-						IBuildEntry jarOrderEntry = build
-						.getEntry(IBuildPropertiesConstants.PROPERTY_JAR_ORDER);
-						int numLib = fLibraryViewer.getTable().getItemCount();
-						
-						if (jarOrderEntry == null) {
-							jarOrderEntry = getBuildModel()
-							.getFactory()
-							.createEntry(
-									IBuildPropertiesConstants.PROPERTY_JAR_ORDER);
-							
-							// add all runtime libraries to compile order
-							for (int i = 0; i < numLib; i++) {
-								String lib = ((IBuildEntry) fLibraryViewer
-										.getElementAt(i)).getName().substring(7);
-								jarOrderEntry.addToken(lib);
-							}
-							jarOrderEntry.addToken(name);
-							build.add(jarOrderEntry);
-						} else if (jarOrderEntry.getTokens().length < numLib){
-							
-							// remove and re-add all runtime libraries to compile order
-							String[] tokens = jarOrderEntry.getTokens();
-							for (int i = 0; i<tokens.length; i++){
-								jarOrderEntry.removeToken(tokens[i]);
-							}
-							for (int i = 0; i < numLib; i++) {
-								String lib = ((IBuildEntry) fLibraryViewer
-										.getElementAt(i)).getName().substring(7);
-								jarOrderEntry.addToken(lib);
-							}
-							jarOrderEntry.addToken(name);
-						} else {
-							jarOrderEntry.addToken(name);
-						}
-						// end of jars compile order addition
-						
-						IBuildEntry library = buildModel.getFactory()
-						.createEntry(keyName);
-						build.add(library);
-						
-					}
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		});
-	}
-	
-	private IPackageFragmentRoot getSourceFolder(String folderName,
-			IPackageFragmentRoot[] sourceFolders) {
-		for (int i = 0; i < sourceFolders.length; i++) {
-			if (sourceFolders[i].getPath().removeFirstSegments(1).equals(
-					new Path(folderName))) {
-				return sourceFolders[i];
-			}
-		}
-		return null;
-	}
-	
-	protected void handleDelete() {
-		int index = fLibraryViewer.getTable().getSelectionIndex();
-		if (index != -1) {
-			String libName = fLibraryViewer.getTable().getItem(index).getText();
-			IBuild build = getBuildModel().getBuild();
-			
-			try {
-				// jars.compile.order
-				IBuildEntry entry = build
-				.getEntry(IBuildPropertiesConstants.PROPERTY_JAR_ORDER);
-				int numLib = fLibraryViewer.getTable().getItemCount();
-				
-				if (entry == null) {
-					entry = getBuildModel().getFactory().createEntry(
-							IBuildPropertiesConstants.PROPERTY_JAR_ORDER);
-					
-					// add all runtime libraries to compile order
-					for (int i = 0; i < numLib; i++) {
-						String lib = ((IBuildEntry) fLibraryViewer
-								.getElementAt(i)).getName().substring(7);
-						entry.addToken(lib);
-					}
-					build.add(entry);
-				} else if (entry.getTokens().length < numLib){
-					
-					// remove and re-add all runtime libraries to compile order
-					String[] tokens = entry.getTokens();
-					for (int i = 0; i<tokens.length; i++){
-						entry.removeToken(tokens[i]);
-					}
-					
-					for (int i = 0; i < numLib; i++) {
-						String lib = ((IBuildEntry) fLibraryViewer
-								.getElementAt(i)).getName().substring(7);
-						entry.addToken(lib);
-					}
-				} 
-				
-				entry.removeToken(libName);
-				
-				// output.{source folder}.jar
-				entry = build
-				.getEntry(IBuildPropertiesConstants.PROPERTY_OUTPUT_PREFIX
-						+ libName);
-				if (entry != null)
-					build.remove(entry);
-				
-				// bin.includes
-				entry = build
-				.getEntry(IBuildPropertiesConstants.PROPERTY_BIN_INCLUDES);
-				if (entry != null && entry.contains(libName))
-					entry.removeToken(libName);
-				
-				// bin.excludes
-				entry = build
-				.getEntry(IBuildPropertiesConstants.PROPERTY_BIN_EXCLUDES);
-				if (entry != null && entry.contains(libName))
-					entry.removeToken(libName);
-				
-				build.remove(build.getEntry(IBuildEntry.JAR_PREFIX + libName));
-			} catch (CoreException e) {
-				PDEPlugin.logException(e);
-			}
-		}
-	}
-	
-	private void handleDeleteFolder() {
-		int index = fFolderViewer.getTable().getSelectionIndex();
-		Object object = ((IStructuredSelection) fFolderViewer.getSelection())
-		.getFirstElement();
-		if (object != null) {
-			String libKey = fCurrentLibrary.getName();
-			IBuildEntry entry = getBuildModel().getBuild().getEntry(libKey);
-			if (entry != null) {
-				try {
-					String[] tokens = entry.getTokens();
-					if (tokens.length > index + 1)
-						fCurrentSelection = new StructuredSelection(
-								tokens[index + 1]);
-					else
-						fCurrentSelection = null;
-					fCurrentLibrary = entry;
-					entry.removeToken((String) object);
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		}
-	}
-	
-	private void handleNewFolder() {
-		IFile file = (IFile) getBuildModel().getUnderlyingResource();
-		final IProject project = file.getProject();
-		
-		FolderSelectionDialog dialog = new FolderSelectionDialog(PDEPlugin
-				.getActiveWorkbenchShell(), new WorkbenchLabelProvider(),
-				new JarsNewContentProvider() {
-		});
-		
-		dialog.setInput(project.getWorkspace());
-		dialog.addFilter(new ViewerFilter() {
-			
-			public boolean select(Viewer viewer, Object parentElement,
-					Object element) {
-				if (element instanceof IProject) {
-					return ((IProject) element).equals(project);
-				}
-				return element instanceof IFolder;
-			}
-		});
-		dialog.setAllowMultiple(false);
-		dialog.setTitle(PDEUIMessages.ManifestEditor_JarsSection_dialogTitle); 
-		dialog.setMessage(PDEUIMessages.ManifestEditor_JarsSection_dialogMessage); 
-		
-		dialog.setValidator(new ISelectionStatusValidator() {
-			
-			public IStatus validate(Object[] selection) {
-				if (selection == null || selection.length != 1
-						|| !(selection[0] instanceof IFolder))
-					return new Status(IStatus.ERROR, PDEPlugin.getPluginId(),
-							IStatus.ERROR, "", null); //$NON-NLS-1$
-				
-				String libKey = fCurrentLibrary.getName();
-				
-				IBuildEntry entry = getBuildModel().getBuild().getEntry(libKey);
-				
-				String folderPath = ((IFolder) selection[0])
-				.getProjectRelativePath().addTrailingSeparator()
-				.toString();
-				
-				if (entry != null && entry.contains(folderPath))
-					return new Status(
-							
-							IStatus.ERROR,
-							PDEPlugin.getPluginId(),
-							IStatus.ERROR,
-							PDEUIMessages.BuildEditor_RuntimeInfoSection_duplicateFolder, 
-							null);
-				
-				return new Status(IStatus.OK, PDEPlugin.getPluginId(),
-						IStatus.OK, "", null); //$NON-NLS-1$
-			}
-		});
-		
-		if (dialog.open() == FolderSelectionDialog.OK) {
-			try {
-				IFolder folder = (IFolder) dialog.getFirstResult();
-				String folderPath = folder.getProjectRelativePath()
-				.addTrailingSeparator().toString();
-				IBuildModel buildModel = getBuildModel();
-				String libKey = fCurrentLibrary.getName();
-				IBuildEntry entry = buildModel.getBuild().getEntry(libKey);
-				
-				fCurrentSelection = new StructuredSelection(folderPath);
-				
-				entry.addToken(folderPath);
-				refreshOutputKeys();
-				
-			} catch (CoreException e) {
-				PDEPlugin.logException(e);
-			}
-		}
-	}
-	
-	protected void handleDown() {
-		int index = fLibraryViewer.getTable().getSelectionIndex();
-		String item1 = ((IBuildEntry) fLibraryViewer.getElementAt(index))
-		.getName().substring(7);
-		String item2 = ((IBuildEntry) fLibraryViewer.getElementAt(index + 1))
-		.getName().substring(7);
-		
-		updateJarsCompileOrder(item1, item2);
-	}
-	
-	protected void handleUp() {
-		int index = fLibraryViewer.getTable().getSelectionIndex();
-		String item1 = ((IBuildEntry) fLibraryViewer.getElementAt(index))
-		.getName().substring(7);
-		String item2 = ((IBuildEntry) fLibraryViewer.getElementAt(index - 1))
-		.getName().substring(7);
-		
-		updateJarsCompileOrder(item1, item2);
-	}
-	
-	public void updateJarsCompileOrder(String library1, String library2) {
-		IBuildModel model = getBuildModel();
-		IBuild build = model.getBuild();
-		IBuildEntry jarOrderEntry = build
-		.getEntry(IBuildPropertiesConstants.PROPERTY_JAR_ORDER);
-		try {
-			if (jarOrderEntry == null) {
-				jarOrderEntry = model.getFactory().createEntry(
-						IBuildPropertiesConstants.PROPERTY_JAR_ORDER);
-				build.add(jarOrderEntry);
-			} else {
-				String tokens[] = jarOrderEntry.getTokens();
-				for (int i =0; i<tokens.length; i++){
-					jarOrderEntry.removeToken(tokens[i]);
-				}
-			}
-			
-			
-			int numLib = fLibraryViewer.getTable().getItemCount();
-			String[] names = new String[numLib];
-			for (int i = 0; i < numLib; i++) {
-				String name = ((IBuildEntry) fLibraryViewer
-						.getElementAt(i)).getName().substring(7);
-				if (name.equals(library1))
-					name = library2;
-				else if (name.equals(library2))
-					name = library1;
-				names[i] = name;
-			}
-			
-			for (int i = 0; i < numLib; i++)
-				jarOrderEntry.addToken(names[i]);
-			
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-	
-	public void modelChanged(IModelChangedEvent event) {
-		
-		if (event.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			markStale();
-		}
-		Object changeObject = event.getChangedObjects()[0];
-		String keyName = event.getChangedProperty();
-		int type = event.getChangeType();
-		// check if model change applies to this section
-		if (!(changeObject instanceof IBuildEntry)
-				|| (!((IBuildEntry)changeObject).getName().startsWith(IBuildEntry.JAR_PREFIX) 
-						&& !((IBuildEntry)changeObject).getName().equals(IBuildPropertiesConstants.PROPERTY_JAR_ORDER)
-						&& !((IBuildEntry)changeObject).getName().equals(IBuildPropertiesConstants.PROPERTY_BIN_INCLUDES)))
-			return;
-		
-		final IBuildEntry entry = (IBuildEntry)changeObject;
-		
-		if (keyName!= null && keyName.equals(IBuildPropertiesConstants.PROPERTY_BIN_INCLUDES)){
-			if (fCurrentLibrary == null)
-				return;
-			if (event.getOldValue() == null || event.getNewValue() == null ){ // added/removed token
-				boolean isInBinBuild = entry.contains(fCurrentLibrary.getName().substring(7));
-				fIncludeLibraryButton.setSelection(isInBinBuild);
-			}
-			return;
-		}
-		
-		
-		
-		if (type == IModelChangedEvent.INSERT){
-//			account for new key
-			fLibraryViewer.refresh();
-			if (fCurrentSelection != null) {
-				fLibraryViewer.setSelection(fCurrentSelection);
-				fIncludeLibraryButton.setSelection(true);
-				updateDirectionalButtons();
-			} else {
-				fFolderPart.setButtonEnabled(0, false);
-				fLibraryViewer.setSelection(null);
-				fFolderViewer.setInput(null);
-				fIncludeLibraryButton.setVisible(false);
-			}
-		} else if (type == IModelChangedEvent.REMOVE){
-			// account for key removal
-			fLibraryViewer.remove(entry);
-			fLibraryViewer.refresh();
-			fFolderPart.setButtonEnabled(0, false);
-			fLibraryViewer.setSelection(null);
-			fFolderViewer.setInput(null);
-			fIncludeLibraryButton.setVisible(false);
-		} else if (keyName!=null && keyName.startsWith(IBuildEntry.JAR_PREFIX)){ 
-			// modification to source.{libname}.jar
-			// renaming token
-			if (event.getOldValue() != null && event.getNewValue() != null){
-				fLibraryViewer.update(entry, null);
-				return;
-			} 
-			// add/remove source folder
-			refresh();
-			if (fCurrentSelection != null) {
-				fFolderViewer.setSelection(fCurrentSelection);
-				updateDirectionalButtons();
-			} else {
-				fFolderPart.setButtonEnabled(0, false);
-				fLibraryViewer.setSelection(null);
-				fFolderViewer.setInput(null);
-				fIncludeLibraryButton.setVisible(false);
-			}
-			if (fCurrentLibrary != null)
-				update(fCurrentLibrary);		
-		} else if (keyName!= null && keyName.equals(IBuildPropertiesConstants.PROPERTY_JAR_ORDER)){
-			// account for change in jars compile order
-			if (event.getNewValue() == null && event.getOldValue() != null){
-				// removing token from jars compile order : do nothing
-				return;
-			}
-			if (event.getOldValue() != null && event.getNewValue() != null){
-				// renaming token from jars compile order : do nothing
-				return;
-			}
-			
-			fLibraryViewer.refresh();
-			if (fCurrentLibrary != null) {
-				fLibraryViewer.setSelection(new StructuredSelection(
-						fCurrentLibrary));
-			}
-			updateDirectionalButtons();
-		}
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/SrcSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/SrcSection.java
deleted file mode 100644
index 14a0205..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/build/SrcSection.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.editor.build;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.pde.core.IModelChangedListener;
-import org.eclipse.pde.core.build.*;
-import org.eclipse.pde.internal.build.IBuildPropertiesConstants;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.swt.widgets.Composite;
-
-public class SrcSection extends BuildContentsSection
-		implements
-			IModelChangedListener {
-
-	public SrcSection(BuildPage page, Composite parent) {
-		super(page, parent);
-		getSection().setText(PDEUIMessages.BuildEditor_SrcSection_title);
-		getSection().setDescription(PDEUIMessages.BuildEditor_SrcSection_desc);
-
-	}
-
-	protected void initializeCheckState() {
-
-		super.initializeCheckState();
-		IBuild build = fBuildModel.getBuild();
-		IBuildEntry srcIncl = build
-				.getEntry(IBuildPropertiesConstants.PROPERTY_SRC_INCLUDES);
-		IBuildEntry srcExcl = build
-				.getEntry(IBuildPropertiesConstants.PROPERTY_SRC_EXCLUDES);
-
-		if (srcIncl == null)
-			return;
-
-		super.initializeCheckState(srcIncl, srcExcl);
-	}
-
-	protected void deleteFolderChildrenFromEntries(IFolder folder) {
-		IBuild build = fBuildModel.getBuild();
-		IBuildEntry srcIncl = build
-				.getEntry(IBuildPropertiesConstants.PROPERTY_SRC_INCLUDES);
-		IBuildEntry srcExcl = build
-				.getEntry(IBuildPropertiesConstants.PROPERTY_SRC_EXCLUDES);
-		String parentFolder = getResourceFolderName(folder
-				.getProjectRelativePath().toString());
-
-		removeChildren(srcIncl, parentFolder);
-		removeChildren(srcExcl, parentFolder);
-	}
-
-	protected void handleBuildCheckStateChange(boolean wasTopParentChecked) {
-		IResource resource = fParentResource;
-		String resourceName = fParentResource.getFullPath()
-				.removeFirstSegments(1).toString();
-		IBuild build = fBuildModel.getBuild();
-		IBuildEntry includes = build
-				.getEntry(IBuildPropertiesConstants.PROPERTY_SRC_INCLUDES);
-		IBuildEntry excludes = build
-				.getEntry(IBuildPropertiesConstants.PROPERTY_SRC_EXCLUDES);
-
-		resourceName = handleResourceFolder(resource, resourceName);
-
-		if (isChecked)
-			handleCheck(includes, excludes, resourceName, resource,
-					wasTopParentChecked,
-					IBuildPropertiesConstants.PROPERTY_SRC_INCLUDES);
-		else
-			handleUncheck(includes, excludes, resourceName, resource,
-					IBuildPropertiesConstants.PROPERTY_SRC_EXCLUDES);
-
-		deleteEmptyEntries();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/context/IInputContextListener.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/context/IInputContextListener.java
deleted file mode 100644
index a1abb83..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/context/IInputContextListener.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.context;
-
-import org.eclipse.core.resources.IFile;
-
-public interface IInputContextListener {
-/**
- * Informs the listener that a new context has been added.
- * This should result in a new source tab.
- * @param context
- */
-	void contextAdded(InputContext context);
-/**
- * Informs the listener that the context has been removed.
- * This should result in removing the source tab.
- * @param context
- */
-	void contextRemoved(InputContext context);
-/**
- * Informs the listener that a monitored file has
- * been added.
- * @param monitoredFile the file we were monitoring
- */
-	void monitoredFileAdded(IFile monitoredFile);
-/**
- * Informs the listener that a monitored file has
- * been removed.
- * @param monitoredFile
- * @return <code>true</code> if it is OK to remove
- * the associated context, <code>false</code> otherwise.
- */
-	boolean monitoredFileRemoved(IFile monitoredFile);
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/context/InputContext.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/context/InputContext.java
deleted file mode 100644
index 0984241..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/context/InputContext.java
+++ /dev/null

@@ -1,398 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.context;
-import java.util.ArrayList;
-
-import org.eclipse.core.filebuffers.*;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.TextUtilities;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.pde.core.IBaseModel;
-import org.eclipse.pde.core.IEditable;
-import org.eclipse.pde.core.IModelChangeProvider;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.core.IModelChangedListener;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.pde.internal.ui.editor.StorageDocumentProvider;
-import org.eclipse.pde.internal.ui.editor.SystemFileDocumentProvider;
-import org.eclipse.pde.internal.ui.editor.SystemFileEditorInput;
-import org.eclipse.pde.internal.ui.model.IEditingModel;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.MoveSourceEdit;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.text.edits.TextEdit;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.ui.editors.text.*;
-import org.eclipse.ui.texteditor.IDocumentProvider;
-import org.eclipse.ui.texteditor.IElementStateListener;
-/**
- * This class maintains objects associated with a single editor input.
- */
-public abstract class InputContext {
-	
-	private PDEFormEditor fEditor;
-	private IEditorInput fEditorInput;
-	private IBaseModel fModel;
-	private IModelChangedListener fModelListener;
-	private IDocumentProvider fDocumentProvider;
-	private IElementStateListener fElementListener;
-	protected ArrayList fEditOperations = new ArrayList();
-	
-	private boolean fValidated;
-	private boolean fPrimary;
-	private boolean fIsSourceMode;
-	private boolean fMustSynchronize;
-
-	class ElementListener implements IElementStateListener {
-		public void elementContentAboutToBeReplaced(Object element) {
-		}
-		public void elementContentReplaced(Object element) {
-			doRevert();
-		}
-		public void elementDeleted(Object element) {
-            dispose();
-		}
-		public void elementDirtyStateChanged(Object element, boolean isDirty) {
-			fMustSynchronize=true;
-		}
-		public void elementMoved(Object originalElement, Object movedElement) {
-            dispose();
-			fEditor.close(true);
-		}
-	}
-	public InputContext(PDEFormEditor editor, IEditorInput input, boolean primary) {
-		this.fEditor = editor;
-		this.fEditorInput = input;
-		setPrimary(primary);
-	}
-	public abstract String getId();
-
-	public IEditorInput getInput() {
-		return fEditorInput;
-	}
-	public PDEFormEditor getEditor() {
-		return fEditor;
-	}
-	public IBaseModel getModel() {
-		return fModel;
-	}
-	public IDocumentProvider getDocumentProvider() {
-		return fDocumentProvider;
-	}
-	private IDocumentProvider createDocumentProvider(IEditorInput input) {
-		if (input instanceof IFileEditorInput) {
-			return createFileDocumentProvider();
-		} else if (input instanceof SystemFileEditorInput) {
-			return new SystemFileDocumentProvider(createDocumentPartitioner(), getDefaultCharset());
-		} else if (input instanceof IStorageEditorInput) {
-			return new StorageDocumentProvider(createDocumentPartitioner(), getDefaultCharset());
-		}
-		return null;
-	}
-	
-	private IDocumentProvider createFileDocumentProvider() {
-		return new ForwardingDocumentProvider(getPartitionName(),
-				getDocumentSetupParticipant(), new TextFileDocumentProvider());
-	}
-	
-	protected IDocumentSetupParticipant getDocumentSetupParticipant() {
-		return new IDocumentSetupParticipant() {
-			public void setup(IDocument document) {
-			}			
-		};
-	}
-	
-	protected abstract String getPartitionName();
-		
-	protected IDocumentPartitioner createDocumentPartitioner() {
-		return null;
-	}
-	
-	protected abstract String getDefaultCharset();
-	
-	protected abstract IBaseModel createModel(IEditorInput input) throws CoreException;
-	
-	protected void create() {
-		fDocumentProvider = createDocumentProvider(fEditorInput);
-		if (fDocumentProvider == null)
-			return;
-		try {
-			fDocumentProvider.connect(fEditorInput);
-			fModel = createModel(fEditorInput);
-			if (fModel instanceof IModelChangeProvider) {
-				fModelListener = new IModelChangedListener() {
-					public void modelChanged(IModelChangedEvent e) {
-						if (e.getChangeType() != IModelChangedEvent.WORLD_CHANGED) {
-							if (!fEditor.getLastDirtyState())
-								fEditor.fireSaveNeeded(fEditorInput, true);
-							if (!fIsSourceMode) {
-								IModelChangeProvider provider = e.getChangeProvider();
-								if (provider instanceof IEditingModel) {
-									// this is to guard against false notifications
-									// when a revert operation is performed, focus is taken away from a FormEntry
-									// and a text edit operation is falsely requested
-									if (((IEditingModel)provider).isDirty())
-										addTextEditOperation(fEditOperations, e);
-								}
-							}
-						} 
-					}
-				};
-				((IModelChangeProvider) fModel).addModelChangedListener(fModelListener);
-			}
-
-			IAnnotationModel amodel = fDocumentProvider
-					.getAnnotationModel(fEditorInput);
-			if (amodel != null)
-				amodel.connect(fDocumentProvider.getDocument(fEditorInput));
-			fElementListener = new ElementListener();
-			fDocumentProvider.addElementStateListener(fElementListener);
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-		
-	}
-	
-	public synchronized boolean validateEdit() {
-		if (!fValidated) {
-			if (fEditorInput instanceof IFileEditorInput) {
-				IFile file = ((IFileEditorInput) fEditorInput).getFile();
-				if (file.isReadOnly()) {
-					Shell shell = fEditor.getEditorSite().getShell();
-					IStatus validateStatus = PDEPlugin.getWorkspace().validateEdit(
-						new IFile[]{file}, shell);
-					fValidated=true; // to prevent loops
-					if (validateStatus.getSeverity() != IStatus.OK)
-						ErrorDialog.openError(shell, fEditor.getTitle(), null,
-							validateStatus);
-					return validateStatus.getSeverity() == IStatus.OK;
-				}
-			}
-		}
-		return true;
-	}
-	public void doSave(IProgressMonitor monitor) {
-		try {
-			IDocument doc = fDocumentProvider.getDocument(fEditorInput);
-			fDocumentProvider.aboutToChange(fEditorInput);
-			flushModel(doc);			
-			fDocumentProvider.saveDocument(monitor, fEditorInput, doc, true);
-			fDocumentProvider.changed(fEditorInput);
-			fValidated=false;
-		}
-		catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-	
-	protected abstract void addTextEditOperation(ArrayList ops, IModelChangedEvent event);
-	
-	protected void flushModel(IDocument doc) {
-		if (fEditOperations.size() > 0) {
-			try {
-				MultiTextEdit edit = new MultiTextEdit();
-				for (int i = 0; i < fEditOperations.size(); i++) {
-					insert(edit, (TextEdit)fEditOperations.get(i));
-				}
-				if (fModel instanceof IEditingModel)
-					((IEditingModel)fModel).setStale(true);				
-				edit.apply(doc);
-				fEditOperations.clear();
-				if (fModel instanceof IEditable)
-					((IEditable)fModel).setDirty(false);
-			} catch (MalformedTreeException e) {
-				PDEPlugin.logException(e);
-			} catch (BadLocationException e) {
-				PDEPlugin.logException(e);
-			}
-		}	
-	}
-	
-	protected static void insert(TextEdit parent, TextEdit edit) {
-		if (!parent.hasChildren()) {
-			parent.addChild(edit);
-			if (edit instanceof MoveSourceEdit) {
-				parent.addChild(((MoveSourceEdit)edit).getTargetEdit());
-			}
-			return;
-		}
-		TextEdit[] children= parent.getChildren();
-		// First dive down to find the right parent.
-		for (int i= 0; i < children.length; i++) {
-			TextEdit child= children[i];
-			if (covers(child, edit)) {
-				insert(child, edit);
-				return;
-			}
-		}
-		// We have the right parent. Now check if some of the children have to
-		// be moved under the new edit since it is covering it.
-		for (int i= children.length - 1; i >= 0; i--) {
-			TextEdit child= children[i];
-			if (covers(edit, child)) {
-				parent.removeChild(i);
-				edit.addChild(child);
-			}
-		}
-		parent.addChild(edit);
-		if (edit instanceof MoveSourceEdit) {
-			parent.addChild(((MoveSourceEdit)edit).getTargetEdit());
-		}
-	}
-	
-	protected static boolean covers(TextEdit thisEdit, TextEdit otherEdit) {
-		if (thisEdit.getLength() == 0)	// an insertion point can't cover anything
-			return false;
-		
-		int thisOffset= thisEdit.getOffset();
-		int thisEnd= thisEdit.getExclusiveEnd();	
-		if (otherEdit.getLength() == 0) {
-			int otherOffset= otherEdit.getOffset();
-			return thisOffset < otherOffset && otherOffset < thisEnd;
-		}
-		int otherOffset= otherEdit.getOffset();
-		int otherEnd= otherEdit.getExclusiveEnd();
-		return thisOffset <= otherOffset && otherEnd <= thisEnd;
-	}		
-
-	public boolean mustSave() {
-		if (!fIsSourceMode) {
-			if (fModel instanceof IEditable) {
-				if (((IEditable)fModel).isDirty()) {
-					return true;
-				}
-			}
-		}
-		return fDocumentProvider.canSaveDocument(fEditorInput);
-	}
-	
-	public void dispose() {
-		IAnnotationModel amodel = fDocumentProvider.getAnnotationModel(fEditorInput);
-		if (amodel != null)
-			amodel.disconnect(fDocumentProvider.getDocument(fEditorInput));
-		fDocumentProvider.removeElementStateListener(fElementListener);
-		fDocumentProvider.disconnect(fEditorInput);
-		if (fModelListener != null && fModel instanceof IModelChangeProvider) {
-			((IModelChangeProvider) fModel)
-					.removeModelChangedListener(fModelListener);
-			//if (undoManager != null)
-			//undoManager.disconnect((IModelChangeProvider) model);
-		}
-		if (fModel!=null)
-			fModel.dispose();
-	}
-	/**
-	 * @return Returns the primary.
-	 */
-	public boolean isPrimary() {
-		return fPrimary;
-	}
-	/**
-	 * @param primary The primary to set.
-	 */
-	public void setPrimary(boolean primary) {
-		this.fPrimary = primary;
-	}
-	
-	public boolean setSourceEditingMode(boolean sourceMode) {
-		fIsSourceMode = sourceMode;
-		if (sourceMode) {
-			// entered source editing mode; in this mode,
-			// this context's document will be edited directly
-			// in the source editor. All changes in the model
-			// are caused by reconciliation and should not be 
-			// fired to the world.
-			flushModel(fDocumentProvider.getDocument(fEditorInput));
-			fMustSynchronize=true;
-			return true;
-		}
-		// leaving source editing mode; if the document
-		// has been modified while in this mode,
-		// fire the 'world changed' event from the model
-		// to cause all the model listeners to become stale.
-		return synchronizeModelIfNeeded();
-	}
-	
-	private boolean synchronizeModelIfNeeded() {
-		if (fMustSynchronize) {
-			boolean result = synchronizeModel(fDocumentProvider.getDocument(fEditorInput));
-			fMustSynchronize=false;
-			return result;
-		}
-		return true;
-	}
-
-	public void doRevert() {
-		fMustSynchronize=true;
-		synchronizeModelIfNeeded();
-		/*
-		if (model instanceof IEditable) {
-			((IEditable)model).setDirty(false);
-		}
-		*/
-	}
-
-	public boolean isInSourceMode() {
-		return fIsSourceMode;
-	}
-
-	public boolean isModelCorrect() {
-		synchronizeModelIfNeeded();
-		return fModel!=null ? fModel.isValid() : false;
-	}
-	
-	protected boolean synchronizeModel(IDocument doc) {
-		return true;
-	}
-	public boolean matches(IResource resource) {
-		if (fEditorInput instanceof IFileEditorInput) {
-			IFileEditorInput finput = (IFileEditorInput)fEditorInput;
-			IFile file = finput.getFile();
-			if (file.equals(resource))
-				return true;
-		}
-		return false;
-	}
-	/**
-	 * @return Returns the validated.
-	 */
-	public boolean isValidated() {
-		return fValidated;
-	}
-	/**
-	 * @param validated The validated to set.
-	 */
-	public void setValidated(boolean validated) {
-		this.fValidated = validated;
-	}
-	
-	public String getLineDelimiter() {
-		if (fDocumentProvider != null) {
-			IDocument document = fDocumentProvider.getDocument(fEditorInput);
-			if (document != null) {
-				return TextUtilities.getDefaultLineDelimiter(document);
-			}
-		}
-		return System.getProperty("line.separator"); //$NON-NLS-1$
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/context/InputContextManager.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/context/InputContextManager.java
deleted file mode 100644
index dfefb07..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/context/InputContextManager.java
+++ /dev/null

@@ -1,288 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.context;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-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.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.pde.core.IBaseModel;
-import org.eclipse.pde.core.IModelChangeProvider;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.editor.IModelUndoManager;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IFileEditorInput;
-
-public abstract class InputContextManager implements IResourceChangeListener {
-	private PDEFormEditor editor;
-	private Hashtable inputContexts;
-	private ArrayList monitoredFiles;
-	private ArrayList listeners;
-	private IModelUndoManager undoManager;
-	/**
-	 *  
-	 */
-	public InputContextManager(PDEFormEditor editor) {
-		this.editor = editor;
-		inputContexts = new Hashtable();
-		listeners = new ArrayList();
-		PDEPlugin.getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.POST_CHANGE);
-	}
-
-	public void addInputContextListener(IInputContextListener listener) {
-		if (!listeners.contains(listener))
-			listeners.add(listener);
-	}
-	public void removeInputContextListener(IInputContextListener listener) {
-		listeners.remove(listener);
-	}
-	/**
-	 * 
-	 *
-	 */
-	public void dispose() {
-		PDEPlugin.getWorkspace().removeResourceChangeListener(this);
-		// dispose input contexts
-		for (Enumeration contexts = inputContexts.elements(); contexts
-				.hasMoreElements();) {
-			InputContext context = (InputContext) contexts.nextElement();
-			unhookUndo(context);
-			context.dispose();
-		}
-		inputContexts.clear();
-		undoManager = null;
-	}
-	/**
-	 * Saves dirty contexts.
-	 * @param monitor
-	 */
-	public void save(IProgressMonitor monitor) {
-		for (Enumeration contexts = inputContexts.elements(); contexts
-				.hasMoreElements();) {
-			InputContext context = (InputContext) contexts.nextElement();
-			if (context.mustSave())
-				context.doSave(monitor);
-		}
-	}
-	public IProject getCommonProject() {
-		for (Enumeration contexts = inputContexts.elements(); contexts
-		.hasMoreElements();) {
-			InputContext context = (InputContext) contexts.nextElement();
-			IEditorInput input = context.getInput();
-			if (input instanceof IFileEditorInput) 
-				return ((IFileEditorInput)input).getFile().getProject();
-		}
-		return null;
-	}
-	public boolean hasContext(String id) {
-		return findContext(id) != null;
-	}
-	public InputContext findContext(String id) {
-		for (Enumeration contexts = inputContexts.elements(); contexts
-				.hasMoreElements();) {
-			InputContext context = (InputContext) contexts.nextElement();
-			if (context.getId().equals(id))
-				return context;
-		}
-		return null;
-	}
-	public InputContext findContext(IResource resource) {
-		for (Enumeration contexts = inputContexts.elements(); contexts
-		.hasMoreElements();) {
-			InputContext context = (InputContext) contexts.nextElement();
-			if (context.matches(resource))
-				return context;
-		}
-		return null;
-	}
-	
-	public abstract IBaseModel getAggregateModel();
-	
-	public InputContext getContext(IEditorInput input) {
-		return (InputContext)inputContexts.get(input);
-	}
-	public void putContext(IEditorInput input, InputContext context) {
-		inputContexts.put(input, context);
-		fireContextChange(context, true);
-	}
-	public InputContext getPrimaryContext() {
-		for (Enumeration contexts = inputContexts.elements(); contexts
-				.hasMoreElements();) {
-			InputContext context = (InputContext) contexts.nextElement();
-			if (context.isPrimary())
-				return context;
-		}
-		return null;
-	}
-	public InputContext [] getInvalidContexts() {
-		ArrayList result = new ArrayList();
-		for (Enumeration contexts = inputContexts.elements(); contexts
-				.hasMoreElements();) {
-			InputContext context = (InputContext) contexts.nextElement();
-			if (context.isModelCorrect()==false)
-				result.add(context);
-		}
-		return (InputContext[])result.toArray(new InputContext[result.size()]);
-	}
-	
-	public boolean isDirty() {
-		for (Enumeration contexts=inputContexts.elements(); contexts.hasMoreElements();) {
-			InputContext context = (InputContext)contexts.nextElement();
-			if (context.mustSave())
-				return true;
-		}
-		return false;
-	}
-
-	public void monitorFile(IFile file) {
-		if (monitoredFiles==null) monitoredFiles = new ArrayList();
-		monitoredFiles.add(file);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
-	 */
-	public void resourceChanged(IResourceChangeEvent event) {
-		IResourceDelta delta = event.getDelta();
-
-		try {
-			delta.accept(new IResourceDeltaVisitor() {
-				public boolean visit(IResourceDelta delta) {
-					int kind = delta.getKind();
-					IResource resource = delta.getResource();
-					if (resource instanceof IFile) {
-						if (kind == IResourceDelta.ADDED)
-							asyncStructureChanged((IFile)resource, true);
-						else if (kind==IResourceDelta.REMOVED)
-							asyncStructureChanged((IFile)resource, false);
-						return false;
-					}
-					return true;
-				}
-			});
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-	
-	private void asyncStructureChanged(final IFile file, final boolean added) {
-		if (editor == null || editor.getEditorSite() == null)
-			return;
-		Shell shell = editor.getEditorSite().getShell();
-		Display display = shell != null ? shell.getDisplay() : Display.getDefault();
-
-		display.asyncExec(new Runnable() {
-			public void run() {
-				structureChanged(file, added);
-			}
-		});
-	}
-	
-	private void structureChanged(IFile file, boolean added) {
-		if (monitoredFiles==null) return;
-		for (int i=0; i<monitoredFiles.size(); i++) {
-			IFile ifile = (IFile)monitoredFiles.get(i);
-			if (ifile.equals(file)) {
-				if (added) {
-					fireStructureChange(file, true);
-				}
-				else {
-					fireStructureChange(file, false);
-					removeContext(file);
-				}
-			}
-		}
-	}
-	
-	private void removeContext(IFile file) {
-		for (Enumeration contexts = inputContexts.elements(); contexts
-		.hasMoreElements();) {
-			InputContext context = (InputContext) contexts.nextElement();
-			IEditorInput input = context.getInput();
-			if (input instanceof IFileEditorInput) {
-				IFileEditorInput fileInput = (IFileEditorInput)input;
-				if (file.equals(fileInput.getFile())) {
-					inputContexts.remove(input);
-					fireContextChange(context, false);
-					return;
-				}
-			}
-		}
-	}
-	protected void fireStructureChange(IFile file, boolean added) {
-		for (int i=0; i<listeners.size(); i++) {
-			IInputContextListener listener = (IInputContextListener)listeners.get(i);
-			if (added)
-				listener.monitoredFileAdded(file);
-			else
-				listener.monitoredFileRemoved(file);
-		}
-	}
-	protected void fireContextChange(InputContext context, boolean added) {
-		for (int i=0; i<listeners.size(); i++) {
-			IInputContextListener listener = (IInputContextListener)listeners.get(i);
-			if (added)
-				listener.contextAdded(context);
-			else
-				listener.contextRemoved(context);
-		}		
-		if (added)
-			hookUndo(context);
-		else
-			unhookUndo(context);
-	}
-	public void undo() {
-		if (undoManager!=null && undoManager.isUndoable())
-			undoManager.undo();
-	}
-	
-	public void redo() {
-		if (undoManager!=null && undoManager.isRedoable())
-			undoManager.redo();
-	}
-	
-	private void hookUndo(InputContext context) {
-		if (undoManager==null) return;
-		IBaseModel model = context.getModel();
-		if (model instanceof IModelChangeProvider)
-		undoManager.connect((IModelChangeProvider)model);
-	}
-	
-	private void unhookUndo(InputContext context) {
-		if (undoManager==null) return;
-		IBaseModel model = context.getModel();
-		if (model instanceof IModelChangeProvider)
-		undoManager.disconnect((IModelChangeProvider)model);
-	}
-	/**
-	 * @return Returns the undoManager.
-	 */
-	public IModelUndoManager getUndoManager() {
-		return undoManager;
-	}
-	/**
-	 * @param undoManager The undoManager to set.
-	 */
-	public void setUndoManager(IModelUndoManager undoManager) {
-		this.undoManager = undoManager;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/context/UTF8InputContext.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/context/UTF8InputContext.java
deleted file mode 100644
index f47bd9c..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/context/UTF8InputContext.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 27, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.pde.internal.ui.editor.context;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.ui.*;
-
-
-public abstract class UTF8InputContext extends InputContext {
-	/**
-	 * @param editor
-	 * @param input
-	 */
-	public UTF8InputContext(PDEFormEditor editor, IEditorInput input, boolean primary) {
-		super(editor, input, primary);
-	}
-	
-	protected String getDefaultCharset() {
-		return "UTF-8"; //$NON-NLS-1$
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/context/XMLDocumentSetupParticpant.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/context/XMLDocumentSetupParticpant.java
deleted file mode 100644
index 958461e..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/context/XMLDocumentSetupParticpant.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.context;
-
-import org.eclipse.core.filebuffers.*;
-import org.eclipse.jface.text.*;
-import org.eclipse.jface.text.rules.*;
-import org.eclipse.pde.internal.ui.editor.text.*;
-
-public class XMLDocumentSetupParticpant implements IDocumentSetupParticipant {
-
-	public void setup(IDocument document) {
-		IDocumentPartitioner partitioner = createDocumentPartitioner();
-		if (partitioner != null) {
-			partitioner.connect(document);
-			document.setDocumentPartitioner(partitioner);
-		}
-	}
-	
-	private IDocumentPartitioner createDocumentPartitioner() {
-		FastPartitioner partitioner = new FastPartitioner(
-				new XMLPartitionScanner(), new String[]{
-						XMLPartitionScanner.XML_TAG,
-						XMLPartitionScanner.XML_COMMENT});
-		return partitioner;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/context/XMLInputContext.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/context/XMLInputContext.java
deleted file mode 100644
index 7fd4ba0..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/context/XMLInputContext.java
+++ /dev/null

@@ -1,453 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.context;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.eclipse.core.filebuffers.IDocumentSetupParticipant;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.TextUtilities;
-import org.eclipse.jface.text.rules.FastPartitioner;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.util.CoreUtility;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.pde.internal.ui.editor.text.XMLPartitionScanner;
-import org.eclipse.pde.internal.ui.model.IDocumentAttribute;
-import org.eclipse.pde.internal.ui.model.IDocumentNode;
-import org.eclipse.pde.internal.ui.model.IDocumentTextNode;
-import org.eclipse.text.edits.DeleteEdit;
-import org.eclipse.text.edits.InsertEdit;
-import org.eclipse.text.edits.MoveSourceEdit;
-import org.eclipse.text.edits.MoveTargetEdit;
-import org.eclipse.text.edits.ReplaceEdit;
-import org.eclipse.text.edits.TextEdit;
-import org.eclipse.ui.IEditorInput;
-
-public abstract class XMLInputContext extends UTF8InputContext {
-	protected HashMap fOperationTable = new HashMap();
-	protected HashMap fMoveOperations = new HashMap();
-
-	/**
-	 * @param editor
-	 * @param input
-	 */
-	public XMLInputContext(PDEFormEditor editor, IEditorInput input, boolean primary) {
-		super(editor, input, primary);
-	}	
-
-	protected IDocumentPartitioner createDocumentPartitioner() {
-		FastPartitioner partitioner = new FastPartitioner(
-				new XMLPartitionScanner(), new String[]{
-						XMLPartitionScanner.XML_TAG,
-						XMLPartitionScanner.XML_COMMENT});
-		return partitioner;
-	}
-	
-	protected IDocumentSetupParticipant getDocumentSetupParticipant() {
-		return new XMLDocumentSetupParticpant();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.context.InputContext#addTextEditOperation(java.util.ArrayList, org.eclipse.pde.core.IModelChangedEvent)
-	 */
-	protected void addTextEditOperation(ArrayList ops, IModelChangedEvent event) {
-		Object[] objects = event.getChangedObjects();
-		if (objects != null) {
-			for (int i = 0; i < objects.length; i++) {
-				Object object = objects[i];
-				switch (event.getChangeType()) {
-					case IModelChangedEvent.REMOVE :
-						if (object instanceof IDocumentNode)
-							removeNode((IDocumentNode) object, ops);
-						break;
-					case IModelChangedEvent.INSERT :
-						if (object instanceof IDocumentNode)
-							insertNode((IDocumentNode) object, ops);
-						break;
-					case IModelChangedEvent.CHANGE :
-						if (object instanceof IDocumentNode) {
-							IDocumentNode node = (IDocumentNode) object;
-							IDocumentAttribute attr = node.getDocumentAttribute(event.getChangedProperty());
-							if (attr != null) {
-								addAttributeOperation(attr, ops, event);
-							} else {
-								if (event.getOldValue() instanceof IDocumentTextNode) {
-									addElementContentOperation((IDocumentTextNode)event.getOldValue(), ops);
-								} else if (event.getOldValue() instanceof IDocumentNode && event.getNewValue() instanceof IDocumentNode){
-									// swapping of nodes
-									modifyNode(node, ops, event);
-								}
-							}
-						}
-					default:
-						break;
-				}
-			}
-		}
-	}
-	
-	private void removeNode(IDocumentNode node, ArrayList ops) {
-		// delete previous op on this node, if any
-		TextEdit old = (TextEdit)fOperationTable.get(node);
-		if (old != null) {
-			ops.remove(old);
-			fOperationTable.remove(node);
-		}
-		TextEdit oldMove= (TextEdit)fMoveOperations.get(node);
-		if (oldMove != null) {
-			ops.remove(oldMove);
-			fMoveOperations.remove(node);
-		}
-		// if node has an offset, delete it
-		if (node.getOffset() > -1) {
-			// Create a delete op for this node
-			TextEdit op = getDeleteNodeOperation(node);
-			ops.add(op);
-			fOperationTable.put(node, op);			
-		} else if (old == null && oldMove == null){
-			// No previous op on this non-offset node, just rewrite highest ancestor with an offset
-			insertNode(node, ops);
-		}
-	}
-
-	private void insertNode(IDocumentNode node, ArrayList ops) {
-		TextEdit op = null;
-		node = getHighestNodeToBeWritten(node);
-		if (node.getParentNode() == null) {
-			op = new InsertEdit(0, node.write(true));
-		} else {
-			if (node.getOffset() > -1) {
-				// this is an element that was of the form <element/>
-				// it now needs to be broken up into <element><new/></element>
-				op = new ReplaceEdit(node.getOffset(), node.getLength(), node.write(false));
-			} else {
-				// try to insert after last sibling that has an offset
-				op = insertAfterSibling(node);
-				// insert as first child of its parent
-				if (op == null) {
-					op = insertAsFirstChild(node);
-				}
-			}
-		}
-		TextEdit old = (TextEdit) fOperationTable.get(node);
-		if (old != null)
-			ops.remove(old);
-		ops.add(op);
-		fOperationTable.put(node, op);				
-	}
-
-	private InsertEdit insertAfterSibling(IDocumentNode node) {
-		IDocumentNode sibling = node.getPreviousSibling();
-		for (;;) {
-			if (sibling == null)
-				break;
-			if (sibling.getOffset() > -1) {
-				node.setLineIndent(sibling.getLineIndent());
-				String sep = TextUtilities.getDefaultLineDelimiter(getDocumentProvider().getDocument(getInput()));
-				return new InsertEdit(sibling.getOffset() + sibling.getLength(), sep + node.write(true)); 
-			}
-			sibling = sibling.getPreviousSibling();
-		}
-		return null;
-	}
-	
-	private InsertEdit insertAsFirstChild(IDocumentNode node) {
-		int offset = node.getParentNode().getOffset();
-		int length = getNextPosition(getDocumentProvider().getDocument(getInput()), offset, '>');
-		node.setLineIndent(node.getParentNode().getLineIndent() + 3);
-		String sep = TextUtilities.getDefaultLineDelimiter(getDocumentProvider().getDocument(getInput()));
-		return new InsertEdit(offset+ length + 1, sep + node.write(true));	 
-	}
-	
-
-	private void modifyNode(IDocumentNode node, ArrayList ops, IModelChangedEvent event) {
-		IDocumentNode oldNode = (IDocumentNode)event.getOldValue();
-		IDocumentNode newNode = (IDocumentNode)event.getNewValue();
-		
-		IDocumentNode node1 = (oldNode.getPreviousSibling() == null || oldNode.equals(newNode.getPreviousSibling())) ? oldNode : newNode;
-		IDocumentNode node2 = node1.equals(oldNode) ? newNode : oldNode;
-		
-		if (node1.getOffset() < 0 && node2.getOffset() < 2) {
-			TextEdit op = (TextEdit)fOperationTable.get(node1);
-			if (op == null) {
-				// node 1 has no rule, so node 2 has no rule, therefore rewrite parent/ancestor
-				insertNode(node, ops);
-			} else {
-				// swap order of insert operations
-				TextEdit op2 = (TextEdit)fOperationTable.get(node2);
-				ops.set(ops.indexOf(op), op2);
-				ops.set(ops.indexOf(op2), op);
-			}
-		} else if (node1.getOffset() > -1 && node2.getOffset() > -1) {
-			// both nodes have offsets, so create a move target/source combo operation
-			IRegion region = getMoveRegion(node1);
-			MoveSourceEdit source = new MoveSourceEdit(region.getOffset(), region.getLength());
-			region = getMoveRegion(node2);
-			source.setTargetEdit(new MoveTargetEdit(region.getOffset()));
-			MoveSourceEdit op = (MoveSourceEdit)fMoveOperations.get(node1);
-			if (op != null) {
-				ops.set(ops.indexOf(op), source);
-			} else {
-				op = (MoveSourceEdit)fMoveOperations.get(node2);
-				if (op != null && op.getTargetEdit().getOffset() == source.getOffset()) {
-					fMoveOperations.remove(node2);
-					ops.remove(op);
-					return;
-				} 
-				ops.add(source);
-			}			
-			fMoveOperations.put(node1, source);
-		} else {
-			// one node with offset, the other without offset.  Delete/reinsert the one without offset
-			insertNode((node1.getOffset() < 0) ? node1 : node2, ops);
-		}		
-	}
-	
-	private IRegion getMoveRegion(IDocumentNode node) {
-		int offset = node.getOffset();
-		int length = node.getLength();
-		int i = 1;
-		try {
-			IDocument doc = getDocumentProvider().getDocument(getInput());
-			for (;;i++) {
-				char ch = doc.get(offset - i, 1).toCharArray()[0];
-				if (!Character.isWhitespace(ch)) {
-					i -= 1;
-					break;
-				}
-			}
-		} catch (BadLocationException e) {
-		}
-		return new Region(offset - i, length + i);		
-	}
-
-	private void addAttributeOperation(IDocumentAttribute attr, ArrayList ops, IModelChangedEvent event) {
-		int offset = attr.getValueOffset();
-		Object newValue = event.getNewValue();
-		Object changedObject = attr;
-		TextEdit op = null;
-		if (offset > -1) {
-			if (newValue == null || newValue.toString().length() == 0) {
-				int length = attr.getValueOffset() + attr.getValueLength() + 1 - attr.getNameOffset();
-				op = getAttributeDeleteEditOperation(attr.getNameOffset(), length);
-			} else {
-				op = new ReplaceEdit(offset, attr.getValueLength(), getWritableString(event.getNewValue().toString()));
-			}
-		} 
-				
-		if (op == null) {
-			IDocumentNode node = attr.getEnclosingElement();
-			IDocument doc = getDocumentProvider().getDocument(getInput());
-			if (node.getOffset() > -1) {
-				changedObject = node;
-				int len = getNextPosition(doc, node.getOffset(), '>');
-				op = new ReplaceEdit(node.getOffset(), len + 1, node.writeShallow(shouldTerminateElement(doc, node.getOffset() + len)));		
-			} else {
-				insertNode(node, ops);
-				return;
-			}		
-		}
-		TextEdit oldOp = (TextEdit)fOperationTable.get(changedObject);
-		if (oldOp != null)
-			ops.remove(oldOp);
-		ops.add(op);
-		fOperationTable.put(changedObject, op);
-	}
-	
-	private void addElementContentOperation(IDocumentTextNode textNode, ArrayList ops) {
-		TextEdit op = null;
-		Object changedObject = textNode;
-		if (textNode.getOffset() > -1) {
-			String newText = getWritableString(textNode.getText());
-			op = new ReplaceEdit(textNode.getOffset(), textNode.getLength(), newText);
-		} else {
-			IDocumentNode parent = textNode.getEnclosingElement();
-			if (parent.getOffset() > -1) {
-				IDocument doc = getDocumentProvider().getDocument(getInput());
-				try {
-					String endChars = doc.get(parent.getOffset() + parent.getLength() - 2, 2);
-					if ("/>".equals(endChars)) { //$NON-NLS-1$
-						// parent element is of the form <element/>, rewrite it
-						insertNode(parent, ops);
-						return;
-					}
-				} catch (BadLocationException e) {
-				}
-				// add text as first child
-				changedObject = parent;
-				String sep = TextUtilities.getDefaultLineDelimiter(getDocumentProvider().getDocument(getInput()));
-				StringBuffer buffer = new StringBuffer(sep); 
-				for (int i = 0; i < parent.getLineIndent(); i++) 
-					buffer.append(" "); //$NON-NLS-1$
-				buffer.append("   " + getWritableString(textNode.getText())); //$NON-NLS-1$
-				int offset = parent.getOffset();
-				int length = getNextPosition(doc, offset, '>');
-				op = new InsertEdit(offset+ length + 1, buffer.toString());	
-			} else {
-				insertNode(parent, ops);
-				return;
-			}
-		}
-		TextEdit oldOp = (TextEdit)fOperationTable.get(changedObject);
-		if (oldOp != null)
-			ops.remove(oldOp);
-		ops.add(op);
-		fOperationTable.put(changedObject, op);		
-	}
-
-	private boolean shouldTerminateElement(IDocument doc, int offset) {
-		try {
-			return doc.get(offset-1, 1).toCharArray()[0] == '/';
-		} catch (BadLocationException e) {
-		}
-		return false;
-	}
-	
-	private int getNextPosition(IDocument doc, int offset, char ch) {
-		int i = 0;
-		try {
-			for (i = 0; i + offset < doc.getLength() ;i++) {
-				if (ch == doc.get(offset + i, 1).toCharArray()[0])
-					break;
-			}
-		} catch (BadLocationException e) {
-		}
-		return i;
-	}
-	
-	private DeleteEdit getAttributeDeleteEditOperation(int offset, int length) {
-		try {
-			IDocument doc = getDocumentProvider().getDocument(getInput());
-			for (;;) {
-				char ch = doc.get(offset + length, 1).toCharArray()[0];
-				if (!Character.isWhitespace(ch)) {
-					break;
-				}
-				
-				length += 1;
-			}
-		} catch (BadLocationException e) {
-		}
-		return new DeleteEdit(offset, length);		
-	}
-	
-
-	private DeleteEdit getDeleteNodeOperation(IDocumentNode node) {
-		int offset = node.getOffset();
-		int length = node.getLength();
-		int indent = 0;
-		try {
-			IDocument doc = getDocumentProvider().getDocument(getInput());
-			int line = doc.getLineOfOffset(offset + length);
-			for (;;) {
-				char ch = doc.get(offset + length, 1).toCharArray()[0];
-				if (doc.getLineOfOffset(offset + length) > line || !Character.isWhitespace(ch)) {
-					length -= 1;
-					break;
-				}
-				length += 1;
-			}
-			
-			for (indent = 1; indent <= node.getLineIndent(); indent++) {
-				char ch = doc.get(offset - indent, 1).toCharArray()[0];
-				if (!Character.isWhitespace(ch)) {
-					indent -= 1;
-					break;
-				}
-					
-			}
-			//System.out.println("\"" + getDocumentProvider().getDocument(getInput()).get(offset-indent, length + indent) + "\"");
-		} catch (BadLocationException e) {
-		}
-		return new DeleteEdit(offset - indent, length + indent);
-		
-	}
-
-	private IDocumentNode getHighestNodeToBeWritten(IDocumentNode node) {
-		IDocumentNode parent = node.getParentNode();
-		if (parent == null)
-			return node;
-		if (parent.getOffset() > -1) {
-			IDocument doc = getDocumentProvider().getDocument(getInput());
-			try {
-				String endChars = doc.get(parent.getOffset() + parent.getLength() - 2, 2);
-				return ("/>".equals(endChars)) ? parent : node; //$NON-NLS-1$
-			} catch (BadLocationException e) {
-				return node;
-			}
-			
-		}
-		return getHighestNodeToBeWritten(parent);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.context.InputContext#flushModel(org.eclipse.jface.text.IDocument)
-	 */
-	protected void flushModel(IDocument doc) {
-		removeUnnecessaryOperations();
-		if (fOperationTable.size() == 1) {
-			Object object = fOperationTable.keySet().iterator().next();
-			if (object instanceof IDocumentNode && fEditOperations.get(0) instanceof InsertEdit) {
-				if (((IDocumentNode)object).getParentNode() == null) {
-					doc.set(((IDocumentNode)object).write(true));
-					fOperationTable.clear();
-					fEditOperations.clear();
-					return;
-				}
-			} 
-		}
-		reorderInsertEdits(fEditOperations);
-		fOperationTable.clear();
-		fMoveOperations.clear();
-		super.flushModel(doc);
-	}
-	
-	protected abstract void reorderInsertEdits(ArrayList ops);
-
-	protected void removeUnnecessaryOperations() {
-		Iterator iter = fOperationTable.values().iterator();
-		while (iter.hasNext()) {
-			Object object = iter.next();
-			if (object instanceof IDocumentNode) {
-				IDocumentNode node = (IDocumentNode)object;
-				if (node.getOffset() > -1) {
-					IDocumentAttribute[] attrs = node.getNodeAttributes();
-					for (int i = 0; i < attrs.length; i++) {
-						Object op = fOperationTable.remove(attrs[i]);
-						if (op != null)
-							fEditOperations.remove(op);
-					}
-					IDocumentTextNode textNode = node.getTextNode();
-					if (textNode != null) {
-						Object op = fOperationTable.remove(textNode);
-						if (op != null)
-							fEditOperations.remove(op);						
-					}
-				}
-			}
-		}		
-	}
-	
-	
-	public String getWritableString(String source) {
-		return CoreUtility.getWritableString(source);
-	}
-	
-	protected HashMap getOperationTable() {
-		return fOperationTable;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/Choice.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/Choice.java
deleted file mode 100644
index bfb3347..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/Choice.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-/**
- * @version 	1.0
- * @author
- */
-public class Choice {
-	private String label;
-	private String value;
-	public Choice(String value, String label) {
-		this.value = value;
-		this.label = label;
-	}
-	
-	public String getValue() {
-		return value;
-	}
-	public String getLabel() {
-		return label;
-	}
-	public String toString() {
-		return label;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/DataDetailsSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/DataDetailsSection.java
deleted file mode 100644
index a5e0dbc..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/DataDetailsSection.java
+++ /dev/null

@@ -1,198 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.ifeature.IFeatureData;
-import org.eclipse.pde.internal.core.ifeature.IFeatureEntry;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.PDESection;
-import org.eclipse.pde.internal.ui.parts.FormEntry;
-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.ui.forms.IFormPart;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.IPartSelectionListener;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-public class DataDetailsSection extends PDESection implements IFormPart,
-		IPartSelectionListener {
-	protected IFeatureEntry fInput;
-
-	private FormEntry fdownloadSizeText;
-
-	private FormEntry fInstallSizeText;
-
-	public DataDetailsSection(PDEFormPage page, Composite parent) {
-		this(page, parent, PDEUIMessages.SiteEditor_DataDetailsSection_title,
-				PDEUIMessages.SiteEditor_DataDetailsSection_desc, SWT.NULL);
-	}
-
-	public DataDetailsSection(PDEFormPage page, Composite parent, String title,
-			String desc, int toggleStyle) {
-		super(page, parent, Section.DESCRIPTION | toggleStyle);
-		getSection().setText(title);
-		getSection().setDescription(desc);
-		createClient(getSection(), page.getManagedForm().getToolkit());
-	}
-
-	public void cancelEdit() {
-		fdownloadSizeText.cancelEdit();
-		fInstallSizeText.cancelEdit();
-		super.cancelEdit();
-	}
-
-	public void commit(boolean onSave) {
-		fdownloadSizeText.commit();
-		fInstallSizeText.commit();
-		super.commit(onSave);
-	}
-
-	public void createClient(Section section, FormToolkit toolkit) {
-		Composite container = toolkit.createComposite(section);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.verticalSpacing = 5;
-		layout.horizontalSpacing = 6;
-		container.setLayout(layout);
-
-		fdownloadSizeText = new FormEntry(container, toolkit, PDEUIMessages.SiteEditor_DataDetailsSection_downloadSize, null, false);
-		fdownloadSizeText.setFormEntryListener(new FormEntryAdapter(this) {
-
-			public void textValueChanged(FormEntry text) {
-				if (fInput != null)
-					try {
-						fInput.setDownloadSize(getLong(text.getValue()));
-					} catch (CoreException e) {
-						PDEPlugin.logException(e);
-					}
-			}
-		});
-		limitTextWidth(fdownloadSizeText);
-		fdownloadSizeText.setEditable(isEditable());
-
-		fInstallSizeText = new FormEntry(container, toolkit, PDEUIMessages.SiteEditor_DataDetailsSection_installSize, null, false);
-		fInstallSizeText.setFormEntryListener(new FormEntryAdapter(this) {
-
-			public void textValueChanged(FormEntry text) {
-				if (fInput != null)
-					try {
-						fInput.setInstallSize(getLong(text.getValue()));
-					} catch (CoreException e) {
-						PDEPlugin.logException(e);
-					}
-			}
-		});
-		limitTextWidth(fInstallSizeText);
-		fInstallSizeText.setEditable(isEditable());
-
-		toolkit.paintBordersFor(container);
-		section.setClient(container);
-	}
-
-	public void dispose() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		if (model != null)
-			model.removeModelChangedListener(this);
-		super.dispose();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.forms.AbstractFormPart#initialize(org.eclipse.ui.forms.IManagedForm)
-	 */
-	public void initialize(IManagedForm form) {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		if (model != null)
-			model.addModelChangedListener(this);
-		super.initialize(form);
-	}
-
-	protected void limitTextWidth(FormEntry entry) {
-		GridData gd = (GridData) entry.getText().getLayoutData();
-		gd.widthHint = 30;
-	}
-
-	public void modelChanged(IModelChangedEvent e) {
-		if (e.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			markStale();
-		} else if (e.getChangeType() == IModelChangedEvent.CHANGE
-				&& e.getChangedObjects().length > 0
-				&& e.getChangedObjects()[0] instanceof IFeatureData
-				&& e.getChangedObjects()[0] == fInput) {
-			markStale();
-		}
-	}
-
-	public void refresh() {
-		update();
-		super.refresh();
-	}
-
-	public void selectionChanged(IFormPart part, ISelection selection) {
-		if (selection instanceof IStructuredSelection && !selection.isEmpty()) {
-			Object o = ((IStructuredSelection) selection).getFirstElement();
-			if (o instanceof IFeatureData) {
-				fInput = (IFeatureData) o;
-			} else {
-				fInput = null;
-			}
-		} else
-			fInput = null;
-		update();
-	}
-
-	public void setFocus() {
-		if (fdownloadSizeText != null)
-			fdownloadSizeText.getText().setFocus();
-	}
-
-	private void update() {
-		if (fInput != null) {
-			fdownloadSizeText
-					.setValue(
-							fInput.getDownloadSize() >= 0 ? "" + fInput.getDownloadSize() : null, true); //$NON-NLS-1$
-			fInstallSizeText
-					.setValue(
-							fInput.getInstallSize() >= 0 ? "" + fInput.getInstallSize() : null, true); //$NON-NLS-1$
-		} else {
-			fdownloadSizeText.setValue(null, true); 
-			fInstallSizeText.setValue(null, true); 
-		}
-		fdownloadSizeText.setEditable(fInput != null && isEditable());
-		fInstallSizeText.setEditable(fInput != null && isEditable());
-	}
-
-	public boolean isEditable() {
-		return getPage().getPDEEditor().getAggregateModel().isEditable();
-	}
-
-	private long getLong(String svalue) {
-		if (svalue == null)
-			return 0;
-		try {
-			return Long.parseLong(svalue);
-		} catch (NumberFormatException e) {
-			return 0;
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/DataPortabilitySection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/DataPortabilitySection.java
deleted file mode 100644
index dad5f70..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/DataPortabilitySection.java
+++ /dev/null

@@ -1,379 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import java.util.Locale;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.ifeature.IEnvironment;
-import org.eclipse.pde.internal.core.ifeature.IFeatureData;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.PDESection;
-import org.eclipse.pde.internal.ui.parts.FormEntry;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.RTFTransfer;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IFormPart;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.IPartSelectionListener;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-public class DataPortabilitySection extends PDESection implements IFormPart,
-		IPartSelectionListener {
-	public static Choice[] getArchChoices() {
-		return getKnownChoices(Platform.knownOSArchValues());
-	}
-
-	private static Choice[] getKnownChoices(String[] values) {
-		Choice[] choices = new Choice[values.length];
-		for (int i = 0; i < choices.length; i++) {
-			choices[i] = new Choice(values[i], values[i]);
-		}
-		return choices;
-	}
-
-	public static Choice[] getNLChoices() {
-		Locale[] locales = Locale.getAvailableLocales();
-		Choice[] choices = new Choice[locales.length];
-		for (int i = 0; i < locales.length; i++) {
-			Locale locale = locales[i];
-			choices[i] = new Choice(locale.toString(), locale.toString()
-					+ " - " + locale.getDisplayName()); //$NON-NLS-1$
-		}
-		return choices;
-	}
-
-	public static Choice[] getOSChoices() {
-		return getKnownChoices(Platform.knownOSValues());
-	}
-
-	public static Choice[] getWSChoices() {
-		return getKnownChoices(Platform.knownWSValues());
-	}
-
-	private FormEntry fArchText;
-
-	private IFeatureData fCurrentInput;
-
-	private FormEntry fNlText;
-
-	private FormEntry fOsText;
-
-	private FormEntry fWsText;
-
-	public DataPortabilitySection(PDEFormPage page, Composite parent) {
-		this(page, parent, PDEUIMessages.FeatureEditor_DataDetailsSection_title,
-				PDEUIMessages.FeatureEditor_DataDetailsSection_desc, SWT.NULL);
-	}
-
-	public DataPortabilitySection(PDEFormPage page, Composite parent,
-			String title, String desc, int toggleStyle) {
-		super(page, parent, Section.DESCRIPTION | ExpandableComposite.NO_TITLE
-				| toggleStyle, false);
-		// getSection().setText(title);
-		getSection().setDescription(desc);
-		createClient(getSection(), page.getManagedForm().getToolkit());
-	}
-
-	private void applyValue(String property, String value) throws CoreException {
-		if (fCurrentInput == null)
-			return;
-		if (property.equals(IEnvironment.P_NL))
-			fCurrentInput.setNL(value);
-		else if (property.equals(IEnvironment.P_OS))
-			fCurrentInput.setOS(value);
-		else if (property.equals(IEnvironment.P_WS))
-			fCurrentInput.setWS(value);
-		else if (property.equals(IEnvironment.P_ARCH))
-			fCurrentInput.setArch(value);
-	}
-
-	public void cancelEdit() {
-		fOsText.cancelEdit();
-		fWsText.cancelEdit();
-		fNlText.cancelEdit();
-		fArchText.cancelEdit();
-		super.cancelEdit();
-	}
-
-	public boolean canPaste(Clipboard clipboard) {
-		TransferData[] types = clipboard.getAvailableTypes();
-		Transfer[] transfers = new Transfer[] { TextTransfer.getInstance(),
-				RTFTransfer.getInstance() };
-		for (int i = 0; i < types.length; i++) {
-			for (int j = 0; j < transfers.length; j++) {
-				if (transfers[j].isSupportedType(types[i]))
-					return true;
-			}
-		}
-		return false;
-	}
-
-	private void clearField(String property) {
-		if (property.equals(IEnvironment.P_OS))
-			fOsText.setValue(null, true);
-		else if (property.equals(IEnvironment.P_WS))
-			fWsText.setValue(null, true);
-		else if (property.equals(IEnvironment.P_ARCH))
-			fArchText.setValue(null, true);
-		else if (property.equals(IEnvironment.P_NL))
-			fNlText.setValue(null, true);
-	}
-
-	private void clearFields() {
-		fOsText.setValue(null, true);
-		fWsText.setValue(null, true);
-		fNlText.setValue(null, true);
-		fArchText.setValue(null, true);
-	}
-
-	public void commit(boolean onSave) {
-		fOsText.commit();
-		fWsText.commit();
-		fNlText.commit();
-		fArchText.commit();
-		super.commit(onSave);
-	}
-
-	public void createClient(Section section, FormToolkit toolkit) {
-		Composite container = toolkit.createComposite(section);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		layout.verticalSpacing = 5;
-		layout.horizontalSpacing = 6;
-		container.setLayout(layout);
-
-		String editLabel = PDEUIMessages.SiteEditor_PortabilitySection_edit;
-
-		fOsText = new FormEntry(container, toolkit, PDEUIMessages.SiteEditor_PortabilitySection_os, editLabel, false);
-		fOsText.setFormEntryListener(new FormEntryAdapter(this) {
-
-			public void browseButtonSelected(FormEntry entry) {
-				BusyIndicator.showWhile(fOsText.getText().getDisplay(),
-						new Runnable() {
-							public void run() {
-								Choice[] choices = getOSChoices();
-								openPortabilityChoiceDialog(IEnvironment.P_OS,
-										fOsText, choices);
-							}
-						});
-			}
-
-			public void textValueChanged(FormEntry text) {
-				try {
-					applyValue(IEnvironment.P_OS, text.getValue());
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		});
-		limitTextWidth(fOsText);
-		fOsText.setEditable(fCurrentInput !=null && isEditable());
-
-		fWsText = new FormEntry(container, toolkit, PDEUIMessages.SiteEditor_PortabilitySection_ws, editLabel, false);
-		fWsText.setFormEntryListener(new FormEntryAdapter(this) {
-
-			public void browseButtonSelected(FormEntry entry) {
-				BusyIndicator.showWhile(fWsText.getText().getDisplay(),
-						new Runnable() {
-							public void run() {
-								Choice[] choices = getWSChoices();
-								openPortabilityChoiceDialog(IEnvironment.P_WS,
-										fWsText, choices);
-							}
-						});
-			}
-
-			public void textValueChanged(FormEntry text) {
-				try {
-					applyValue(IEnvironment.P_WS, text.getValue());
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		});
-		limitTextWidth(fWsText);
-		fWsText.setEditable(fCurrentInput !=null && isEditable());
-
-		fNlText = new FormEntry(container, toolkit, PDEUIMessages.SiteEditor_PortabilitySection_nl, editLabel, false);
-
-		fNlText.setFormEntryListener(new FormEntryAdapter(this) {
-
-			public void browseButtonSelected(FormEntry entry) {
-				BusyIndicator.showWhile(fNlText.getText().getDisplay(),
-						new Runnable() {
-							public void run() {
-								Choice[] choices = getNLChoices();
-								openPortabilityChoiceDialog(IEnvironment.P_NL,
-										fNlText, choices);
-							}
-						});
-			}
-
-			public void textValueChanged(FormEntry text) {
-				try {
-					applyValue(IEnvironment.P_NL, text.getValue());
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		});
-		limitTextWidth(fNlText);
-		fNlText.setEditable(fCurrentInput !=null && isEditable());
-
-		fArchText = new FormEntry(container, toolkit, PDEUIMessages.SiteEditor_PortabilitySection_arch, editLabel, false);
-		fArchText.setFormEntryListener(new FormEntryAdapter(this) {
-
-			public void browseButtonSelected(FormEntry entry) {
-				BusyIndicator.showWhile(fArchText.getText().getDisplay(),
-						new Runnable() {
-							public void run() {
-								Choice[] choices = getArchChoices();
-								openPortabilityChoiceDialog(
-										IEnvironment.P_ARCH, fArchText, choices);
-							}
-						});
-			}
-
-			public void textValueChanged(FormEntry text) {
-				try {
-					applyValue(IEnvironment.P_ARCH, text.getValue());
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-
-		});
-		limitTextWidth(fArchText);
-		fArchText.setEditable(fCurrentInput !=null && isEditable());
-
-		toolkit.paintBordersFor(container);
-		section.setClient(container);
-	}
-
-	public void dispose() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		if (model != null)
-			model.removeModelChangedListener(this);
-		super.dispose();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.forms.AbstractFormPart#initialize(org.eclipse.ui.forms.IManagedForm)
-	 */
-	public void initialize(IManagedForm form) {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		if (model != null)
-			model.addModelChangedListener(this);
-		super.initialize(form);
-	}
-
-	private void limitTextWidth(FormEntry entry) {
-		GridData gd = (GridData) entry.getText().getLayoutData();
-		gd.widthHint = 30;
-	}
-
-	public void modelChanged(IModelChangedEvent e) {
-		markStale();
-	}
-
-	private void openPortabilityChoiceDialog(String property, FormEntry text,
-			Choice[] choices) {
-		String value = text.getValue();
-
-		PortabilityChoicesDialog dialog = new PortabilityChoicesDialog(
-				PDEPlugin.getActiveWorkbenchShell(), choices, value);
-		dialog.create();
-		dialog.getShell().setText(PDEUIMessages.SiteEditor_PortabilityChoicesDialog_title);
-
-		int result = dialog.open();
-		if (result == Window.OK) {
-			value = dialog.getValue();
-			text.setValue(value);
-			try {
-				applyValue(property, value);
-			} catch (CoreException e) {
-				PDEPlugin.logException(e);
-			}
-		}
-	}
-
-	public void refresh() {
-		if (fCurrentInput == null) {
-			clearFields();
-		} else {
-			setValue(IEnvironment.P_OS);
-			setValue(IEnvironment.P_WS);
-			setValue(IEnvironment.P_ARCH);
-			setValue(IEnvironment.P_NL);
-		}
-
-		fOsText.setEditable(fCurrentInput != null && isEditable());
-		fWsText.setEditable(fCurrentInput != null && isEditable());
-		fNlText.setEditable(fCurrentInput != null && isEditable());
-		fArchText.setEditable(fCurrentInput != null && isEditable());
-
-		super.refresh();
-	}
-
-	public void selectionChanged(IFormPart part, ISelection selection) {
-		if (selection instanceof IStructuredSelection && !selection.isEmpty()) {
-			Object o = ((IStructuredSelection) selection).getFirstElement();
-			if (o instanceof IFeatureData) {
-				fCurrentInput = (IFeatureData) o;
-			} else {
-				fCurrentInput = null;
-			}
-		} else
-			fCurrentInput = null;
-		refresh();
-	}
-
-	public void setFocus() {
-		if (fOsText != null)
-			fOsText.getText().setFocus();
-	}
-
-	private void setValue(String property) {
-		if (fCurrentInput == null) {
-			clearField(property);
-		} else {
-			if (property.equals(IEnvironment.P_NL))
-				fNlText.setValue(fCurrentInput.getNL(), true);
-			else if (property.equals(IEnvironment.P_OS))
-				fOsText.setValue(fCurrentInput.getOS(), true);
-			else if (property.equals(IEnvironment.P_WS))
-				fWsText.setValue(fCurrentInput.getWS(), true);
-			else if (property.equals(IEnvironment.P_ARCH))
-				fArchText.setValue(fCurrentInput.getArch(), true);
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/DataSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/DataSection.java
deleted file mode 100644
index 4557265..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/DataSection.java
+++ /dev/null

@@ -1,389 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.pde.core.IModel;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.feature.FeatureData;
-import org.eclipse.pde.internal.core.feature.FeaturePlugin;
-import org.eclipse.pde.internal.core.ifeature.IFeature;
-import org.eclipse.pde.internal.core.ifeature.IFeatureData;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.core.ifeature.IFeaturePlugin;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.ModelDataTransfer;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.TableSection;
-import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
-import org.eclipse.pde.internal.ui.parts.TablePart;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.dialogs.ResourceSelectionDialog;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-public class DataSection extends TableSection {
-	private TableViewer fDataViewer;
-
-	private Action fNewAction;
-
-	private Action fOpenAction;
-
-	private Action fDeleteAction;
-
-	class PluginContentProvider extends DefaultContentProvider implements
-			IStructuredContentProvider {
-		public Object[] getElements(Object parent) {
-			if (parent instanceof IFeature) {
-				return ((IFeature) parent).getData();
-			}
-			return new Object[0];
-		}
-	}
-
-	public DataSection(PDEFormPage page, Composite parent) {
-		super(page, parent, Section.DESCRIPTION, new String[] { PDEUIMessages.FeatureEditor_DataSection_new });
-		getSection().setText(PDEUIMessages.FeatureEditor_DataSection_title);
-		getSection().setDescription(PDEUIMessages.FeatureEditor_DataSection_desc);
-		getTablePart().setEditable(false);
-	}
-
-	public void commit(boolean onSave) {
-		super.commit(onSave);
-	}
-
-	public void createClient(Section section, FormToolkit toolkit) {
-		Composite container = createClientContainer(section, 2, toolkit);
-		GridLayout layout = (GridLayout) container.getLayout();
-		layout.verticalSpacing = 5;
-
-		createViewerPartControl(container, SWT.MULTI, 2, toolkit);
-		TablePart tablePart = getTablePart();
-		fDataViewer = tablePart.getTableViewer();
-		fDataViewer.setContentProvider(new PluginContentProvider());
-		fDataViewer.setLabelProvider(PDEPlugin.getDefault().getLabelProvider());
-		toolkit.paintBordersFor(container);
-		makeActions();
-		section.setClient(container);
-		initialize();
-	}
-
-	protected void handleDoubleClick(IStructuredSelection selection) {
-		fOpenAction.run();
-	}
-
-	protected void buttonSelected(int index) {
-		if (index == 0)
-			handleNew();
-	}
-
-	public void dispose() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		if (model != null)
-			model.removeModelChangedListener(this);
-		super.dispose();
-	}
-
-	public boolean setFormInput(Object object) {
-		if (object instanceof IFeatureData) {
-			fDataViewer.setSelection(new StructuredSelection(object), true);
-			return true;
-		}
-		return false;
-	}
-
-	protected void fillContextMenu(IMenuManager manager) {
-		manager.add(fOpenAction);
-		manager.add(new Separator());
-		manager.add(fNewAction);
-		manager.add(fDeleteAction);
-		manager.add(new Separator());
-		getPage().getPDEEditor().getContributor().contextMenuAboutToShow(
-				manager);
-	}
-
-	private void handleNew() {
-		final IFeatureModel model = (IFeatureModel) getPage().getModel();
-		IResource resource = model.getUnderlyingResource();
-		final IContainer folder = resource.getParent();
-
-		BusyIndicator.showWhile(fDataViewer.getTable().getDisplay(),
-				new Runnable() {
-					public void run() {
-						ResourceSelectionDialog dialog = new ResourceSelectionDialog(
-								fDataViewer.getTable().getShell(), folder, null);
-						dialog.open();
-						Object[] result = dialog.getResult();
-						processNewResult(model, folder, result);
-					}
-				});
-	}
-
-	private void processNewResult(IFeatureModel model, IContainer folder,
-			Object[] result) {
-		if (result == null || result.length == 0)
-			return;
-		IPath folderPath = folder.getProjectRelativePath();
-		ArrayList entries = new ArrayList();
-		for (int i = 0; i < result.length; i++) {
-			Object item = result[i];
-			if (item instanceof IFile) {
-				IFile file = (IFile) item;
-				IPath filePath = file.getProjectRelativePath();
-				int matching = filePath.matchingFirstSegments(folderPath);
-				IPath relativePath = filePath.removeFirstSegments(matching);
-				String path = relativePath.toString();
-				if (canAdd(model, path))
-					entries.add(path);
-			}
-		}
-		if (entries.size() > 0) {
-			try {
-				IFeatureData[] array = new IFeatureData[entries.size()];
-				for (int i = 0; i < array.length; i++) {
-					IFeatureData data = model.getFactory().createData();
-					String path = (String) entries.get(i);
-					data.setId(path);
-					array[i] = data;
-				}
-				model.getFeature().addData(array);
-				fDataViewer.setSelection(new StructuredSelection(array[0]));
-			} catch (CoreException e) {
-				PDEPlugin.logException(e);
-			}
-		}
-	}
-	
-	private boolean canAdd(IFeatureModel model, String path) {
-		if ("feature.xml".equals(path)) //$NON-NLS-1$
-			return false;
-		IFeatureData[] data = model.getFeature().getData();
-		for (int i = 0; i < data.length; i++) {
-			if (path.equals(data[i].getId()))
-				return false;
-		}
-		return true;
-
-	}
-
-	private void handleSelectAll() {
-		IStructuredContentProvider provider = (IStructuredContentProvider) fDataViewer
-				.getContentProvider();
-		Object[] elements = provider.getElements(fDataViewer.getInput());
-		StructuredSelection ssel = new StructuredSelection(elements);
-		fDataViewer.setSelection(ssel);
-	}
-
-	private void handleDelete() {
-		IStructuredSelection ssel = (IStructuredSelection) fDataViewer
-				.getSelection();
-
-		if (ssel.isEmpty())
-			return;
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		if (!model.isEditable()) {
-			return;
-		}
-		IFeature feature = model.getFeature();
-
-		try {
-			IFeatureData[] removed = new IFeatureData[ssel.size()];
-			int i = 0;
-			for (Iterator iter = ssel.iterator(); iter.hasNext();) {
-				IFeatureData iobj = (IFeatureData) iter.next();
-				removed[i++] = iobj;
-			}
-			feature.removeData(removed);
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	public boolean doGlobalAction(String actionId) {
-		if (actionId.equals(ActionFactory.DELETE.getId())) {
-			BusyIndicator.showWhile(fDataViewer.getTable().getDisplay(),
-					new Runnable() {
-						public void run() {
-							handleDelete();
-						}
-					});
-			return true;
-		}
-		if (actionId.equals(ActionFactory.SELECT_ALL.getId())) {
-			BusyIndicator.showWhile(fDataViewer.getTable().getDisplay(),
-					new Runnable() {
-						public void run() {
-							handleSelectAll();
-						}
-					});
-			return true;
-		}
-		if (actionId.equals(ActionFactory.CUT.getId())) {
-			// delete here and let the editor transfer
-			// the selection to the clipboard
-			handleDelete();
-			return false;
-		}
-		if (actionId.equals(ActionFactory.PASTE.getId())) {
-			doPaste();
-			return true;
-		}
-		return false;
-	}
-
-	protected void selectionChanged(IStructuredSelection selection) {
-		getPage().getPDEEditor().setSelection(selection);
-	}
-
-	public void initialize() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		refresh();
-		getTablePart().setButtonEnabled(0, model.isEditable());
-		model.addModelChangedListener(this);
-	}
-
-	public void modelChanged(IModelChangedEvent e) {
-		if (e.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			markStale();
-			return;
-		}
-		Object obj = e.getChangedObjects()[0];
-		if (obj instanceof IFeatureData && !(obj instanceof IFeaturePlugin)) {
-			if (e.getChangeType() == IModelChangedEvent.CHANGE) {
-				fDataViewer.update(obj, null);
-			} else if (e.getChangeType() == IModelChangedEvent.INSERT) {
-				fDataViewer.add(e.getChangedObjects());
-			} else if (e.getChangeType() == IModelChangedEvent.REMOVE) {
-				fDataViewer.remove(e.getChangedObjects());
-			}
-		}
-	}
-
-	private void makeActions() {
-		IModel model = (IModel) getPage().getModel();
-		fNewAction = new Action() {
-			public void run() {
-				handleNew();
-			}
-		};
-		fNewAction.setText(PDEUIMessages.Menus_new_label);
-		fNewAction.setEnabled(model.isEditable());
-
-		fDeleteAction = new Action() {
-			public void run() {
-				BusyIndicator.showWhile(fDataViewer.getTable().getDisplay(),
-						new Runnable() {
-							public void run() {
-								handleDelete();
-							}
-						});
-			}
-		};
-		fDeleteAction.setEnabled(model.isEditable());
-		fDeleteAction.setText(PDEUIMessages.Actions_delete_label);
-		fOpenAction = new OpenReferenceAction(fDataViewer);
-	}
-
-	public void setFocus() {
-		if (fDataViewer != null)
-			fDataViewer.getTable().setFocus();
-	}
-
-	public void refresh() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		IFeature feature = model.getFeature();
-		fDataViewer.setInput(feature);
-		super.refresh();
-	}
-
-	/**
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#canPaste(Object,
-	 *      Object[])
-	 */
-	protected boolean canPaste(Object target, Object[] objects) {
-		for (int i = 0; i < objects.length; i++) {
-			if (objects[i] instanceof FeaturePlugin
-					|| !(objects[i] instanceof FeatureData))
-				return false;
-		}
-		return true;
-	}
-
-	/**
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#doPaste()
-	 */
-	protected void doPaste() {
-		Clipboard clipboard = getPage().getPDEEditor().getClipboard();
-		ModelDataTransfer modelTransfer = ModelDataTransfer.getInstance();
-		Object[] objects = (Object[]) clipboard.getContents(modelTransfer);
-		if (objects != null) {
-			doPaste(null, objects);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#doPaste(Object,
-	 *      Object[])
-	 */
-	protected void doPaste(Object target, Object[] objects) {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		IFeature feature = model.getFeature();
-		if (!model.isEditable()) {
-			return;
-		}
-		FeatureData[] fData = new FeatureData[objects.length];
-		try {
-			for (int i = 0; i < objects.length; i++) {
-				if (objects[i] instanceof FeatureData
-						&& !(objects[i] instanceof FeaturePlugin)) {
-					FeatureData fd = (FeatureData) objects[i];
-					fd.setModel(model);
-					fd.setParent(feature);
-					fData[i] = fd;
-				}
-			}
-			feature.addData(fData);
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	void fireSelection() {
-		ISelection sel = fDataViewer.getSelection();
-		if (!sel.isEmpty()) {
-			fDataViewer.setSelection(fDataViewer.getSelection());
-		} else if (fDataViewer.getElementAt(0) != null) {
-			fDataViewer.setSelection(new StructuredSelection(fDataViewer
-					.getElementAt(0)));
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/EditorBuildFeatureAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/EditorBuildFeatureAction.java
deleted file mode 100644
index d4a2001..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/EditorBuildFeatureAction.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.wizards.ResizableWizardDialog;
-import org.eclipse.pde.internal.ui.wizards.exports.FeatureExportWizard;
-import org.eclipse.ui.PlatformUI;
-public class EditorBuildFeatureAction extends Action {
-	private FeatureEditor activeEditor;
-	private IFile featureFile;
-	public EditorBuildFeatureAction() {
-		setText(PDEUIMessages.FeatureEditor_BuildAction_label);
-	}
-	private void ensureContentSaved() {
-		if (activeEditor.isDirty()) {
-			try {
-				IRunnableWithProgress op = new IRunnableWithProgress() {
-					public void run(IProgressMonitor monitor) {
-						activeEditor.doSave(monitor);
-					}
-				};
-				PlatformUI.getWorkbench().getProgressService().runInUI(
-						PDEPlugin.getActiveWorkbenchWindow(), op,
-						PDEPlugin.getWorkspace().getRoot());
-
-			} catch (InvocationTargetException e) {
-				PDEPlugin.logException(e);
-			} catch (InterruptedException e) {
-			}
-		}
-	}
-	public void run() {
-		ensureContentSaved();
-		FeatureExportWizard wizard = new FeatureExportWizard();
-		IStructuredSelection selection;
-		if (featureFile != null)
-			selection = new StructuredSelection(featureFile);
-		else
-			selection = new StructuredSelection();
-		wizard.init(PlatformUI.getWorkbench(), selection);
-		WizardDialog wd = new ResizableWizardDialog(PDEPlugin
-				.getActiveWorkbenchShell(), wizard);
-		wd.create();
-		wd.open();
-	}
-	public void setActiveEditor(FeatureEditor editor) {
-		this.activeEditor = editor;
-		IFeatureModel model = (IFeatureModel) editor.getAggregateModel();
-		featureFile = (IFile) model.getUnderlyingResource();
-		setEnabled(model.isEditable());
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureAdvancedPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureAdvancedPage.java
deleted file mode 100644
index b42cc77..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureAdvancedPage.java
+++ /dev/null

@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
-
-public class FeatureAdvancedPage extends PDEFormPage {
-	public static final String PAGE_ID = "advanced"; //$NON-NLS-1$
-
-	private InstallSection fInstallSection;
-
-	private HandlerSection fHandlerSection;
-
-	private DataSection fDataSection;
-
-	private DataDetailsSection fDataDetailsSection;
-
-	private DataPortabilitySection fDataPortabilitySection;
-
-	public FeatureAdvancedPage(PDEFormEditor editor, String title) {
-		super(editor, PAGE_ID, title);
-	}
-
-	protected void createFormContent(IManagedForm managedForm) {
-		super.createFormContent(managedForm);
-		ScrolledForm form = managedForm.getForm();
-
-		Composite body = managedForm.getForm().getBody();
-		TableWrapLayout layout = new TableWrapLayout();
-		layout.bottomMargin = 10;
-		layout.topMargin = 5;
-		layout.leftMargin = 10;
-		layout.rightMargin = 10;
-		layout.numColumns = 2;
-		layout.makeColumnsEqualWidth = true;
-		layout.verticalSpacing = 15;
-		layout.horizontalSpacing = 15;
-		body.setLayout(layout);
-
-		fInstallSection = new InstallSection(this, form.getBody());
-		fHandlerSection = new HandlerSection(this, form.getBody());
-		fDataSection = new DataSection(this, form.getBody());
-		TableWrapData twdata = new TableWrapData(TableWrapData.FILL_GRAB);
-		twdata.heightHint = 300;
-		twdata.grabVertical = true;
-		twdata.rowspan = 2;
-		fDataSection.getSection().setLayoutData(twdata);
-		fDataDetailsSection = new DataDetailsSection(this, form.getBody());
-		fDataDetailsSection.getSection().setLayoutData(
-				new TableWrapData(TableWrapData.FILL_GRAB));
-		fDataPortabilitySection = new DataPortabilitySection(this, form
-				.getBody());
-		twdata = new TableWrapData(TableWrapData.FILL_GRAB);
-		twdata.grabVertical = true;
-		fDataPortabilitySection.getSection().setLayoutData(twdata);
-
-		managedForm.addPart(fInstallSection);
-		managedForm.addPart(fHandlerSection);
-		managedForm.addPart(fDataSection);
-		managedForm.addPart(fDataDetailsSection);
-		managedForm.addPart(fDataPortabilitySection);
-
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(),IHelpContextIds.MANIFEST_FEATURE_INSTALLATION);
-
-		form.setText(PDEUIMessages.FeatureEditor_AdvancedPage_heading);
-		fDataSection.fireSelection();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureDependenciesPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureDependenciesPage.java
deleted file mode 100644
index bce3db8..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureDependenciesPage.java
+++ /dev/null

@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.plugin.MatchSection;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-
-/**
- * 
- */
-public class FeatureDependenciesPage extends PDEFormPage {
-	public static final String PAGE_ID = "dependencies"; //$NON-NLS-1$
-
-	private RequiresSection fRequiresSection;
-
-	private MatchSection fMatchSection;
-
-	/**
-	 * 
-	 * @param editor
-	 * @param title
-	 */
-	public FeatureDependenciesPage(PDEFormEditor editor, String title) {
-		super(editor, PAGE_ID, title);
-	}
-
-	protected void createFormContent(IManagedForm managedForm) {
-		super.createFormContent(managedForm);
-		ScrolledForm form = managedForm.getForm();
-		FormToolkit toolkit = managedForm.getToolkit();
-		GridLayout layout = new GridLayout();
-		form.getBody().setLayout(layout);
-		layout.numColumns = 2;
-		layout.makeColumnsEqualWidth = true;
-		layout.marginWidth = 10;
-		layout.horizontalSpacing = 15;
-		layout.verticalSpacing = 15;
-		GridData gd;
-
-		Composite left = toolkit.createComposite(form.getBody());
-		layout = new GridLayout();
-		layout.marginWidth = layout.marginHeight = 0;
-		left.setLayout(layout);
-		gd = new GridData(GridData.FILL_BOTH);
-		left.setLayoutData(gd);
-
-		Composite right = toolkit.createComposite(form.getBody());
-		layout = new GridLayout();
-		layout.marginWidth = layout.marginHeight = 0;
-		right.setLayout(layout);
-		gd = new GridData(GridData.FILL_BOTH);
-		right.setLayoutData(gd);
-
-		fRequiresSection = new RequiresSection(this, left);
-		gd = new GridData(GridData.FILL_BOTH);
-		fRequiresSection.getSection().setLayoutData(gd);
-
-		fMatchSection = new MatchSection(this, right, false);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		fMatchSection.getSection().setLayoutData(gd);
-		managedForm.addPart(fRequiresSection);
-		managedForm.addPart(fMatchSection);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(),IHelpContextIds.MANIFEST_FEATURE_DEPENDENCIES);
-		initialize();
-		fRequiresSection.fireSelection();
-	}
-
-	public void initialize() {
-		getManagedForm().getForm().setText(
-				PDEUIMessages.FeatureEditor_DependenciesPage_heading);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureEditor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureEditor.java
deleted file mode 100644
index 0e7abd7..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureEditor.java
+++ /dev/null

@@ -1,364 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import java.io.File;
-import java.util.Locale;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.pde.core.IBaseModel;
-import org.eclipse.pde.core.IIdentifiable;
-import org.eclipse.pde.internal.core.build.IBuildObject;
-import org.eclipse.pde.internal.core.ifeature.IFeature;
-import org.eclipse.pde.internal.core.ifeature.IFeatureImport;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.core.ifeature.IFeatureObject;
-import org.eclipse.pde.internal.ui.IPreferenceConstants;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.ISortableContentOutlinePage;
-import org.eclipse.pde.internal.ui.editor.MultiSourceEditor;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.PDESourcePage;
-import org.eclipse.pde.internal.ui.editor.SystemFileEditorInput;
-import org.eclipse.pde.internal.ui.editor.build.BuildInputContext;
-import org.eclipse.pde.internal.ui.editor.build.BuildPage;
-import org.eclipse.pde.internal.ui.editor.build.BuildSourcePage;
-import org.eclipse.pde.internal.ui.editor.context.InputContext;
-import org.eclipse.pde.internal.ui.editor.context.InputContextManager;
-import org.eclipse.swt.SWTError;
-import org.eclipse.swt.dnd.RTFTransfer;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IShowEditorInput;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.forms.editor.IFormPage;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-
-public class FeatureEditor extends MultiSourceEditor implements IShowEditorInput {
-
-	public static void openFeatureEditor(IFeature feature) {
-		if(feature!=null){
-			IFeatureModel model = feature.getModel();
-			openFeatureEditor(model);
-		} else {
-			Display.getCurrent().beep();
-		}
-	}
-
-	public static void openFeatureEditor(IFeatureModel model) {
-		if (model != null) {
-			IResource resource = model.getUnderlyingResource();
-			try {
-				IEditorInput input = null;
-				if (resource != null)
-					input = new FileEditorInput((IFile) resource);
-				else
-					input = new SystemFileEditorInput(new File(model
-							.getInstallLocation(), "feature.xml")); //$NON-NLS-1$
-				IDE.openEditor(PDEPlugin.getActivePage(), input,
-						PDEPlugin.FEATURE_EDITOR_ID, true);
-			} catch (PartInitException e) {
-			}
-		} else {
-			Display.getCurrent().beep();
-		}
-
-	}
-
-	public FeatureEditor() {
-	}
-
-	protected void createResourceContexts(InputContextManager manager,
-			IFileEditorInput input) {
-		IFile file = input.getFile();
-		IProject project = file.getProject();
-		IFile buildFile = null;
-		IFile featureFile = null;
-
-		String name = file.getName().toLowerCase(Locale.ENGLISH);
-		if (name.equals("feature.xml")) { //$NON-NLS-1$
-			featureFile = file;
-			buildFile = project.getFile("build.properties"); //$NON-NLS-1$
-		} else if (name.equals("build.properties")) { //$NON-NLS-1$
-			buildFile = file;
-			featureFile = createFeatureFile(project);
-		}
-		if (featureFile.exists()) {
-			FileEditorInput in = new FileEditorInput(featureFile);
-			manager.putContext(in, new FeatureInputContext(this, in,
-					file == featureFile));
-		}
-		if (buildFile.exists()) {
-			FileEditorInput in = new FileEditorInput(buildFile);
-			manager.putContext(in, new BuildInputContext(this, in,
-					file == buildFile));
-		}
-		manager.monitorFile(featureFile);
-		manager.monitorFile(buildFile);
-	}
-
-	protected InputContextManager createInputContextManager() {
-		FeatureInputContextManager manager = new FeatureInputContextManager(
-				this);
-		manager.setUndoManager(new FeatureUndoManager(this));
-		return manager;
-	}
-
-	public void monitoredFileAdded(IFile file) {
-		String name = file.getName();
-		if (name.equalsIgnoreCase("feature.xml")) { //$NON-NLS-1$
-			/*
-			 * IEditorInput in = new FileEditorInput(file);
-			 * inputContextManager.putContext(in, new FeatureInputContext(this,
-			 * in, false));
-			 */
-		} else if (name.equalsIgnoreCase("build.properties")) { //$NON-NLS-1$
-			if (!inputContextManager.hasContext(BuildInputContext.CONTEXT_ID)) {
-				IEditorInput in = new FileEditorInput(file);
-				inputContextManager.putContext(in, new BuildInputContext(this,
-						in, false));
-			}
-		}
-	}
-
-	public boolean monitoredFileRemoved(IFile file) {
-		// TODO may need to check with the user if there
-		// are unsaved changes in the model for the
-		// file that just got removed under us.
-		return true;
-	}
-
-	public void contextAdded(InputContext context) {
-		addSourcePage(context.getId());
-	}
-
-	public void contextRemoved(InputContext context) {
-		if (context.isPrimary()) {
-			close(true);
-			return;
-		}
-		IFormPage page = findPage(context.getId());
-		if (page != null)
-			removePage(context.getId());
-	}
-
-	protected void createSystemFileContexts(InputContextManager manager,
-			SystemFileEditorInput input) {
-		File file = (File) input.getAdapter(File.class);
-		File buildFile = null;
-		File featureFile = null;
-		String name = file.getName().toLowerCase(Locale.ENGLISH);
-		if (name.equals("feature.xml")) { //$NON-NLS-1$
-			featureFile = file;
-			File dir = file.getParentFile();
-			buildFile = new File(dir, "build.properties"); //$NON-NLS-1$
-		} else if (name.equals("build.properties")) { //$NON-NLS-1$
-			buildFile = file;
-			File dir = file.getParentFile();
-			featureFile = createFeatureFile(dir);
-		}
-		if (featureFile.exists()) {
-			SystemFileEditorInput in = new SystemFileEditorInput(featureFile);
-			manager.putContext(in, new FeatureInputContext(this, in,
-					file == featureFile));
-		}
-		if (buildFile.exists()) {
-			SystemFileEditorInput in = new SystemFileEditorInput(buildFile);
-			manager.putContext(in, new BuildInputContext(this, in,
-					file == buildFile));
-		}
-	}
-
-	private File createFeatureFile(File dir) {
-		File pluginFile = new File(dir, "plugin.xml"); //$NON-NLS-1$
-		return pluginFile;
-	}
-
-	private IFile createFeatureFile(IProject project) {
-		IFile featureFile = project.getFile("feature.xml"); //$NON-NLS-1$
-		return featureFile;
-	}
-
-	protected void createStorageContexts(InputContextManager manager,
-			IStorageEditorInput input) {
-		String name = input.getName().toLowerCase(Locale.ENGLISH);
-		if (name.equals("build.properties")) { //$NON-NLS-1$
-			manager.putContext(input, new BuildInputContext(this, input, true));
-		} else if (name.startsWith("feature.xml")) { //$NON-NLS-1$
-			manager.putContext(input,
-					new FeatureInputContext(this, input, true));
-		}
-	}
-
-	public boolean canCopy(ISelection selection) {
-		return true;
-	}
-
-	protected void addPages() {
-		try {
-			addPage(new FeatureFormPage(this, PDEUIMessages.FeatureEditor_FeaturePage_title));
-			addPage(new InfoFormPage(this, PDEUIMessages.FeatureEditor_InfoPage_title));
-			addPage(new FeatureReferencePage(this, PDEUIMessages.FeatureEditor_ReferencePage_title));
-			addPage(new FeatureIncludesPage(this, PDEUIMessages.FeatureEditor_IncludesPage_title));
-			addPage(new FeatureDependenciesPage(this, PDEUIMessages.FeatureEditor_DependenciesPage_title));
-			addPage(new FeatureAdvancedPage(this, PDEUIMessages.FeatureEditor_AdvancedPage_title));
-			if (inputContextManager.hasContext(BuildInputContext.CONTEXT_ID))
-				addPage(new BuildPage(this));
-		} catch (PartInitException e) {
-			PDEPlugin.logException(e);
-		}
-		addSourcePage(FeatureInputContext.CONTEXT_ID);
-		addSourcePage(BuildInputContext.CONTEXT_ID);
-	}
-
-	protected String computeInitialPageId() {
-		String firstPageId = super.computeInitialPageId();
-		if (firstPageId == null) {
-			InputContext primary = inputContextManager.getPrimaryContext();
-			if (primary != null && FeatureInputContext.CONTEXT_ID.equals(primary.getId()))
-				firstPageId = FeatureFormPage.PAGE_ID;
-			if (firstPageId == null)
-				firstPageId = FeatureFormPage.PAGE_ID;
-		}
-		return firstPageId;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.neweditor.MultiSourceEditor#createXMLSourcePage(org.eclipse.pde.internal.ui.neweditor.PDEFormEditor,
-	 *      java.lang.String, java.lang.String)
-	 */
-	protected PDESourcePage createSourcePage(PDEFormEditor editor,
-			String title, String name, String contextId) {
-		if (contextId.equals(FeatureInputContext.CONTEXT_ID))
-			return new FeatureSourcePage(editor, title, name);
-		if (contextId.equals(BuildInputContext.CONTEXT_ID))
-			return new BuildSourcePage(editor, title, name);
-		return super.createSourcePage(editor, title, name, contextId);
-	}
-
-	protected ISortableContentOutlinePage createContentOutline() {
-		return new FeatureOutlinePage(this);
-	}
-
-	protected IPropertySheetPage getPropertySheet(PDEFormPage page) {
-		return null;
-	}
-
-	public String getTitle() {
-		if (!isModelCorrect(getAggregateModel()))
-			return super.getTitle();
-		IFeatureModel model = (IFeatureModel) getAggregateModel();
-		String name = getTitleText(model.getFeature());
-		if (name == null)
-			return super.getTitle();
-		return model.getResourceString(name);
-	}
-
-	public String getTitleProperty() {
-		IPreferenceStore store = PDEPlugin.getDefault().getPreferenceStore();
-		String pref = store.getString(IPreferenceConstants.PROP_SHOW_OBJECTS);
-		if (pref != null && pref.equals(IPreferenceConstants.VALUE_USE_NAMES))
-			return IFeatureObject.P_LABEL;
-		return IIdentifiable.P_ID;
-	}
-
-	private String getTitleText(IFeature feature) {
-		IPreferenceStore store = PDEPlugin.getDefault().getPreferenceStore();
-		String pref = store.getString(IPreferenceConstants.PROP_SHOW_OBJECTS);
-		if (pref != null && pref.equals(IPreferenceConstants.VALUE_USE_NAMES))
-			return feature.getLabel();
-		return feature.getId();
-	}
-
-	protected boolean isModelCorrect(Object model) {
-		return model != null ? ((IFeatureModel) model).isValid() : false;
-	}
-
-	protected boolean hasKnownTypes() {
-		try {
-			TransferData[] types = getClipboard().getAvailableTypes();
-			Transfer[] transfers = new Transfer[] { TextTransfer.getInstance(),
-					RTFTransfer.getInstance() };
-			for (int i = 0; i < types.length; i++) {
-				for (int j = 0; j < transfers.length; j++) {
-					if (transfers[j].isSupportedType(types[i]))
-						return true;
-				}
-			}
-		} catch (SWTError e) {
-		}
-		return false;
-	}
-
-	public Object getAdapter(Class key) {
-		// No property sheet needed - block super
-		if (key.equals(IPropertySheetPage.class)) {
-			return null;
-		}
-		return super.getAdapter(key);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#getInputContext(java.lang.Object)
-	 */
-	protected InputContext getInputContext(Object object) {
-		InputContext context = null;
-		if (object instanceof IBuildObject) {
-			context = inputContextManager
-					.findContext(BuildInputContext.CONTEXT_ID);
-		} else if (object instanceof IFeatureObject) {
-			context = inputContextManager
-					.findContext(FeatureInputContext.CONTEXT_ID);
-		}
-		return context;
-	}
-
-	protected boolean isPatchEditor() {
-		IBaseModel model = getAggregateModel();
-		if(model==null || !(model instanceof IFeatureModel)){
-			return false;
-		}
-		IFeature feature = ((IFeatureModel)model).getFeature();
-		IFeatureImport[] imports = feature.getImports();
-		for (int i = 0; i < imports.length; i++) {
-			if (imports[i].isPatch()) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public void showEditorInput(IEditorInput editorInput) {
-    	String name = editorInput.getName();
-    	if (name.equals("feature.xml")) { //$NON-NLS-1$
-    		setActivePage(0);
-    	} else {
-    		setActivePage(getPageCount() - 3);
-    	}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureEditorContributor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureEditorContributor.java
deleted file mode 100644
index d1da27c..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureEditorContributor.java
+++ /dev/null

@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditorContributor;
-import org.eclipse.pde.internal.ui.wizards.site.OpenProjectWizardAction;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.ui.IEditorPart;
-
-public class FeatureEditorContributor extends PDEFormEditorContributor {
-	private EditorBuildFeatureAction fBuildAction;
-
-	private SynchronizeVersionsAction fSynchronizeAction;
-
-	private OpenProjectWizardAction fNewSiteAction;
-
-	public FeatureEditorContributor() {
-		super("&Feature"); //$NON-NLS-1$
-	}
-
-	public void contextMenuAboutToShow(IMenuManager mng) {
-		super.contextMenuAboutToShow(mng);
-		mng.add(new Separator());
-		mng.add(fSynchronizeAction);
-		// mng.add(fNewSiteAction);
-		mng.add(fBuildAction);
-	}
-
-	public Action getBuildAction() {
-		return fBuildAction;
-	}
-
-	public Action getSynchronizeAction() {
-		return fSynchronizeAction;
-	}
-
-	public Action getNewSiteAction() {
-		return fNewSiteAction;
-	}
-
-	protected void makeActions() {
-		super.makeActions();
-		fBuildAction = new EditorBuildFeatureAction();
-		fSynchronizeAction = new SynchronizeVersionsAction();
-		fNewSiteAction = new OpenProjectWizardAction();
-	}
-
-	public void setActiveEditor(IEditorPart targetEditor) {
-		super.setActiveEditor(targetEditor);
-		if (targetEditor instanceof FeatureEditor) {
-			fBuildAction.setActiveEditor((FeatureEditor) targetEditor);
-			fSynchronizeAction.setActiveEditor((FeatureEditor) targetEditor);
-		}
-	}
-
-	protected boolean hasKnownTypes(Clipboard clipboard) {
-		return true;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureEditorMatchingStrategy.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureEditorMatchingStrategy.java
deleted file mode 100644
index da8bc6a..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureEditorMatchingStrategy.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorMatchingStrategy;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.ide.ResourceUtil;
-
-
-public class FeatureEditorMatchingStrategy implements IEditorMatchingStrategy {
-
-    public boolean matches(IEditorReference editorRef, IEditorInput input) {
-    	if (!(input instanceof IFileEditorInput))
-    		return false;
-        IFile inputFile = ResourceUtil.getFile(input);
-        if (inputFile != null) {
-            String path = inputFile.getProjectRelativePath().toString();
-            if (path.equals("feature.xml") || path.equals("build.properties")) { //$NON-NLS-1$ //$NON-NLS-2$ 
-                try {
-                    IFile editorFile = ResourceUtil.getFile(editorRef.getEditorInput());
-                    return editorFile != null && inputFile.getProject().equals(editorFile.getProject());
-                } catch (PartInitException e) {
-                    return false;
-                }
-            }
-        }
-        return false;
-    }
-
-
-}
-

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureFormPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureFormPage.java
deleted file mode 100644
index ec29d92..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureFormPage.java
+++ /dev/null

@@ -1,277 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.pde.internal.core.ifeature.IFeature;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDELabelProvider;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.PDESection;
-import org.eclipse.pde.internal.ui.editor.build.BuildPage;
-import org.eclipse.pde.internal.ui.util.SharedLabelProvider;
-import org.eclipse.swt.SWTException;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.FormText;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
-
-/**
- * Feature page.
- */
-public class FeatureFormPage extends PDEFormPage implements IHyperlinkListener {
-	public static final String PAGE_ID = "feature"; //$NON-NLS-1$
-
-	private FeatureSpecSection fSpecSection;
-
-	private PortabilitySection fPortabilitySection;
-
-	public FeatureFormPage(PDEFormEditor editor, String title) {
-		super(editor, PAGE_ID, title);
-	}
-
-	protected void createFormContent(IManagedForm managedForm) {
-		super.createFormContent(managedForm);
-		ScrolledForm form = managedForm.getForm();
-		FormToolkit toolkit = managedForm.getToolkit();
-		TableWrapLayout layout = new TableWrapLayout();
-		form.getBody().setLayout(layout);
-		layout.numColumns = 2;
-		layout.makeColumnsEqualWidth = true;
-		layout.leftMargin = 10;
-		layout.rightMargin = 10;
-		layout.topMargin = 5;
-		layout.bottomMargin = 5;
-		layout.horizontalSpacing = 15;
-		layout.verticalSpacing = 15;
-		TableWrapData twd;
-
-		Composite left = toolkit.createComposite(form.getBody());
-		TableWrapLayout tableLayout = new TableWrapLayout();
-		tableLayout.bottomMargin = 0;
-		tableLayout.topMargin = 0;
-		tableLayout.leftMargin = 0;
-		tableLayout.rightMargin = 0;
-		tableLayout.verticalSpacing = 15;
-		tableLayout.horizontalSpacing = 15;
-		left.setLayout(tableLayout);
-
-		twd = new TableWrapData(TableWrapData.FILL_GRAB);
-		left.setLayoutData(twd);
-
-		Composite right = toolkit.createComposite(form.getBody());
-		tableLayout = new TableWrapLayout();
-		tableLayout.bottomMargin = 0;
-		tableLayout.topMargin = 0;
-		tableLayout.leftMargin = 0;
-		tableLayout.rightMargin = 0;
-		tableLayout.verticalSpacing = 15;
-		tableLayout.horizontalSpacing = 15;
-		right.setLayout(tableLayout);
-
-		twd = new TableWrapData(TableWrapData.FILL_GRAB);
-		right.setLayoutData(twd);
-
-		fSpecSection = new FeatureSpecSection(this, left);
-		twd = new TableWrapData();
-		twd.grabHorizontal = true;
-		fSpecSection.getSection().setLayoutData(twd);
-
-		fPortabilitySection = new PortabilitySection(this, left);
-		twd = new TableWrapData();
-		twd.grabHorizontal = true;
-		fPortabilitySection.getSection().setLayoutData(twd);
-
-		createContentSection(managedForm, right, toolkit);
-		createPackagingSection(managedForm, right, toolkit);
-		createPublishingSection(managedForm, right, toolkit);
-
-		managedForm.addPart(fSpecSection);
-		managedForm.addPart(fPortabilitySection);
-
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(),IHelpContextIds.MANIFEST_FEATURE_OVERVIEW);
-		initialize();
-	}
-
-	public void initialize() {
-		IFeatureModel model = (IFeatureModel) getModel();
-		IFeature feature = model.getFeature();
-		getManagedForm().getForm().setText(
-				model.getResourceString(feature.getLabel()));
-	}
-
-	private Section createContentSection(IManagedForm managedForm,
-			Composite parent, FormToolkit toolkit) {
-		Section section = createStaticSection(parent, toolkit);
-		FormText text;
-		section
-				.setText(PDEUIMessages.FeatureEditor_InfoPage_ContentSection_title); 
-		text = createClient(section, PDEUIMessages.FeatureEditor_InfoPage_ContentSection_text, toolkit);
-		PDELabelProvider lp = PDEPlugin.getDefault().getLabelProvider();
-		text.setImage("page", lp.get(PDEPluginImages.DESC_PAGE_OBJ, //$NON-NLS-1$
-				SharedLabelProvider.F_EDIT));
-		return section;
-	}
-
-	private Section createPackagingSection(IManagedForm managedForm,
-			Composite parent, FormToolkit toolkit) {
-		Section section = createStaticSection(parent, toolkit);
-		section
-				.setText(PDEUIMessages.FeatureEditor_InfoPage_PackagingSection_title); 
-		// ImageHyperlink info = new ImageHyperlink(section, SWT.NULL);
-		// toolkit.adapt(info, true, true);
-		// Image image =
-		// PDEPlugin.getDefault().getLabelProvider().get(PDEPluginImages.DESC_HELP);
-		// info.setImage(image);
-		// info.addHyperlinkListener(new HyperlinkAdapter() {
-		// public void linkActivated(HyperlinkEvent e) {
-		// WorkbenchHelp
-		// .displayHelpResource(PDEPlugin.getResourceString("OverviewPage.help.deploy"));
-		// //$NON-NLS-1$
-		// }
-		// });
-		// info.setBackground(section.getTitleBarGradientBackground());
-		// section.setTextClient(info);
-		createClient(section, PDEUIMessages.FeatureEditor_InfoPage_PackagingSection_text, toolkit);
-		return section;
-	}
-
-	private Section createPublishingSection(IManagedForm managedForm,
-			Composite parent, FormToolkit toolkit) {
-		Section section = createStaticSection(parent, toolkit);
-		section
-				.setText(PDEUIMessages.FeatureEditor_InfoPage_PublishingSection_title); 
-		// ImageHyperlink info = new ImageHyperlink(section, SWT.NULL);
-		// toolkit.adapt(info, true, true);
-		// Image image =
-		// PDEPlugin.getDefault().getLabelProvider().get(PDEPluginImages.DESC_HELP);
-		// info.setImage(image);
-		// info.addHyperlinkListener(new HyperlinkAdapter() {
-		// public void linkActivated(HyperlinkEvent e) {
-		// WorkbenchHelp
-		// .displayHelpResource(PDEPlugin.getResourceString("OverviewPage.help.deploy"));
-		// //$NON-NLS-1$
-		// }
-		// });
-		// info.setBackground(section.getTitleBarGradientBackground());
-		// section.setTextClient(info);
-		createClient(section, PDEUIMessages.FeatureEditor_InfoPage_PublishingSection_text, toolkit);
-		return section;
-	}
-
-	private FormText createClient(Section section, String content,
-			FormToolkit toolkit) {
-		FormText text = toolkit.createFormText(section, true);
-		try {
-			text.setText(content, true, false);
-		} catch (SWTException e) {
-			text.setText(e.getMessage(), false, false);
-		}
-		section.setClient(text);
-		section.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
-		text.addHyperlinkListener(this);
-		return text;
-	}
-
-	private Section createStaticSection(Composite parent, FormToolkit toolkit) {
-		Section section = toolkit.createSection(parent,
-				ExpandableComposite.TITLE_BAR);
-		section.clientVerticalSpacing = PDESection.CLIENT_VSPACING;
-		// toolkit.createCompositeSeparator(section);
-		return section;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.forms.events.HyperlinkListener#linkActivated(org.eclipse.ui.forms.events.HyperlinkEvent)
-	 */
-	public void linkActivated(HyperlinkEvent e) {
-		String href = (String) e.getHref();
-		// try page references
-		if (href.equals("info")) //$NON-NLS-1$
-			getEditor().setActivePage(InfoFormPage.PAGE_ID);
-		if (href.equals("plugins")) //$NON-NLS-1$
-			getEditor().setActivePage(FeatureReferencePage.PAGE_ID);
-		else if (href.equals("features")) //$NON-NLS-1$
-			getEditor().setActivePage(FeatureIncludesPage.PAGE_ID);
-		else if (href.equals("dependencies")) //$NON-NLS-1$
-			getEditor().setActivePage(FeatureDependenciesPage.PAGE_ID);
-		else if (href.equals("installHandler")) //$NON-NLS-1$
-			getEditor().setActivePage(FeatureAdvancedPage.PAGE_ID);
-		else if (href.equals("build")) //$NON-NLS-1$
-			getEditor().setActivePage(BuildPage.PAGE_ID);
-		else if (href.equals("synchronize")) { //$NON-NLS-1$ {
-			getEditor().setActivePage(FeatureReferencePage.PAGE_ID);
-			final FeatureEditorContributor contributor = (FeatureEditorContributor) getPDEEditor()
-					.getContributor();
-			BusyIndicator.showWhile(e.display, new Runnable() {
-				public void run() {
-					contributor.getSynchronizeAction().run();
-				}
-			});
-		} else if (href.equals("export")) { //$NON-NLS-1$
-			getEditor().doSave(null);
-			final FeatureEditorContributor contributor = (FeatureEditorContributor) getPDEEditor()
-					.getContributor();
-			BusyIndicator.showWhile(e.display, new Runnable() {
-				public void run() {
-					contributor.getBuildAction().run();
-				}
-			});
-		} else if (href.equals("siteProject")) { //$NON-NLS-1$
-			getEditor().doSave(null);
-			final FeatureEditorContributor contributor = (FeatureEditorContributor) getPDEEditor()
-					.getContributor();
-			BusyIndicator.showWhile(e.display, new Runnable() {
-				public void run() {
-					contributor.getNewSiteAction().run();
-				}
-			});
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.forms.events.HyperlinkListener#linkEntered(org.eclipse.ui.forms.events.HyperlinkEvent)
-	 */
-	public void linkEntered(HyperlinkEvent e) {
-		IStatusLineManager mng = getEditor().getEditorSite().getActionBars()
-				.getStatusLineManager();
-		mng.setMessage(e.getLabel());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.forms.events.HyperlinkListener#linkExited(org.eclipse.ui.forms.events.HyperlinkEvent)
-	 */
-	public void linkExited(HyperlinkEvent e) {
-		IStatusLineManager mng = getEditor().getEditorSite().getActionBars()
-				.getStatusLineManager();
-		mng.setMessage(null);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureIncludesPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureIncludesPage.java
deleted file mode 100644
index 2f3ca88..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureIncludesPage.java
+++ /dev/null

@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-
-/**
- * 
- */
-public class FeatureIncludesPage extends PDEFormPage {
-	public static final String PAGE_ID = "includes"; //$NON-NLS-1$
-
-	private IncludedFeaturesSection fIncludedSection;
-
-	private IncludedFeaturesDetailsSection fIncludedDetailsSection;
-
-	private IncludedFeaturesPortabilitySection fIncludedPortabilitySection;
-
-	/**
-	 * 
-	 * @param editor
-	 * @param title
-	 */
-	public FeatureIncludesPage(PDEFormEditor editor, String title) {
-		super(editor, PAGE_ID, title);
-	}
-
-	protected void createFormContent(IManagedForm managedForm) {
-		super.createFormContent(managedForm);
-		ScrolledForm form = managedForm.getForm();
-		FormToolkit toolkit = managedForm.getToolkit();
-		GridLayout layout = new GridLayout();
-		form.getBody().setLayout(layout);
-		layout.numColumns = 2;
-		layout.makeColumnsEqualWidth = true;
-		layout.marginWidth = 10;
-		layout.horizontalSpacing = 15;
-		layout.verticalSpacing = 15;
-		GridData gd;
-
-		Composite left = toolkit.createComposite(form.getBody());
-		layout = new GridLayout();
-		layout.marginWidth = layout.marginHeight = 0;
-		left.setLayout(layout);
-		gd = new GridData(GridData.FILL_BOTH);
-		left.setLayoutData(gd);
-
-		Composite right = toolkit.createComposite(form.getBody());
-		layout = new GridLayout();
-		layout.marginWidth = layout.marginHeight = 0;
-		right.setLayout(layout);
-		gd = new GridData(GridData.FILL_BOTH);
-		right.setLayoutData(gd);
-
-		fIncludedSection = new IncludedFeaturesSection(this, left);
-		gd = new GridData(GridData.FILL_BOTH);
-		fIncludedSection.getSection().setLayoutData(gd);
-
-		fIncludedDetailsSection = new IncludedFeaturesDetailsSection(this,
-				right);
-		gd = new GridData(GridData.FILL_HORIZONTAL
-				| GridData.VERTICAL_ALIGN_BEGINNING);
-		fIncludedDetailsSection.getSection().setLayoutData(gd);
-
-		fIncludedPortabilitySection = new IncludedFeaturesPortabilitySection(
-				this, right);
-		gd = new GridData(GridData.FILL_HORIZONTAL
-				| GridData.VERTICAL_ALIGN_BEGINNING);
-		fIncludedPortabilitySection.getSection().setLayoutData(gd);
-
-		managedForm.addPart(fIncludedSection);
-		managedForm.addPart(fIncludedDetailsSection);
-		managedForm.addPart(fIncludedPortabilitySection);
-		form.setText(PDEUIMessages.FeatureEditor_IncludesPage_heading); 
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.MANIFEST_FEATURE_ADVANCED);
-		// WorkbenchHelp.setHelp(form.getBody(),
-		// IHelpContextIds.MANIFEST_FEATURE_CONTENT);
-		fIncludedSection.fireSelection();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureInputContext.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureInputContext.java
deleted file mode 100644
index 6fcc8b0..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureInputContext.java
+++ /dev/null

@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import java.io.*;
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.internal.core.feature.*;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.editor.context.*;
-import org.eclipse.ui.*;
-
-/**
- * 
- */
-public class FeatureInputContext extends XMLInputContext {
-	public static final String CONTEXT_ID="feature-context"; //$NON-NLS-1$
-	/**
-	 * @param editor
-	 * @param input
-	 * @param primary
-	 */
-	public FeatureInputContext(PDEFormEditor editor, IEditorInput input,
-			boolean primary) {
-		super(editor, input, primary);
-		create();
-	}	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.context.InputContext#getId()
-	 */
-	public String getId() {
-		return CONTEXT_ID;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.context.InputContext#createModel(org.eclipse.ui.IEditorInput)
-	 */
-	protected IBaseModel createModel(IEditorInput input) throws CoreException {
-		if (input instanceof IFileEditorInput)
-			return createResourceModel((IFileEditorInput) input);
-		if (input instanceof IStorageEditorInput)
-			return createStorageModel((IStorageEditorInput)input);
-		return null;		
-	}
-	
-	private IBaseModel createResourceModel(IFileEditorInput input)
-				throws CoreException {
-		IFile file = input.getFile();
-		WorkspaceFeatureModel model = new WorkspaceFeatureModel(file);
-		model.load();
-		return model;
-	}
-	
-	private IBaseModel createStorageModel(IStorageEditorInput input) throws CoreException {
-		InputStream stream = null;
-		IStorage storage = input.getStorage();
-		try {
-			stream = storage.getContents();
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-			return null;
-		}
-		ExternalFeatureModel model = new ExternalFeatureModel();
-		model.setInstallLocation(""); //$NON-NLS-1$
-		try {
-			model.load(stream, false);
-		} catch (CoreException e) {
-			// Errors in the file
-			return null;
-		}
-		finally {
-			try {
-				stream.close();
-			}
-			catch (IOException e) {
-			}
-		}
-		return model;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.context.InputContext#addTextEditOperation(java.util.ArrayList, org.eclipse.pde.core.IModelChangedEvent)
-	 */
-	protected void addTextEditOperation(ArrayList ops, IModelChangedEvent event) {
-	}
-	
-	protected void flushModel(IDocument doc) {
-		// if model is dirty, flush its content into
-		// the document so that the source editor will
-		// pick up the changes.
-		if (!(getModel() instanceof IEditable))
-			return;
-		IEditable editableModel = (IEditable) getModel();
-		if (editableModel.isDirty() == false)
-			return;
-		try {
-			StringWriter swriter = new StringWriter();
-			PrintWriter writer = new PrintWriter(swriter);
-			editableModel.save(writer);
-			writer.flush();
-			swriter.close();
-			doc.set(swriter.toString());
-		} catch (IOException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-	
-	protected boolean synchronizeModel(IDocument doc) {
-		IFeatureModel model = (IFeatureModel) getModel();
-
-		boolean cleanModel = true;
-		String text = doc.get();
-		try {
-			InputStream stream =
-				new ByteArrayInputStream(text.getBytes("UTF8")); //$NON-NLS-1$
-			try {
-				model.reload(stream, false);
-			} catch (CoreException e) {
-				cleanModel = false;
-			}
-			try {
-				stream.close();
-			} catch (IOException e) {
-			}
-		} catch (UnsupportedEncodingException e) {
-			PDEPlugin.logException(e);
-		}
-		return cleanModel;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.context.XMLInputContext#reorderInsertEdits(java.util.ArrayList)
-	 */
-	protected void reorderInsertEdits(ArrayList ops) {
-	}
-	protected String getPartitionName() {
-		return "___feature_partition"; //$NON-NLS-1$
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureInputContextManager.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureInputContextManager.java
deleted file mode 100644
index 29df518..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureInputContextManager.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 1, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import org.eclipse.pde.core.IBaseModel;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.pde.internal.ui.editor.context.*;
-
-public class FeatureInputContextManager extends InputContextManager {
-	/**
-	 * 
-	 */
-	public FeatureInputContextManager(PDEFormEditor editor) {
-		super(editor);
-	}
-
-	public IBaseModel getAggregateModel() {
-		return findFeatureModel();
-	}
-
-	private IBaseModel findFeatureModel() {
-		InputContext fcontext = findContext(FeatureInputContext.CONTEXT_ID);
-		return (fcontext != null) ? fcontext.getModel() : null;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureOutlinePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureOutlinePage.java
deleted file mode 100644
index dd5dc49..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureOutlinePage.java
+++ /dev/null

@@ -1,223 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import java.util.Vector;
-
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.core.build.IBuildEntry;
-import org.eclipse.pde.core.build.IBuildModel;
-import org.eclipse.pde.internal.core.ifeature.IFeature;
-import org.eclipse.pde.internal.core.ifeature.IFeatureChild;
-import org.eclipse.pde.internal.core.ifeature.IFeatureData;
-import org.eclipse.pde.internal.core.ifeature.IFeatureImport;
-import org.eclipse.pde.internal.core.ifeature.IFeatureInfo;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.core.ifeature.IFeaturePlugin;
-import org.eclipse.pde.internal.core.ifeature.IFeatureURL;
-import org.eclipse.pde.internal.core.ifeature.IFeatureURLElement;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.FormOutlinePage;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.build.BuildInputContext;
-import org.eclipse.pde.internal.ui.editor.build.BuildPage;
-import org.eclipse.pde.internal.ui.editor.context.InputContext;
-import org.eclipse.pde.internal.ui.elements.NamedElement;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.forms.editor.IFormPage;
-
-public class FeatureOutlinePage extends FormOutlinePage {
-	class ContentProvider extends BasicContentProvider {
-		public Object[] getChildren(Object parent) {
-			IFeatureModel model = (IFeatureModel) editor.getAggregateModel();
-			if (model.isValid()) {
-				if (parent instanceof FeatureFormPage) {
-					return new Object[0];
-				}
-				if (parent instanceof InfoFormPage) {
-					return getInfos();
-				}
-				if (parent.equals(fDiscoveryUrls)) {
-					return getURLs();
-				}
-				if (parent instanceof FeatureReferencePage) {
-					return getReferences();
-				}
-				if (parent instanceof FeatureIncludesPage) {
-					return getIncludes();
-				}
-				if (parent instanceof FeatureDependenciesPage) {
-					return getImports();
-				}
-				if (parent instanceof FeatureAdvancedPage) {
-					return getData();
-				}
-			}
-			if (parent instanceof PDEFormPage) {
-				PDEFormPage page = (PDEFormPage) parent;
-				IBuildModel buildModel = getBuildModel();
-				if (buildModel != null && buildModel.isValid()) {
-					if (page.getId().equals(BuildPage.PAGE_ID))
-						return buildModel.getBuild().getBuildEntries();
-				}
-			}
-
-			return super.getChildren(parent);
-		}
-
-		public Object getParent(Object child) {
-			String pageId = getParentPageId(child);
-			if (pageId != null)
-				return editor.findPage(pageId);
-			return super.getParent(child);
-		}
-	}
-
-	private NamedElement fDiscoveryUrls;
-
-	public FeatureOutlinePage(PDEFormEditor editor) {
-		super(editor);
-		Image folderImage = PDEPlugin.getDefault().getLabelProvider().get(
-				PDEPluginImages.DESC_DOC_SECTION_OBJ);
-		fDiscoveryUrls = new NamedElement(PDEUIMessages.FeatureOutlinePage_discoverUrls, 
-				folderImage);
-	}
-
-	protected ITreeContentProvider createContentProvider() {
-		return new ContentProvider();
-	}
-
-	public String getParentPageId(Object item) {
-		if (item instanceof IFeaturePlugin)
-			return FeatureReferencePage.PAGE_ID;
-		if (item instanceof IFeatureChild)
-			return FeatureIncludesPage.PAGE_ID;
-		if (item instanceof IFeatureImport)
-			return FeatureDependenciesPage.PAGE_ID;
-		if (item instanceof IFeatureInfo || item.equals(fDiscoveryUrls)
-				|| item instanceof IFeatureURLElement)
-			return InfoFormPage.PAGE_ID;
-		if (item instanceof IFeatureData)
-			return FeatureAdvancedPage.PAGE_ID;
-		else if (item instanceof IBuildEntry)
-			return BuildPage.PAGE_ID;
-		return super.getParentPageId(item);
-	}
-
-	private Object[] getInfos() {
-		IFeatureModel model = (IFeatureModel) editor.getAggregateModel();
-		IFeature feature = model.getFeature();
-		Vector result = new Vector();
-		for (int i = 0; i < 3; i++) {
-			IFeatureInfo info = feature.getFeatureInfo(i);
-			if (info != null)
-				result.add(info);
-		}
-		result.add(fDiscoveryUrls);
-		return result.toArray();
-	}
-
-	private Object[] getReferences() {
-		IFeatureModel model = (IFeatureModel) editor.getAggregateModel();
-		IFeature feature = model.getFeature();
-		return feature.getPlugins();
-	}
-
-	private Object[] getImports() {
-		IFeatureModel model = (IFeatureModel) editor.getAggregateModel();
-		IFeature feature = model.getFeature();
-		return feature.getImports();
-	}
-
-	private Object[] getIncludes() {
-		IFeatureModel model = (IFeatureModel) editor.getAggregateModel();
-		IFeature feature = model.getFeature();
-		return feature.getIncludedFeatures();
-	}
-
-	private Object[] getData() {
-		IFeatureModel model = (IFeatureModel) editor.getAggregateModel();
-		IFeature feature = model.getFeature();
-		return feature.getData();
-	}
-
-	private Object[] getURLs() {
-		IFeatureModel model = (IFeatureModel) editor.getAggregateModel();
-		IFeature feature = model.getFeature();
-		IFeatureURL url = feature.getURL();
-		if (url == null)
-			return new Object[0];
-		return url.getDiscoveries();
-	}
-
-	public Object getParent(Object object) {
-		if (object instanceof IFeatureURLElement) {
-			return fDiscoveryUrls;
-		}
-		return editor.findPage(getParentPageId(object));
-	}
-
-	public void modelChanged(IModelChangedEvent event) {
-		if (treeViewer.getControl().isDisposed()) {
-			return;
-		}
-		if (event.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			treeViewer.refresh();
-			return;
-		}
-		Object object = event.getChangedObjects()[0];
-		if (object instanceof IFeature) {
-			if (event.getChangeType() == IModelChangedEvent.CHANGE) {
-				String property = event.getChangedProperty();
-				if (property.equals(IFeature.P_DESCRIPTION)
-						|| property.equals(IFeature.P_COPYRIGHT)
-						|| property.equals(IFeature.P_LICENSE)) {
-					IFormPage page = editor.findPage(InfoFormPage.PAGE_ID);
-					treeViewer.refresh(page);
-					return;
-				}
-			}
-		}
-		if (object instanceof IFeatureImport || object instanceof IFeatureInfo
-				|| object instanceof IFeaturePlugin
-				|| object instanceof IFeatureData
-				|| object instanceof IFeatureURLElement) {
-			if (event.getChangeType() == IModelChangedEvent.CHANGE) {
-				treeViewer.update(object, null);
-			} else {
-				// find the parent
-				Object parent = null;
-				parent = getParent(object);
-				if (parent != null) {
-					if (event.getChangeType() == IModelChangedEvent.INSERT)
-						treeViewer.add(parent, event.getChangedObjects());
-					else
-						treeViewer.remove(event.getChangedObjects());
-				} else {
-					treeViewer.refresh();
-					treeViewer.expandAll();
-				}
-			}
-		}
-	}
-
-	private IBuildModel getBuildModel() {
-		InputContext context = editor.getContextManager().findContext(
-				BuildInputContext.CONTEXT_ID);
-		if (context != null)
-			return (IBuildModel) context.getModel();
-		return null;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureReferencePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureReferencePage.java
deleted file mode 100644
index d00ed5f..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureReferencePage.java
+++ /dev/null

@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-
-/**
- * 
- */
-public class FeatureReferencePage extends PDEFormPage {
-	public static final String PAGE_ID = "reference"; //$NON-NLS-1$
-
-	private PluginSection fPluginSection;
-
-	private PluginDetailsSection fPluginDetailsSection;
-
-	private PluginPortabilitySection fPluginPortabilitySection;
-
-	/**
-	 * 
-	 * @param editor
-	 * @param title
-	 */
-	public FeatureReferencePage(PDEFormEditor editor, String title) {
-		super(editor, PAGE_ID, title);
-	}
-
-	protected void createFormContent(IManagedForm managedForm) {
-		super.createFormContent(managedForm);
-		ScrolledForm form = managedForm.getForm();
-		FormToolkit toolkit = managedForm.getToolkit();
-		GridLayout layout = new GridLayout();
-		form.getBody().setLayout(layout);
-		layout.numColumns = 2;
-		layout.makeColumnsEqualWidth = true;
-		layout.marginWidth = 10;
-		layout.horizontalSpacing = 15;
-		layout.verticalSpacing = 15;
-		GridData gd;
-
-		Composite left = toolkit.createComposite(form.getBody());
-		layout = new GridLayout();
-		layout.marginWidth = layout.marginHeight = 0;
-		left.setLayout(layout);
-		gd = new GridData(GridData.FILL_BOTH);
-		left.setLayoutData(gd);
-
-		Composite right = toolkit.createComposite(form.getBody());
-		layout = new GridLayout();
-		layout.marginWidth = layout.marginHeight = 0;
-		right.setLayout(layout);
-		gd = new GridData(GridData.FILL_BOTH);
-		right.setLayoutData(gd);
-
-		fPluginSection = new PluginSection(this, left);
-		gd = new GridData(GridData.FILL_BOTH);
-		fPluginSection.getSection().setLayoutData(gd);
-
-		fPluginDetailsSection = new PluginDetailsSection(this, right);
-		gd = new GridData(GridData.FILL_HORIZONTAL
-				| GridData.VERTICAL_ALIGN_BEGINNING);
-		fPluginDetailsSection.getSection().setLayoutData(gd);
-
-		fPluginPortabilitySection = new PluginPortabilitySection(this, right);
-		gd = new GridData(GridData.FILL_HORIZONTAL
-				| GridData.VERTICAL_ALIGN_BEGINNING);
-		fPluginPortabilitySection.getSection().setLayoutData(gd);
-
-		managedForm.addPart(fPluginSection);
-		managedForm.addPart(fPluginDetailsSection);
-		managedForm.addPart(fPluginPortabilitySection);
-
-		form.setText(PDEUIMessages.FeatureEditor_ReferencePage_heading);
-		// WorkbenchHelp.setHelp(form.getBody(),
-		// IHelpContextIds.MANIFEST_FEATURE_CONTENT);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.MANIFEST_FEATURE_CONTENT);
-		fPluginSection.fireSelection();
-	}
-
-	public void setFocus() {
-		fPluginSection.setFocus();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureSourcePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureSourcePage.java
deleted file mode 100644
index 8cd6731..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureSourcePage.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.pde.internal.ui.editor.ISortableContentOutlinePage;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.pde.internal.ui.editor.XMLSourcePage;
-
-public class FeatureSourcePage extends XMLSourcePage {
-
-	public FeatureSourcePage(PDEFormEditor editor, String id, String title) {
-		super(editor, id, title);
-	}
-
-	protected ILabelProvider createOutlineLabelProvider() {
-		return null;
-	}
-
-	protected ITreeContentProvider createOutlineContentProvider() {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.editor.PDESourcePage#createOutlineSorter()
-	 */
-	protected ViewerSorter createOutlineSorter() {
-		return null;
-	}
-
-	protected void outlineSelectionChanged(SelectionChangedEvent e) {
-	}
-
-	protected ISortableContentOutlinePage createOutlinePage() {
-		// TODO remove this method when the above three stubs
-		// are implemented
-		return new FeatureOutlinePage((PDEFormEditor) getEditor());
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureSpecSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureSpecSection.java
deleted file mode 100644
index 4d25be9..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureSpecSection.java
+++ /dev/null

@@ -1,586 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.PluginVersionIdentifier;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.core.plugin.IPlugin;
-import org.eclipse.pde.core.plugin.IPluginModel;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.feature.FeatureImport;
-import org.eclipse.pde.internal.core.ifeature.IFeature;
-import org.eclipse.pde.internal.core.ifeature.IFeatureImport;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.core.ifeature.IFeatureURL;
-import org.eclipse.pde.internal.core.ifeature.IFeatureURLElement;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ui.editor.PDESection;
-import org.eclipse.pde.internal.ui.editor.plugin.ManifestEditor;
-import org.eclipse.pde.internal.ui.parts.FormEntry;
-import org.eclipse.pde.internal.ui.util.SWTUtil;
-import org.eclipse.pde.internal.ui.wizards.PluginSelectionDialog;
-import org.eclipse.pde.internal.ui.wizards.plugin.NewPluginProjectWizard;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.RTFTransfer;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-public class FeatureSpecSection extends PDESection {
-	private FormEntry fIdText;
-
-	private FormEntry fTitleText;
-
-	private FormEntry fVersionText;
-
-	private FormEntry fProviderText;
-
-	private FormEntry fPluginText;
-
-	private FormEntry fUpdateSiteNameText;
-
-	private FormEntry fUpdateSiteUrlText;
-
-	private FormEntry fPatchedIdText;
-
-	private FormEntry fPatchedVersionText;
-
-	private boolean fPatch = false;
-
-	public FeatureSpecSection(FeatureFormPage page, Composite parent) {
-		super(page, parent, Section.DESCRIPTION);
-		getSection().setText(PDEUIMessages.FeatureEditor_SpecSection_title);
-		createClient(getSection(), page.getManagedForm().getToolkit());
-	}
-
-	public void commit(boolean onSave) {
-		fTitleText.commit();
-		fProviderText.commit();
-		fIdText.commit();
-		fPluginText.commit();
-		fVersionText.commit();
-		if (fPatchedIdText != null) {
-			fPatchedIdText.commit();
-			fPatchedVersionText.commit();
-		}
-		fUpdateSiteUrlText.commit();
-		fUpdateSiteNameText.commit();
-		super.commit(onSave);
-	}
-
-	private void commitSiteUrl(String value) {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		IFeature feature = model.getFeature();
-
-		IFeatureURL urlElement = feature.getURL();
-		if (urlElement == null) {
-			urlElement = model.getFactory().createURL();
-			try {
-				feature.setURL(urlElement);
-			} catch (CoreException e) {
-				return;
-			}
-		}
-		try {
-			IFeatureURLElement updateElement = urlElement.getUpdate();
-			if (value.length() > 0) {
-				URL siteUrl = new URL(value);
-				if (updateElement == null) {
-					// element needed, create it
-					updateElement = model.getFactory().createURLElement(
-							urlElement, IFeatureURLElement.UPDATE);
-					updateElement.setURL(siteUrl);
-					urlElement.setUpdate(updateElement);
-				} else {
-					updateElement.setURL(siteUrl);
-				}
-			} else {
-				if (updateElement == null) {
-					// do nothing
-				} else {
-					if (updateElement.getLabel() != null
-							&& updateElement.getLabel().length() > 0) {
-						updateElement.setURL(null);
-					} else {
-						// element not needed, remove it
-						urlElement.setUpdate(null);
-					}
-				}
-			}
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		} catch (MalformedURLException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	private void commitSiteName(String value) {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		IFeature feature = model.getFeature();
-
-		IFeatureURL urlElement = feature.getURL();
-		if (urlElement == null) {
-			urlElement = model.getFactory().createURL();
-			try {
-				feature.setURL(urlElement);
-			} catch (CoreException e) {
-				return;
-			}
-		}
-		try {
-			IFeatureURLElement updateElement = urlElement.getUpdate();
-			if (value.length() > 0) {
-				if (updateElement == null) {
-					// element needed, create it
-					updateElement = model.getFactory().createURLElement(
-							urlElement, IFeatureURLElement.UPDATE);
-					updateElement.setLabel(value);
-					// URL not set, so element will be flagged during validation
-					urlElement.setUpdate(updateElement);
-				} else {
-					updateElement.setLabel(value);
-				}
-			} else {
-				if (updateElement == null) {
-					// do nothing
-				} else {
-					if (updateElement.getURL() != null) {
-						updateElement.setLabel(null);
-					} else {
-						// element not needed, remove it
-						urlElement.setUpdate(null);
-					}
-				}
-			}
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	/**
-	 * Obtains or creates a feature import with patch="true"
-	 * 
-	 * @return
-	 */
-	private IFeatureImport getPatchedFeature() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		IFeature feature = model.getFeature();
-		IFeatureImport[] imports = feature.getImports();
-		for (int i = 0; i < imports.length; i++) {
-			if (imports[i].isPatch()) {
-				return imports[i];
-			}
-		}
-		// need to recreate the import element
-		FeatureImport fimport = (FeatureImport) model.getFactory()
-				.createImport();
-		try {
-			fimport.setType(IFeatureImport.FEATURE);
-			fimport.setPatch(true);
-			feature.addImports(new IFeatureImport[] { fimport });
-		} catch (CoreException ce) {
-			PDEPlugin.logException(ce);
-		}
-		return null;
-	}
-
-	private boolean isPatch() {
-		return fPatch;
-	}
-
-	public void createClient(Section section, FormToolkit toolkit) {
-		fPatch = ((FeatureEditor) getPage().getEditor()).isPatchEditor();
-
-		final IFeatureModel model = (IFeatureModel) getPage().getModel();
-		final IFeature feature = model.getFeature();
-
-		if(isPatch()){
-			getSection().setDescription(
-				PDEUIMessages.FeatureEditor_SpecSection_desc_patch);
-		}else{
-			getSection().setDescription(
-					PDEUIMessages.FeatureEditor_SpecSection_desc);
-		}
-
-		Composite container = toolkit.createComposite(section);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		layout.verticalSpacing = 5;
-		layout.horizontalSpacing = 6;
-		container.setLayout(layout);
-
-		fIdText = new FormEntry(container, toolkit, PDEUIMessages.FeatureEditor_SpecSection_id, null, false);
-		fIdText.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry text) {
-				try {
-					feature.setId(text.getValue());
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		});
-
-		fVersionText = new FormEntry(container, toolkit, PDEUIMessages.FeatureEditor_SpecSection_version, null, false);
-		fVersionText.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry text) {
-				if (verifySetVersion(feature, text.getValue()) == false) {
-					warnBadVersionFormat(text.getValue());
-					text.setValue(feature.getVersion());
-				}
-			}
-		});
-
-		fTitleText = new FormEntry(container, toolkit, PDEUIMessages.FeatureEditor_SpecSection_name, null, false);
-		fTitleText.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry text) {
-				try {
-					feature.setLabel(text.getValue());
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-				getPage().getManagedForm().getForm().setText(
-						model.getResourceString(feature.getLabel()));
-				((FeatureEditor) getPage().getEditor()).updateTitle();
-			}
-		});
-		fProviderText = new FormEntry(container, toolkit, PDEUIMessages.FeatureEditor_SpecSection_provider, null, false);
-		fProviderText.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry text) {
-				try {
-					String value = text.getValue();
-					feature
-							.setProviderName((value.length() > 0 ? value : null));
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		});
-
-		fPluginText = new FormEntry(container, toolkit, PDEUIMessages.FeatureEditor_SpecSection_plugin, PDEUIMessages.GeneralInfoSection_browse, 
-				isEditable());
-
-		fPluginText.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry text) {
-				try {
-					String value = text.getValue();
-					feature
-							.setPlugin((value.length() > 0 ? value : null));
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-			public void linkActivated(HyperlinkEvent e) {
-				String plugin = fPluginText.getValue();
-				if (PDECore.getDefault().getModelManager().findPluginModel(
-						plugin) == null) {
-					createFeaturePlugin();
-				}
-				ManifestEditor.openPluginEditor(fPluginText.getValue());
-			}
-			public void browseButtonSelected(FormEntry entry) {
-				handleOpenDialog();
-			}
-			private void createFeaturePlugin() {
-				NewPluginProjectWizard wizard = new NewPluginProjectWizard();
-				WizardDialog dialog = new WizardDialog(PDEPlugin
-						.getActiveWorkbenchShell(), wizard);
-				dialog.create();
-				SWTUtil.setDialogSize(dialog, 400, 500);
-				if (dialog.open() == WizardDialog.OK) {
-					String plugin = wizard.getPluginId();
-					try {
-						feature.setPlugin(plugin);
-						fPluginText.setValue(plugin, false);
-					} catch (CoreException ce) {
-						PDEPlugin.logException(ce);
-					}
-				}
-			}
-		});
-
-		if (isPatch()) {
-			fPatchedIdText = new FormEntry(container, toolkit, PDEUIMessages.FeatureEditor_SpecSection_patchedId, null, false);
-			fPatchedIdText.setFormEntryListener(new FormEntryAdapter(this) {
-				public void textValueChanged(FormEntry text) {
-					try {
-						IFeatureImport patchImport = getPatchedFeature();
-						if (patchImport != null) {
-							patchImport.setId(text.getValue());
-						}
-					} catch (CoreException e) {
-						PDEPlugin.logException(e);
-					}
-				}
-			});
-
-			fPatchedVersionText = new FormEntry(container, toolkit, PDEUIMessages.FeatureEditor_SpecSection_patchedVersion, null, false);
-			fPatchedVersionText
-					.setFormEntryListener(new FormEntryAdapter(this) {
-						public void textValueChanged(FormEntry text) {
-							IFeatureImport patchImport = getPatchedFeature();
-							if (patchImport != null) {
-								if (verifySetVersion(patchImport, text
-										.getValue()) == false) {
-									warnBadVersionFormat(text.getValue());
-									text.setValue(patchImport.getVersion());
-								}
-							}
-						}
-					});
-
-		}
-
-		fUpdateSiteUrlText = new FormEntry(container, toolkit, PDEUIMessages.FeatureEditor_SpecSection_updateUrl, null, false);
-		fUpdateSiteUrlText.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry text) {
-				String url = text.getValue() != null ? text.getValue() : ""; //$NON-NLS-1$
-				if (url.length() > 0 && !verifySiteUrl(feature, url)) {
-					warnBadUrl(url);
-					setUpdateSiteUrlText();
-				} else {
-					commitSiteUrl(url);
-				}
-			}
-		});
-
-		fUpdateSiteNameText = new FormEntry(container, toolkit, PDEUIMessages.FeatureEditor_SpecSection_updateUrlLabel, null, false);
-		fUpdateSiteNameText.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry text) {
-				String name = text.getValue() != null ? text.getValue() : ""; //$NON-NLS-1$
-				commitSiteName(name);
-			}
-		});
-
-		GridData gd = (GridData) fIdText.getText().getLayoutData();
-		gd.widthHint = 150;
-
-		toolkit.paintBordersFor(container);
-		section.setClient(container);
-		initialize();
-	}
-
-	private boolean verifySetVersion(IFeature feature, String value) {
-		try {
-			if (PluginVersionIdentifier.validateVersion(value).isOK())
-				feature.setVersion(value);
-		} catch (Exception e) {
-			return false;
-		}
-		return true;
-	}
-
-	private boolean verifySetVersion(IFeatureImport featureImport, String value) {
-		try {
-			if (PluginVersionIdentifier.validateVersion(value).isOK())
-				featureImport.setVersion(value);
-		} catch (Exception e) {
-			return false;
-		}
-		return true;
-	}
-
-	private boolean verifySiteUrl(IFeature feature, String value) {
-		try {
-			new URL(value);
-		} catch (MalformedURLException e) {
-			return false;
-		}
-		return true;
-	}
-
-	private void warnBadVersionFormat(String text) {
-		MessageDialog.openError(PDEPlugin.getActiveWorkbenchShell(), PDEUIMessages.FeatureEditor_SpecSection_badVersionTitle, PDEUIMessages.FeatureEditor_SpecSection_badVersionMessage);
-	}
-
-	private void warnBadUrl(String text) {
-		MessageDialog.openError(PDEPlugin.getActiveWorkbenchShell(), PDEUIMessages.FeatureEditor_SpecSection_badUrlTitle, PDEUIMessages.FeatureEditor_SpecSection_badUrlMessage);
-	}
-
-	public void dispose() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		if (model != null)
-			model.removeModelChangedListener(this);
-		super.dispose();
-	}
-
-	public void initialize() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		refresh();
-		if (!model.isEditable()) {
-			fIdText.getText().setEditable(false);
-			fTitleText.getText().setEditable(false);
-			fVersionText.getText().setEditable(false);
-			fProviderText.getText().setEditable(false);
-			fPluginText.getText().setEditable(false);
-			if (isPatch()) {
-				fPatchedIdText.getText().setEditable(false);
-				fPatchedVersionText.getText().setEditable(false);
-			}
-			fUpdateSiteUrlText.getText().setEditable(false);
-			fUpdateSiteNameText.getText().setEditable(false);
-		}
-		model.addModelChangedListener(this);
-	}
-
-	public void modelChanged(IModelChangedEvent e) {
-		if (e.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			markStale();
-			return;
-		}
-		if (e.getChangeType() == IModelChangedEvent.CHANGE) {
-			Object objs[] = e.getChangedObjects();
-			if (objs.length > 0 && objs[0] instanceof IFeature) {
-				markStale();
-			}
-		}
-		if (e.getChangeType() == IModelChangedEvent.CHANGE) {
-			Object objs[] = e.getChangedObjects();
-			if (objs.length > 0 && objs[0] instanceof IFeatureURL) {
-				markStale();
-			}
-		}
-		Object objs[] = e.getChangedObjects();
-		if (objs.length > 0 && objs[0] instanceof IFeatureURLElement) {
-			markStale();
-		}
-		if (isPatch() && objs.length > 0 && objs[0] instanceof IFeatureImport) {
-			markStale();
-		}
-	}
-
-	public void setFocus() {
-		if (fIdText != null)
-			fIdText.getText().setFocus();
-	}
-
-	private void setIfDefined(FormEntry formText, String value) {
-		if (value != null) {
-			formText.setValue(value, true);
-		}
-	}
-
-	public void refresh() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		IFeature feature = model.getFeature();
-		setIfDefined(fIdText, feature.getId());
-		setIfDefined(fTitleText, feature.getLabel());
-		getPage().getManagedForm().getForm().setText(
-				model.getResourceString(feature.getLabel()));
-		setIfDefined(fVersionText, feature.getVersion());
-		setIfDefined(fProviderText, feature.getProviderName());
-		setIfDefined(fPluginText, feature.getPlugin());
-		if (isPatch()) {
-			IFeatureImport featureImport = getPatchedFeature();
-			if (featureImport != null) {
-				fPatchedIdText.setValue(
-						featureImport.getId() != null ? featureImport.getId()
-								: "", true); //$NON-NLS-1$
-				fPatchedVersionText.setValue(
-						featureImport.getVersion() != null ? featureImport
-								.getVersion() : "", true); //$NON-NLS-1$
-			} else {
-				fPatchedIdText.setValue("", true); //$NON-NLS-1$
-				fPatchedVersionText.setValue("", true); //$NON-NLS-1$
-			}
-		}
-		setUpdateSiteUrlText();
-		setUpdateSiteNameText();
-		super.refresh();
-	}
-
-	private void setUpdateSiteUrlText() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		IFeature feature = model.getFeature();
-
-		String updateSiteUrl = ""; //$NON-NLS-1$
-		IFeatureURL featureUrl = feature.getURL();
-		if (featureUrl != null) {
-			IFeatureURLElement urlElement = featureUrl.getUpdate();
-			if (urlElement != null) {
-				updateSiteUrl = urlElement.getURL() != null ? urlElement
-						.getURL().toExternalForm() : null;
-			}
-		}
-		fUpdateSiteUrlText.setValue(updateSiteUrl != null ? updateSiteUrl : "", //$NON-NLS-1$
-				true);
-
-	}
-
-	private void setUpdateSiteNameText() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		IFeature feature = model.getFeature();
-
-		String updateSiteLabel = ""; //$NON-NLS-1$
-		IFeatureURL featureUrl = feature.getURL();
-		if (featureUrl != null) {
-			IFeatureURLElement urlElement = featureUrl.getUpdate();
-			if (urlElement != null) {
-				updateSiteLabel = urlElement.getLabel();
-			}
-		}
-		fUpdateSiteNameText.setValue(updateSiteLabel != null ? updateSiteLabel
-				: "", true); //$NON-NLS-1$
-	}
-
-	public void cancelEdit() {
-		fIdText.cancelEdit();
-		fTitleText.cancelEdit();
-		fVersionText.cancelEdit();
-		fProviderText.cancelEdit();
-		fPluginText.cancelEdit();
-		if (isPatch()) {
-			fPatchedIdText.cancelEdit();
-			fPatchedVersionText.cancelEdit();
-		}
-		fUpdateSiteNameText.cancelEdit();
-		fUpdateSiteUrlText.cancelEdit();
-		super.cancelEdit();
-	}
-
-	/**
-	 * @see org.eclipse.update.ui.forms.internal.FormSection#canPaste(Clipboard)
-	 */
-	public boolean canPaste(Clipboard clipboard) {
-		TransferData[] types = clipboard.getAvailableTypes();
-		Transfer[] transfers = new Transfer[] { TextTransfer.getInstance(),
-				RTFTransfer.getInstance() };
-		for (int i = 0; i < types.length; i++) {
-			for (int j = 0; j < transfers.length; j++) {
-				if (transfers[j].isSupportedType(types[i]))
-					return true;
-			}
-		}
-		return false;
-	}
-	protected void handleOpenDialog() {
-		PluginSelectionDialog dialog = new PluginSelectionDialog(getSection().getShell(), false, false);
-		dialog.create();
-		if (dialog.open() == PluginSelectionDialog.OK) {
-			IPluginModel model = (IPluginModel) dialog.getFirstResult();
-			IPlugin plugin = model.getPlugin();
-			fPluginText.setValue(plugin.getId());
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureUndoManager.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureUndoManager.java
deleted file mode 100644
index 7c4d730..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/FeatureUndoManager.java
+++ /dev/null

@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.feature.FeatureObject;
-import org.eclipse.pde.internal.core.ifeature.IFeature;
-import org.eclipse.pde.internal.core.ifeature.IFeatureChild;
-import org.eclipse.pde.internal.core.ifeature.IFeatureData;
-import org.eclipse.pde.internal.core.ifeature.IFeatureImport;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.core.ifeature.IFeatureObject;
-import org.eclipse.pde.internal.core.ifeature.IFeaturePlugin;
-import org.eclipse.pde.internal.core.ifeature.IFeatureURL;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.editor.ModelUndoManager;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-
-public class FeatureUndoManager extends ModelUndoManager {
-
-	public FeatureUndoManager(PDEFormEditor editor) {
-		super(editor);
-		setUndoLevelLimit(30);
-	}
-
-	protected String getPageId(Object obj) {
-		if (obj instanceof IFeature || obj instanceof IFeatureURL)
-			return FeatureFormPage.PAGE_ID;
-		if (obj instanceof IFeaturePlugin)
-			return FeatureReferencePage.PAGE_ID;
-		if (obj instanceof IFeatureImport)
-			return FeatureDependenciesPage.PAGE_ID;
-		if (obj instanceof IFeatureData || obj instanceof IFeatureChild)
-			return FeatureAdvancedPage.PAGE_ID;
-		return null;
-	}
-
-	protected void execute(IModelChangedEvent event, boolean undo) {
-		Object[] elements = event.getChangedObjects();
-		int type = event.getChangeType();
-		String propertyName = event.getChangedProperty();
-		IFeatureModel model = (IFeatureModel) event.getChangeProvider();
-
-		switch (type) {
-		case IModelChangedEvent.INSERT:
-			if (undo)
-				executeRemove(model, elements);
-			else
-				executeAdd(model, elements);
-			break;
-		case IModelChangedEvent.REMOVE:
-			if (undo)
-				executeAdd(model, elements);
-			else
-				executeRemove(model, elements);
-			break;
-		case IModelChangedEvent.CHANGE:
-			if (undo)
-				executeChange(elements[0], propertyName, event.getNewValue(),
-						event.getOldValue());
-			else
-				executeChange(elements[0], propertyName, event.getOldValue(),
-						event.getNewValue());
-		}
-	}
-
-	private void executeAdd(IFeatureModel model, Object[] elements) {
-		IFeature feature = model.getFeature();
-
-		try {
-			for (int i = 0; i < elements.length; i++) {
-				Object element = elements[i];
-
-				if (element instanceof IFeaturePlugin) {
-					feature
-							.addPlugins(new IFeaturePlugin[] { (IFeaturePlugin) element });
-				} else if (element instanceof IFeatureData) {
-					feature
-							.addData(new IFeatureData[] { (IFeatureData) element });
-				} else if (element instanceof IFeatureImport) {
-					feature
-							.addImports(new IFeatureImport[] { (IFeatureImport) element });
-				} else if (element instanceof IFeatureChild) {
-					feature
-							.addIncludedFeatures(new IFeatureChild[] { (IFeatureChild) element });
-				}
-			}
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	private void executeRemove(IFeatureModel model, Object[] elements) {
-		IFeature feature = model.getFeature();
-
-		try {
-			for (int i = 0; i < elements.length; i++) {
-				Object element = elements[i];
-
-				if (element instanceof IFeaturePlugin) {
-					feature
-							.removePlugins(new IFeaturePlugin[] { (IFeaturePlugin) element });
-				} else if (element instanceof IFeatureData) {
-					feature
-							.removeData(new IFeatureData[] { (IFeatureData) element });
-				} else if (element instanceof IFeatureImport) {
-					feature
-							.removeImports(new IFeatureImport[] { (IFeatureImport) element });
-				} else if (element instanceof IFeatureChild) {
-					feature
-							.removeIncludedFeatures(new IFeatureChild[] { (IFeatureChild) element });
-				}
-			}
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	private void executeChange(Object element, String propertyName,
-			Object oldValue, Object newValue) {
-		if (element instanceof FeatureObject) {
-			FeatureObject pobj = (FeatureObject) element;
-			try {
-				pobj.restoreProperty(propertyName, oldValue, newValue);
-			} catch (CoreException e) {
-				PDEPlugin.logException(e);
-			}
-		}
-	}
-
-	public void modelChanged(IModelChangedEvent event) {
-		if (event.getChangeType() == IModelChangedEvent.CHANGE) {
-			Object obj = event.getChangedObjects()[0];
-			if (obj instanceof IFeatureObject) {
-				IFeatureObject fobj = (IFeatureObject) event
-						.getChangedObjects()[0];
-				// Ignore events from objects that are not yet in the model.
-				if (!(fobj instanceof IFeature) && fobj.isInTheModel() == false)
-					return;
-			}
-		}
-		super.modelChanged(event);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/HandlerSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/HandlerSection.java
deleted file mode 100644
index 274d5a3..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/HandlerSection.java
+++ /dev/null

@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.ifeature.IFeature;
-import org.eclipse.pde.internal.core.ifeature.IFeatureInstallHandler;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ui.editor.PDESection;
-import org.eclipse.pde.internal.ui.parts.FormEntry;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.RTFTransfer;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-public class HandlerSection extends PDESection {
-	private FormEntry fLibraryText;
-
-	private FormEntry fHandlerText;
-
-	public HandlerSection(FeatureAdvancedPage page, Composite parent) {
-		super(page, parent, Section.DESCRIPTION);
-		getSection().setText(PDEUIMessages.FeatureEditor_HandlerSection_title);
-		getSection().setDescription(PDEUIMessages.FeatureEditor_HandlerSection_desc);
-		createClient(getSection(), page.getManagedForm().getToolkit());
-	}
-
-	public boolean canPaste(Clipboard clipboard) {
-		TransferData[] types = clipboard.getAvailableTypes();
-		Transfer[] transfers = new Transfer[] { TextTransfer.getInstance(),
-				RTFTransfer.getInstance() };
-		for (int i = 0; i < types.length; i++) {
-			for (int j = 0; j < transfers.length; j++) {
-				if (transfers[j].isSupportedType(types[i]))
-					return true;
-			}
-		}
-		return false;
-	}
-
-	public void commit(boolean onSave) {
-		fLibraryText.commit();
-		fHandlerText.commit();
-		super.commit(onSave);
-	}
-
-	public void createClient(Section section, FormToolkit toolkit) {
-		Composite container = toolkit.createComposite(section);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.verticalSpacing = 5;
-		layout.horizontalSpacing = 6;
-		container.setLayout(layout);
-
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		final IFeature feature = model.getFeature();
-
-		fLibraryText = new FormEntry(container, toolkit, PDEUIMessages.FeatureEditor_HandlerSection_library, null, false);
-		fLibraryText.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry text) {
-				try {
-					setLibrary(feature, text.getValue());
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		});
-		fHandlerText = new FormEntry(container, toolkit, PDEUIMessages.FeatureEditor_HandlerSection_handler, null, false);
-		fHandlerText.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry text) {
-				try {
-					setHandler(feature, text.getValue());
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		});
-
-		toolkit.paintBordersFor(container);
-		section.setClient(container);
-		initialize();
-	}
-
-	private void setLibrary(IFeature feature, String value)
-			throws CoreException {
-		IFeatureInstallHandler handler = getHandler(feature);
-		handler.setLibrary(value);
-	}
-
-	private void setHandler(IFeature feature, String value)
-			throws CoreException {
-		IFeatureInstallHandler handler = getHandler(feature);
-		handler.setHandlerName(value);
-	}
-
-	private IFeatureInstallHandler getHandler(IFeature feature)
-			throws CoreException {
-		IFeatureInstallHandler handler = feature.getInstallHandler();
-		if (handler == null) {
-			handler = feature.getModel().getFactory().createInstallHandler();
-			feature.setInstallHandler(handler);
-		}
-		return handler;
-	}
-
-	public void dispose() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		if (model != null)
-			model.removeModelChangedListener(this);
-		super.dispose();
-	}
-
-	public void initialize() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		refresh();
-		if (model.isEditable() == false) {
-			fLibraryText.getText().setEditable(false);
-			fHandlerText.getText().setEditable(false);
-		}
-		model.addModelChangedListener(this);
-	}
-
-	public void modelChanged(IModelChangedEvent e) {
-		if (e.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			markStale();
-		}
-	}
-
-	public void setFocus() {
-		if (fLibraryText != null)
-			fLibraryText.getText().setFocus();
-	}
-
-	private void setIfDefined(FormEntry formText, Object value) {
-		if (value != null)
-			formText.setValue(value.toString(), true);
-		else
-			formText.setValue(null, true);
-	}
-
-	public void refresh() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		IFeature feature = model.getFeature();
-		IFeatureInstallHandler handler = feature.getInstallHandler();
-		if (handler != null) {
-			setIfDefined(fLibraryText, handler.getLibrary());
-			setIfDefined(fHandlerText, handler.getHandlerName());
-		}
-		super.refresh();
-	}
-
-	public void cancelEdit() {
-		fLibraryText.cancelEdit();
-		fHandlerText.cancelEdit();
-		super.cancelEdit();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/IncludedFeaturesDetailsSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/IncludedFeaturesDetailsSection.java
deleted file mode 100644
index ac09a37..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/IncludedFeaturesDetailsSection.java
+++ /dev/null

@@ -1,256 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.ifeature.IFeatureChild;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.PDESection;
-import org.eclipse.pde.internal.ui.parts.FormEntry;
-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.Label;
-import org.eclipse.ui.forms.IFormPart;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.IPartSelectionListener;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
-
-public class IncludedFeaturesDetailsSection extends PDESection implements
-		IFormPart, IPartSelectionListener {
-	protected IFeatureChild fInput;
-
-	private FormEntry fNameText;
-
-	private Button fOptionalButton;
-
-	private Button fSearchRootButton;
-
-	private Button fSearchSelfButton;
-
-	private Button fSearchBothButton;
-
-	private boolean fBlockNotification;
-
-	public IncludedFeaturesDetailsSection(PDEFormPage page, Composite parent) {
-		this(page, parent, PDEUIMessages.SiteEditor_IncludedFeaturesDetailsSection_title,
-				PDEUIMessages.SiteEditor_IncludedFeaturesDetailsSection_desc, SWT.NULL);
-	}
-
-	public IncludedFeaturesDetailsSection(PDEFormPage page, Composite parent,
-			String title, String desc, int toggleStyle) {
-		super(page, parent, Section.DESCRIPTION | toggleStyle);
-		getSection().setText(title);
-		getSection().setDescription(desc);
-		createClient(getSection(), page.getManagedForm().getToolkit());
-	}
-
-	public void cancelEdit() {
-		fNameText.cancelEdit();
-		super.cancelEdit();
-	}
-
-	public void commit(boolean onSave) {
-		fNameText.commit();
-		super.commit(onSave);
-	}
-
-	public void createClient(Section section, FormToolkit toolkit) {
-		Composite container = toolkit.createComposite(section);
-		TableWrapLayout layout = new TableWrapLayout();
-		layout.numColumns = 2;
-		layout.verticalSpacing = 5;
-		layout.horizontalSpacing = 6;
-		container.setLayout(layout);
-
-		fNameText = new FormEntry(container, toolkit, PDEUIMessages.SiteEditor_IncludedFeaturesDetailsSection_featureLabel, null, false);
-		fNameText.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry text) {
-				if (fInput != null)
-					try {
-						fInput.setName(text.getValue());
-					} catch (CoreException e) {
-						PDEPlugin.logException(e);
-					}
-			}
-		});
-		fNameText.setEditable(isEditable());
-
-		fOptionalButton = toolkit.createButton(container, PDEUIMessages.SiteEditor_IncludedFeaturesDetailsSection_optional, SWT.CHECK);
-
-		TableWrapData gd = new TableWrapData(TableWrapData.FILL);
-		gd.colspan = 2;
-		fOptionalButton.setLayoutData(gd);
-		fOptionalButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (!fBlockNotification) {
-					try {
-						fInput.setOptional(fOptionalButton.getSelection());
-					} catch (CoreException ce) {
-					}
-				}
-			}
-		});
-		Label fSearchLocationDescLabel = toolkit.createLabel(container,
-				PDEUIMessages.SiteEditor_IncludedFeaturesDetailsSection_searchLocation, SWT.WRAP);
-		gd = new TableWrapData(TableWrapData.FILL);
-		gd.colspan = 2;
-		fSearchLocationDescLabel.setLayoutData(gd);
-
-		fSearchRootButton = toolkit.createButton(container, PDEUIMessages.SiteEditor_IncludedFeaturesDetailsSection_root, SWT.RADIO);
-		fSearchRootButton.setSelection(true);
-		gd = new TableWrapData(TableWrapData.FILL);
-		gd.colspan = 2;
-		gd.indent = 5;
-		fSearchRootButton.setLayoutData(gd);
-		fSearchRootButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (!fBlockNotification) {
-					try {
-						if (fSearchRootButton.getSelection())
-							fInput.setSearchLocation(IFeatureChild.ROOT);
-					} catch (CoreException ce) {
-					}
-				}
-			}
-		});
-
-		fSearchSelfButton = toolkit.createButton(container, PDEUIMessages.SiteEditor_IncludedFeaturesDetailsSection_self, SWT.RADIO);
-		fSearchSelfButton.setSelection(true);
-		gd = new TableWrapData(TableWrapData.FILL);
-		gd.colspan = 2;
-		gd.indent = 5;
-		fSearchSelfButton.setLayoutData(gd);
-		fSearchSelfButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (!fBlockNotification) {
-					try {
-						if (fSearchSelfButton.getSelection())
-							fInput.setSearchLocation(IFeatureChild.SELF);
-					} catch (CoreException ce) {
-					}
-				}
-			}
-		});
-
-		fSearchBothButton = toolkit.createButton(container, PDEUIMessages.SiteEditor_IncludedFeaturesDetailsSection_both, SWT.RADIO);
-		fSearchBothButton.setSelection(true);
-		gd = new TableWrapData(TableWrapData.FILL);
-		gd.colspan = 2;
-		gd.indent = 5;
-		fSearchBothButton.setLayoutData(gd);
-		fSearchBothButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (!fBlockNotification) {
-					try {
-						if (fSearchBothButton.getSelection())
-							fInput.setSearchLocation(IFeatureChild.BOTH);
-					} catch (CoreException ce) {
-					}
-				}
-			}
-		});
-
-		toolkit.paintBordersFor(container);
-		section.setClient(container);
-	}
-
-	public void dispose() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		if (model != null)
-			model.removeModelChangedListener(this);
-		super.dispose();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.forms.AbstractFormPart#initialize(org.eclipse.ui.forms.IManagedForm)
-	 */
-	public void initialize(IManagedForm form) {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		if (model != null)
-			model.addModelChangedListener(this);
-		super.initialize(form);
-	}
-
-	public void modelChanged(IModelChangedEvent e) {
-		markStale();
-	}
-
-	public void refresh() {
-		update();
-		super.refresh();
-	}
-
-	public void selectionChanged(IFormPart part, ISelection selection) {
-		if (selection instanceof IStructuredSelection && !selection.isEmpty()) {
-			Object o = ((IStructuredSelection) selection).getFirstElement();
-			if (o instanceof IFeatureChild) {
-				fInput = (IFeatureChild) o;
-			} else {
-				fInput = null;
-			}
-		} else
-			fInput = null;
-		update();
-	}
-
-	public void setFocus() {
-		if (fNameText != null)
-			fNameText.getText().setFocus();
-	}
-
-	private void update() {
-		fBlockNotification = true;
-
-		if (fInput != null) {
-			fNameText.setValue(fInput.getName(), true);
-			fOptionalButton.setSelection(fInput.isOptional());
-			int searchLocation = fInput.getSearchLocation();
-			fSearchRootButton
-					.setSelection(searchLocation == IFeatureChild.ROOT);
-			fSearchSelfButton
-					.setSelection(searchLocation == IFeatureChild.SELF);
-			fSearchBothButton
-					.setSelection(searchLocation == IFeatureChild.BOTH);
-		} else {
-			fNameText.setValue(null, true);
-			fOptionalButton.setSelection(false);
-			fSearchRootButton.setSelection(true);
-			fSearchSelfButton.setSelection(false);
-			fSearchBothButton.setSelection(false);
-		}
-		fNameText.setEditable(fInput != null && isEditable());
-		fOptionalButton.setEnabled(fInput != null && isEditable());
-		fSearchRootButton.setEnabled(fInput != null && isEditable());
-		fSearchSelfButton.setEnabled(fInput != null && isEditable());
-		fSearchBothButton.setEnabled(fInput != null && isEditable());
-
-		fBlockNotification = false;
-	}
-
-	public boolean isEditable() {
-		return getPage().getPDEEditor().getAggregateModel().isEditable();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/IncludedFeaturesPortabilitySection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/IncludedFeaturesPortabilitySection.java
deleted file mode 100644
index f347d47..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/IncludedFeaturesPortabilitySection.java
+++ /dev/null

@@ -1,379 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import java.util.Locale;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.ifeature.IEnvironment;
-import org.eclipse.pde.internal.core.ifeature.IFeatureChild;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.PDESection;
-import org.eclipse.pde.internal.ui.parts.FormEntry;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.RTFTransfer;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IFormPart;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.IPartSelectionListener;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-public class IncludedFeaturesPortabilitySection extends PDESection implements
-		IFormPart, IPartSelectionListener {
-	public static Choice[] getArchChoices() {
-		return getKnownChoices(Platform.knownOSArchValues());
-	}
-
-	private static Choice[] getKnownChoices(String[] values) {
-		Choice[] choices = new Choice[values.length];
-		for (int i = 0; i < choices.length; i++) {
-			choices[i] = new Choice(values[i], values[i]);
-		}
-		return choices;
-	}
-
-	public static Choice[] getNLChoices() {
-		Locale[] locales = Locale.getAvailableLocales();
-		Choice[] choices = new Choice[locales.length];
-		for (int i = 0; i < locales.length; i++) {
-			Locale locale = locales[i];
-			choices[i] = new Choice(locale.toString(), locale.toString()
-					+ " - " + locale.getDisplayName()); //$NON-NLS-1$
-		}
-		return choices;
-	}
-
-	public static Choice[] getOSChoices() {
-		return getKnownChoices(Platform.knownOSValues());
-	}
-
-	public static Choice[] getWSChoices() {
-		return getKnownChoices(Platform.knownWSValues());
-	}
-
-	private FormEntry fArchText;
-
-	private IFeatureChild fCurrentInput;
-
-	private FormEntry fNlText;
-
-	private FormEntry fOsText;
-
-	private FormEntry fWsText;
-
-	public IncludedFeaturesPortabilitySection(PDEFormPage page, Composite parent) {
-		this(page, parent, PDEUIMessages.FeatureEditor_IncludedFeaturePortabilitySection_title,
-				PDEUIMessages.FeatureEditor_IncludedFeaturePortabilitySection_desc, SWT.NULL);
-		getSection().setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-	}
-
-	public IncludedFeaturesPortabilitySection(PDEFormPage page,
-			Composite parent, String title, String desc, int toggleStyle) {
-		super(page, parent, Section.DESCRIPTION | ExpandableComposite.NO_TITLE
-				| toggleStyle, false);
-		getSection().setDescription(desc);
-		createClient(getSection(), page.getManagedForm().getToolkit());
-	}
-
-	private void applyValue(String property, String value) throws CoreException {
-		if (fCurrentInput == null)
-			return;
-		if (property.equals(IEnvironment.P_NL))
-			fCurrentInput.setNL(value);
-		else if (property.equals(IEnvironment.P_OS))
-			fCurrentInput.setOS(value);
-		else if (property.equals(IEnvironment.P_WS))
-			fCurrentInput.setWS(value);
-		else if (property.equals(IEnvironment.P_ARCH))
-			fCurrentInput.setArch(value);
-	}
-
-	public void cancelEdit() {
-		fOsText.cancelEdit();
-		fWsText.cancelEdit();
-		fNlText.cancelEdit();
-		fArchText.cancelEdit();
-		super.cancelEdit();
-	}
-
-	public boolean canPaste(Clipboard clipboard) {
-		TransferData[] types = clipboard.getAvailableTypes();
-		Transfer[] transfers = new Transfer[] { TextTransfer.getInstance(),
-				RTFTransfer.getInstance() };
-		for (int i = 0; i < types.length; i++) {
-			for (int j = 0; j < transfers.length; j++) {
-				if (transfers[j].isSupportedType(types[i]))
-					return true;
-			}
-		}
-		return false;
-	}
-
-	private void clearField(String property) {
-		if (property.equals(IEnvironment.P_OS))
-			fOsText.setValue(null, true);
-		else if (property.equals(IEnvironment.P_WS))
-			fWsText.setValue(null, true);
-		else if (property.equals(IEnvironment.P_ARCH))
-			fArchText.setValue(null, true);
-		else if (property.equals(IEnvironment.P_NL))
-			fNlText.setValue(null, true);
-	}
-
-	private void clearFields() {
-		fOsText.setValue(null, true);
-		fWsText.setValue(null, true);
-		fNlText.setValue(null, true);
-		fArchText.setValue(null, true);
-	}
-
-	public void commit(boolean onSave) {
-		fOsText.commit();
-		fWsText.commit();
-		fNlText.commit();
-		fArchText.commit();
-		super.commit(onSave);
-	}
-
-	public void createClient(Section section, FormToolkit toolkit) {
-		Composite container = toolkit.createComposite(section);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		layout.verticalSpacing = 5;
-		layout.horizontalSpacing = 6;
-		container.setLayout(layout);
-
-		String editLabel = PDEUIMessages.SiteEditor_PortabilitySection_edit;
-
-		fOsText = new FormEntry(container, toolkit, PDEUIMessages.SiteEditor_PortabilitySection_os, editLabel, false);
-		fOsText.setFormEntryListener(new FormEntryAdapter(this) {
-
-			public void browseButtonSelected(FormEntry entry) {
-				BusyIndicator.showWhile(fOsText.getText().getDisplay(),
-						new Runnable() {
-							public void run() {
-								Choice[] choices = getOSChoices();
-								openPortabilityChoiceDialog(IEnvironment.P_OS,
-										fOsText, choices);
-							}
-						});
-			}
-
-			public void textValueChanged(FormEntry text) {
-				try {
-					applyValue(IEnvironment.P_OS, text.getValue());
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		});
-		limitTextWidth(fOsText);
-		fOsText.setEditable(fCurrentInput !=null && isEditable());
-
-		fWsText = new FormEntry(container, toolkit, PDEUIMessages.SiteEditor_PortabilitySection_ws, editLabel, false);
-		fWsText.setFormEntryListener(new FormEntryAdapter(this) {
-
-			public void browseButtonSelected(FormEntry entry) {
-				BusyIndicator.showWhile(fWsText.getText().getDisplay(),
-						new Runnable() {
-							public void run() {
-								Choice[] choices = getWSChoices();
-								openPortabilityChoiceDialog(IEnvironment.P_WS,
-										fWsText, choices);
-							}
-						});
-			}
-
-			public void textValueChanged(FormEntry text) {
-				try {
-					applyValue(IEnvironment.P_WS, text.getValue());
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		});
-		limitTextWidth(fWsText);
-		fWsText.setEditable(fCurrentInput !=null && isEditable());
-
-		fNlText = new FormEntry(container, toolkit, PDEUIMessages.SiteEditor_PortabilitySection_nl, editLabel, false);
-
-		fNlText.setFormEntryListener(new FormEntryAdapter(this) {
-
-			public void browseButtonSelected(FormEntry entry) {
-				BusyIndicator.showWhile(fNlText.getText().getDisplay(),
-						new Runnable() {
-							public void run() {
-								Choice[] choices = getNLChoices();
-								openPortabilityChoiceDialog(IEnvironment.P_NL,
-										fNlText, choices);
-							}
-						});
-			}
-
-			public void textValueChanged(FormEntry text) {
-				try {
-					applyValue(IEnvironment.P_NL, text.getValue());
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		});
-		limitTextWidth(fNlText);
-		fNlText.setEditable(fCurrentInput !=null && isEditable());
-
-		fArchText = new FormEntry(container, toolkit, PDEUIMessages.SiteEditor_PortabilitySection_arch, editLabel, false);
-		fArchText.setFormEntryListener(new FormEntryAdapter(this) {
-
-			public void browseButtonSelected(FormEntry entry) {
-				BusyIndicator.showWhile(fArchText.getText().getDisplay(),
-						new Runnable() {
-							public void run() {
-								Choice[] choices = getArchChoices();
-								openPortabilityChoiceDialog(
-										IEnvironment.P_ARCH, fArchText, choices);
-							}
-						});
-			}
-
-			public void textValueChanged(FormEntry text) {
-				try {
-					applyValue(IEnvironment.P_ARCH, text.getValue());
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-
-		});
-		limitTextWidth(fArchText);
-		fArchText.setEditable(fCurrentInput !=null && isEditable());
-
-		toolkit.paintBordersFor(container);
-		section.setClient(container);
-	}
-
-	public void dispose() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		if (model != null)
-			model.removeModelChangedListener(this);
-		super.dispose();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.forms.AbstractFormPart#initialize(org.eclipse.ui.forms.IManagedForm)
-	 */
-	public void initialize(IManagedForm form) {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		if (model != null)
-			model.addModelChangedListener(this);
-		super.initialize(form);
-	}
-
-	private void limitTextWidth(FormEntry entry) {
-		GridData gd = (GridData) entry.getText().getLayoutData();
-		gd.widthHint = 30;
-	}
-
-	public void modelChanged(IModelChangedEvent e) {
-		markStale();
-	}
-
-	private void openPortabilityChoiceDialog(String property, FormEntry text,
-			Choice[] choices) {
-		String value = text.getValue();
-
-		PortabilityChoicesDialog dialog = new PortabilityChoicesDialog(
-				PDEPlugin.getActiveWorkbenchShell(), choices, value);
-		dialog.create();
-		dialog.getShell().setText(PDEUIMessages.SiteEditor_PortabilityChoicesDialog_title);
-
-		int result = dialog.open();
-		if (result == Window.OK) {
-			value = dialog.getValue();
-			text.setValue(value);
-			try {
-				applyValue(property, value);
-			} catch (CoreException e) {
-				PDEPlugin.logException(e);
-			}
-		}
-	}
-
-	public void refresh() {
-		if (fCurrentInput == null) {
-			clearFields();
-		} else {
-			setValue(IEnvironment.P_OS);
-			setValue(IEnvironment.P_WS);
-			setValue(IEnvironment.P_ARCH);
-			setValue(IEnvironment.P_NL);
-		}
-
-		fOsText.setEditable(fCurrentInput != null && isEditable());
-		fWsText.setEditable(fCurrentInput != null && isEditable());
-		fNlText.setEditable(fCurrentInput != null && isEditable());
-		fArchText.setEditable(fCurrentInput != null && isEditable());
-
-		super.refresh();
-	}
-
-	public void selectionChanged(IFormPart part, ISelection selection) {
-		if (selection instanceof IStructuredSelection && !selection.isEmpty()) {
-			Object o = ((IStructuredSelection) selection).getFirstElement();
-			if (o instanceof IFeatureChild) {
-				fCurrentInput = (IFeatureChild) o;
-			} else {
-				fCurrentInput = null;
-			}
-		} else
-			fCurrentInput = null;
-		refresh();
-	}
-
-	public void setFocus() {
-		if (fOsText != null)
-			fOsText.getText().setFocus();
-	}
-
-	private void setValue(String property) {
-		if (fCurrentInput == null) {
-			clearField(property);
-		} else {
-			if (property.equals(IEnvironment.P_NL))
-				fNlText.setValue(fCurrentInput.getNL(), true);
-			else if (property.equals(IEnvironment.P_OS))
-				fOsText.setValue(fCurrentInput.getOS(), true);
-			else if (property.equals(IEnvironment.P_WS))
-				fWsText.setValue(fCurrentInput.getWS(), true);
-			else if (property.equals(IEnvironment.P_ARCH))
-				fArchText.setValue(fCurrentInput.getArch(), true);
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/IncludedFeaturesSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/IncludedFeaturesSection.java
deleted file mode 100644
index 3610be4..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/IncludedFeaturesSection.java
+++ /dev/null

@@ -1,463 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.pde.core.IModel;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.FeatureModelManager;
-import org.eclipse.pde.internal.core.IFeatureModelDelta;
-import org.eclipse.pde.internal.core.IFeatureModelListener;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.feature.FeatureChild;
-import org.eclipse.pde.internal.core.ifeature.IFeature;
-import org.eclipse.pde.internal.core.ifeature.IFeatureChild;
-import org.eclipse.pde.internal.core.ifeature.IFeatureImport;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.ModelDataTransfer;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.TableSection;
-import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
-import org.eclipse.pde.internal.ui.parts.TablePart;
-import org.eclipse.pde.internal.ui.wizards.FeatureSelectionDialog;
-import org.eclipse.pde.internal.ui.wizards.ListUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-public class IncludedFeaturesSection extends TableSection implements
-		IFeatureModelListener {
-	private TableViewer fIncludesViewer;
-
-	private Action fNewAction;
-
-	private Action fOpenAction;
-
-	private Action fDeleteAction;
-
-	class IncludedFeaturesContentProvider extends DefaultContentProvider
-			implements IStructuredContentProvider {
-		public Object[] getElements(Object parent) {
-			if (parent instanceof IFeature) {
-				return ((IFeature) parent).getIncludedFeatures();
-			}
-			return new Object[0];
-		}
-	}
-
-	public IncludedFeaturesSection(PDEFormPage page, Composite parent) {
-		super(page, parent, Section.DESCRIPTION, new String[] { PDEUIMessages.FeatureEditor_IncludedFeatures_new });
-		getSection().setText(PDEUIMessages.FeatureEditor_IncludedFeatures_title);
-		getSection().setDescription(PDEUIMessages.FeatureEditor_IncludedFeatures_desc);
-		getTablePart().setEditable(false);
-		getSection().setLayoutData(new GridData(GridData.FILL_BOTH));
-	}
-
-	public void commit(boolean onSave) {
-		super.commit(onSave);
-	}
-
-	public void createClient(Section section, FormToolkit toolkit) {
-		Composite container = createClientContainer(section, 2, toolkit);
-		GridLayout layout = (GridLayout) container.getLayout();
-		layout.verticalSpacing = 5;
-
-		createViewerPartControl(container, SWT.MULTI, 2, toolkit);
-		TablePart tablePart = getTablePart();
-		fIncludesViewer = tablePart.getTableViewer();
-		fIncludesViewer
-				.setContentProvider(new IncludedFeaturesContentProvider());
-		fIncludesViewer.setLabelProvider(PDEPlugin.getDefault()
-				.getLabelProvider());
-		fIncludesViewer.setSorter(ListUtil.NAME_SORTER);
-		toolkit.paintBordersFor(container);
-		makeActions();
-		section.setClient(container);
-		initialize();
-	}
-
-	protected void handleDoubleClick(IStructuredSelection selection) {
-		fOpenAction.run();
-	}
-
-	protected void buttonSelected(int index) {
-		if (index == 0)
-			handleNew();
-	}
-
-	public void dispose() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		if (model != null)
-			model.removeModelChangedListener(this);
-		FeatureModelManager mng = PDECore.getDefault()
-		.getFeatureModelManager();
-		mng.removeFeatureModelListener(this);
-		super.dispose();
-	}
-
-	public boolean setFormInput(Object object) {
-		if (object instanceof IFeatureChild) {
-			fIncludesViewer.setSelection(new StructuredSelection(object), true);
-			return true;
-		}
-		return false;
-	}
-
-	protected void fillContextMenu(IMenuManager manager) {
-		manager.add(fOpenAction);
-		manager.add(new Separator());
-		manager.add(fNewAction);
-		manager.add(fDeleteAction);
-		manager.add(new Separator());
-		getPage().getPDEEditor().getContributor().contextMenuAboutToShow(
-				manager);
-	}
-
-	private void handleNew() {
-		BusyIndicator.showWhile(fIncludesViewer.getTable().getDisplay(),
-				new Runnable() {
-					public void run() {
-						IFeatureModel[] allModels = PDECore.getDefault()
-								.getFeatureModelManager().getModels();
-						ArrayList newModels = new ArrayList();
-						for (int i = 0; i < allModels.length; i++) {
-							if (canAdd(allModels[i]))
-								newModels.add(allModels[i]);
-						}
-						IFeatureModel[] candidateModels = (IFeatureModel[]) newModels
-								.toArray(new IFeatureModel[newModels.size()]);
-						FeatureSelectionDialog dialog = new FeatureSelectionDialog(
-								fIncludesViewer.getTable().getShell(),
-								candidateModels, true);
-						if (dialog.open() == Window.OK) {
-							Object[] models = dialog.getResult();
-							try {
-								doAdd(models);
-							} catch (CoreException e) {
-								PDECore.log(e);
-							}
-						}
-					}
-				});
-	}
-
-	private void doAdd(Object[] candidates) throws CoreException {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		IFeature feature = model.getFeature();
-		IFeatureChild[] added = new IFeatureChild[candidates.length];
-		for (int i = 0; i < candidates.length; i++) {
-			IFeatureModel candidate = (IFeatureModel) candidates[i];
-			FeatureChild child = (FeatureChild) model.getFactory()
-					.createChild();
-			child.loadFrom(candidate.getFeature());
-			child.setVersion("0.0.0"); //$NON-NLS-1$
-			added[i] = child;
-		}
-		feature.addIncludedFeatures(added);
-	}
-
-	private boolean canAdd(IFeatureModel candidate) {
-		IFeature cfeature = candidate.getFeature();
-
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		IFeature feature = model.getFeature();
-
-		if (cfeature.getId().equals(feature.getId())
-				&& cfeature.getVersion().equals(feature.getVersion())) {
-			return false;
-		}
-
-		boolean isPatchEditor = ((FeatureEditor) getPage().getEditor())
-		.isPatchEditor();
-		if (isPatchEditor && !isFeaturePatch(candidate.getFeature())) {
-			return false;
-		}
-
-		IFeatureChild[] features = feature.getIncludedFeatures();
-
-		for (int i = 0; i < features.length; i++) {
-			if (features[i].getId().equals(cfeature.getId())
-					&& features[i].getVersion().equals(cfeature.getVersion()))
-				return false;
-		}
-		return true;
-	}
-
-	private static boolean isFeaturePatch(IFeature feature) {
-		IFeatureImport[] imports = feature.getImports();
-		for (int i = 0; i < imports.length; i++) {
-			if (imports[i].isPatch())
-				return true;
-		}
-		return false;
-	}
-
-	private void handleSelectAll() {
-		IStructuredContentProvider provider = (IStructuredContentProvider) fIncludesViewer
-				.getContentProvider();
-		Object[] elements = provider.getElements(fIncludesViewer.getInput());
-		StructuredSelection ssel = new StructuredSelection(elements);
-		fIncludesViewer.setSelection(ssel);
-	}
-
-	private void handleDelete() {
-		IStructuredSelection ssel = (IStructuredSelection) fIncludesViewer
-				.getSelection();
-
-		if (ssel.isEmpty())
-			return;
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		if (!model.isEditable()) {
-			return;
-		}
-		IFeature feature = model.getFeature();
-
-		try {
-			IFeatureChild[] removed = new IFeatureChild[ssel.size()];
-			int i = 0;
-			for (Iterator iter = ssel.iterator(); iter.hasNext();) {
-				IFeatureChild iobj = (IFeatureChild) iter.next();
-				removed[i++] = iobj;
-			}
-			feature.removeIncludedFeatures(removed);
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	public boolean doGlobalAction(String actionId) {
-		if (actionId.equals(ActionFactory.DELETE.getId())) {
-			BusyIndicator.showWhile(fIncludesViewer.getTable().getDisplay(),
-					new Runnable() {
-						public void run() {
-							handleDelete();
-						}
-					});
-			return true;
-		}
-		if (actionId.equals(ActionFactory.SELECT_ALL.getId())) {
-			BusyIndicator.showWhile(fIncludesViewer.getTable().getDisplay(),
-					new Runnable() {
-						public void run() {
-							handleSelectAll();
-						}
-					});
-			return true;
-		}
-		if (actionId.equals(ActionFactory.CUT.getId())) {
-			// delete here and let the editor transfer
-			// the selection to the clipboard
-			handleDelete();
-			return false;
-		}
-		if (actionId.equals(ActionFactory.PASTE.getId())) {
-			doPaste();
-			return true;
-		}
-		return false;
-	}
-
-	protected void selectionChanged(IStructuredSelection selection) {
-		getPage().getPDEEditor().setSelection(selection);
-	}
-
-	public void initialize() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		refresh();
-		getTablePart().setButtonEnabled(0, model.isEditable());
-		model.addModelChangedListener(this);
-		FeatureModelManager mng = PDECore.getDefault()
-				.getFeatureModelManager();
-		mng.addFeatureModelListener(this);
-	}
-
-	public void modelChanged(IModelChangedEvent e) {
-		if (e.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			markStale();
-			return;
-		}
-		Object obj = e.getChangedObjects()[0];
-		if (obj instanceof IFeatureChild) {
-			if (e.getChangeType() == IModelChangedEvent.CHANGE) {
-				fIncludesViewer.update(obj, null);
-			} else if (e.getChangeType() == IModelChangedEvent.INSERT) {
-				fIncludesViewer.add(e.getChangedObjects());
-				if (e.getChangedObjects().length > 0) {
-					fIncludesViewer.setSelection(new StructuredSelection(e
-							.getChangedObjects()[0]));
-				}
-			} else if (e.getChangeType() == IModelChangedEvent.REMOVE) {
-				fIncludesViewer.remove(e.getChangedObjects());
-			}
-		}
-	}
-
-	private void makeActions() {
-		IModel model = (IModel) getPage().getModel();
-		fNewAction = new Action() {
-			public void run() {
-				handleNew();
-			}
-		};
-		fNewAction.setText(PDEUIMessages.Menus_new_label);
-		fNewAction.setEnabled(model.isEditable());
-
-		fDeleteAction = new Action() {
-			public void run() {
-				BusyIndicator.showWhile(
-						fIncludesViewer.getTable().getDisplay(),
-						new Runnable() {
-							public void run() {
-								handleDelete();
-							}
-						});
-			}
-		};
-		fDeleteAction.setEnabled(model.isEditable());
-		fDeleteAction.setText(PDEUIMessages.Actions_delete_label);
-		fOpenAction = new OpenReferenceAction(fIncludesViewer);
-	}
-
-	public void modelsChanged(final IFeatureModelDelta delta) {
-		getSection().getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				if (getSection().isDisposed()) {
-					return;
-				}
-				IFeatureModel[] added = delta.getAdded();
-				IFeatureModel[] removed = delta.getRemoved();
-				IFeatureModel[] changed = delta.getChanged();
-				if (hasModels(added) || hasModels(removed)
-						|| hasModels(changed))
-					markStale();
-			}
-		});
-	}
-
-	private boolean hasModels(IFeatureModel[] models) {
-		if (models == null)
-			return false;
-		IFeatureModel thisModel = (IFeatureModel) getPage().getModel();
-		if (thisModel == null)
-			return false;
-		for (int i = 0; i < models.length; i++) {
-			if (models[i] != thisModel) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public void setFocus() {
-		if (fIncludesViewer != null)
-			fIncludesViewer.getTable().setFocus();
-	}
-
-	public void refresh() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		IFeature feature = model.getFeature();
-		fIncludesViewer.setInput(feature);
-		super.refresh();
-	}
-
-	/**
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#canPaste(Clipboard)
-	 */
-	public boolean canPaste(Clipboard clipboard) {
-		Object[] objects = (Object[]) clipboard.getContents(ModelDataTransfer
-				.getInstance());
-		if (objects != null && objects.length > 0) {
-			return canPaste(null, objects);
-		}
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#canPaste(Object,
-	 *      Object[])
-	 */
-	protected boolean canPaste(Object target, Object[] objects) {
-		for (int i = 0; i < objects.length; i++) {
-			if (!(objects[i] instanceof FeatureChild))
-				return false;
-		}
-		return true;
-	}
-
-	/**
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#doPaste()
-	 */
-	protected void doPaste() {
-		Clipboard clipboard = getPage().getPDEEditor().getClipboard();
-		ModelDataTransfer modelTransfer = ModelDataTransfer.getInstance();
-		Object[] objects = (Object[]) clipboard.getContents(modelTransfer);
-		if (objects != null) {
-			doPaste(null, objects);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#doPaste(Object,
-	 *      Object[])
-	 */
-	protected void doPaste(Object target, Object[] objects) {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		IFeature feature = model.getFeature();
-		if (!model.isEditable()) {
-			return;
-		}
-
-		FeatureChild[] fChildren = new FeatureChild[objects.length];
-		try {
-			for (int i = 0; i < objects.length; i++) {
-				if (objects[i] instanceof FeatureChild) {
-					FeatureChild fChild = (FeatureChild) objects[i];
-					fChild.setModel(model);
-					fChild.setParent(feature);
-					fChildren[i] = fChild;
-				}
-			}
-			feature.addIncludedFeatures(fChildren);
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	void fireSelection() {
-		ISelection sel = fIncludesViewer.getSelection();
-		if (!sel.isEmpty()) {
-			fIncludesViewer.setSelection(fIncludesViewer.getSelection());
-		} else if (fIncludesViewer.getElementAt(0) != null) {
-			fIncludesViewer.setSelection(new StructuredSelection(
-					fIncludesViewer.getElementAt(0)));
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/InfoFormPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/InfoFormPage.java
deleted file mode 100644
index b3ce615..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/InfoFormPage.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.text.ColorManager;
-import org.eclipse.pde.internal.ui.editor.text.IColorManager;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-
-/**
- * 
- * 
- */
-public class InfoFormPage extends PDEFormPage {
-	public static final String PAGE_ID = "info";	 //$NON-NLS-1$
-	private IColorManager colorManager = ColorManager.getDefault();
-	private InfoSection infoSection;
-/**
- * 
- * @param editor
- * @param title
- */
-	public InfoFormPage(PDEFormEditor editor, String title) {
-		super(editor, PAGE_ID, title);
-	}
-	protected void createFormContent(IManagedForm managedForm) {
-		super.createFormContent(managedForm);
-		ScrolledForm form = managedForm.getForm();
-		GridLayout layout = new GridLayout();
-		form.getBody().setLayout(layout);
-		layout.marginWidth = 10;
-		GridData gd;
-		
-		infoSection = new InfoSection(this, form.getBody(), colorManager);
-		gd = new GridData(GridData.FILL_BOTH);
-		infoSection.getSection().setLayoutData(gd);
-		managedForm.addPart(infoSection);
-		
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.MANIFEST_FEATURE_INFO);
-		initialize();
-	}
-	public void dispose() {
-		colorManager.dispose();
-		super.dispose();
-	}
-	public void initialize() {
-		getManagedForm().getForm().setText(PDEUIMessages.FeatureEditor_InfoPage_heading);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/InfoSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/InfoSection.java
deleted file mode 100644
index 4e856da..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/InfoSection.java
+++ /dev/null

@@ -1,496 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.DocumentEvent;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentListener;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.ITextOperationTarget;
-import org.eclipse.jface.text.rules.FastPartitioner;
-import org.eclipse.jface.text.source.SourceViewer;
-import org.eclipse.jface.text.source.SourceViewerConfiguration;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.pde.core.IEditable;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.ifeature.IFeature;
-import org.eclipse.pde.internal.core.ifeature.IFeatureInfo;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.core.ifeature.IFeatureURLElement;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.PDESection;
-import org.eclipse.pde.internal.ui.editor.XMLConfiguration;
-import org.eclipse.pde.internal.ui.editor.text.IColorManager;
-import org.eclipse.pde.internal.ui.editor.text.TextUtil;
-import org.eclipse.pde.internal.ui.editor.text.XMLPartitionScanner;
-import org.eclipse.pde.internal.ui.elements.NamedElement;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CTabFolder;
-import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.dnd.Clipboard;
-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.Color;
-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.Text;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.forms.FormColors;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-public class InfoSection extends PDESection {
-	private IDocument fDocument;
-
-	private IDocumentPartitioner fPartitioner;
-
-	private SourceViewerConfiguration fSourceConfiguration;
-
-	private SourceViewer fSourceViewer;
-
-	private CTabFolder fTabFolder;
-
-	private Text fUrlText;
-
-	private Object fElement;
-
-	private int fElementIndex;
-
-	private boolean fIgnoreChange;
-
-	private Composite fNotebook;
-
-	private StackLayout fNotebookLayout;
-
-	private Control fInfoPage;
-
-	private Control fUrlsPage;
-
-	public InfoSection(PDEFormPage page, Composite parent,
-			IColorManager colorManager) {
-		super(page, parent, Section.DESCRIPTION | ExpandableComposite.NO_TITLE,
-				false);
-		String description = PDEUIMessages.FeatureEditor_InfoSection_desc;
-		getSection().setDescription(description);
-		fSourceConfiguration = new XMLConfiguration(colorManager);
-		fDocument = new Document();
-		fPartitioner = new FastPartitioner(new XMLPartitionScanner(),
-				new String[] { XMLPartitionScanner.XML_TAG,
-						XMLPartitionScanner.XML_COMMENT });
-		fPartitioner.connect(fDocument);
-		fDocument.setDocumentPartitioner(fPartitioner);
-		createClient(getSection(), page.getManagedForm().getToolkit());
-	}
-
-	public void commit(boolean onSave) {
-		handleApply();
-		super.commit(onSave);
-	}
-
-	public void createClient(Section section, FormToolkit toolkit) {
-		Composite container = toolkit.createComposite(section);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginWidth = 2;
-		layout.marginHeight = 5;
-		layout.verticalSpacing = 8;
-		container.setLayout(layout);
-		GridData gd;
-
-		toolkit.createLabel(container, null);
-		fTabFolder = new CTabFolder(container, SWT.FLAT | SWT.TOP);
-		toolkit.adapt(fTabFolder, true, true);
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		fTabFolder.setLayoutData(gd);
-		gd.heightHint = 2;
-		toolkit.getColors().initializeSectionToolBarColors();
-		Color selectedColor1 = toolkit.getColors().getColor(FormColors.TB_BG);
-		Color selectedColor2 = toolkit.getColors().getColor(FormColors.TB_GBG);
-		fTabFolder.setSelectionBackground(new Color[] { selectedColor1,
-				selectedColor2, toolkit.getColors().getBackground() },
-				new int[] { 50, 100 }, true);
-
-		fTabFolder.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				updateTabSelection();
-			}
-		});
-
-		fNotebook = toolkit.createComposite(container);
-		gd = new GridData(GridData.FILL_BOTH);
-		gd.horizontalSpan = 2;
-		fNotebook.setLayoutData(gd);
-		fNotebookLayout = new StackLayout();
-		fNotebook.setLayout(fNotebookLayout);
-
-		fInfoPage = createInfoPage(toolkit, fNotebook);
-		fUrlsPage = createUrlsPage(toolkit, fNotebook);
-		fNotebookLayout.topControl = fInfoPage;
-
-		createTabs();
-		section.setClient(container);
-		initialize();
-		if (fTabFolder.getItemCount() > 0) {
-			fTabFolder.setSelection(0);
-			updateTabSelection();
-		}
-	}
-
-	/**
-	 * @param toolkit
-	 * @param parent
-	 */
-	private Control createInfoPage(FormToolkit toolkit, Composite parent) {
-		Composite page = toolkit.createComposite(parent);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginWidth = 2;
-		layout.marginHeight = 5;
-		layout.verticalSpacing = 8;
-		page.setLayout(layout);
-		GridData gd;
-		Label label = toolkit.createLabel(page, PDEUIMessages.FeatureEditor_InfoSection_url);
-		label.setForeground(toolkit.getColors().getColor(FormColors.TITLE));
-		fUrlText = toolkit.createText(page, null, SWT.SINGLE);
-		fUrlText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				infoModified();
-			}
-		});
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		fUrlText.setLayoutData(gd);
-		label = toolkit
-				.createLabel(page, PDEUIMessages.FeatureEditor_InfoSection_text);
-		label.setForeground(toolkit.getColors().getColor(FormColors.TITLE));
-		gd = new GridData(GridData.VERTICAL_ALIGN_BEGINNING);
-		label.setLayoutData(gd);
-		int styles = SWT.MULTI | SWT.WRAP | SWT.V_SCROLL | SWT.H_SCROLL;
-		fSourceViewer = new SourceViewer(page, null, styles);
-		fSourceViewer.configure(fSourceConfiguration);
-		fSourceViewer.setDocument(fDocument);
-		fSourceViewer
-				.addSelectionChangedListener(new ISelectionChangedListener() {
-					public void selectionChanged(SelectionChangedEvent event) {
-						updateSelection(event.getSelection());
-					}
-				});
-		StyledText styledText = fSourceViewer.getTextWidget();
-		styledText.setFont(JFaceResources.getTextFont());
-		styledText.setMenu(getPage().getPDEEditor().getContextMenu());
-		styledText
-				.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TEXT_BORDER);
-		//
-		if (SWT.getPlatform().equals("motif") == false) //$NON-NLS-1$
-			toolkit.paintBordersFor(page);
-		Control[] children = page.getChildren();
-		Control control = children[children.length - 1];
-		gd = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL
-				| GridData.GRAB_VERTICAL);
-		gd.widthHint = 50;
-		gd.heightHint = 50;
-		control.setLayoutData(gd);
-
-		return page;
-	}
-
-	/**
-	 * @param toolkit
-	 * @param parent
-	 */
-	private Control createUrlsPage(FormToolkit toolkit, Composite parent) {
-		Composite page = toolkit.createComposite(parent);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.makeColumnsEqualWidth = true;
-		layout.marginWidth = 2;
-		layout.marginHeight = 5;
-		layout.verticalSpacing = 8;
-		page.setLayout(layout);
-
-		URLSection urlSection = new URLSection(getPage(), page);
-		urlSection.getSection().setLayoutData(
-				new GridData(GridData.FILL_BOTH
-						| GridData.VERTICAL_ALIGN_BEGINNING));
-
-		URLDetailsSection urlDetailsSection = new URLDetailsSection(getPage(),
-				page);
-		urlDetailsSection.getSection().setLayoutData(
-				new GridData(GridData.FILL_HORIZONTAL
-						| GridData.VERTICAL_ALIGN_BEGINNING));
-
-		getManagedForm().addPart(urlSection);
-		getManagedForm().addPart(urlDetailsSection);
-		return page;
-	}
-
-	private void updateSelection(ISelection selection) {
-		getPage().getPDEEditor().setSelection(selection);
-	}
-
-	public boolean doGlobalAction(String actionId) {
-		if (actionId.equals(ActionFactory.CUT.getId())) {
-			fSourceViewer.doOperation(ITextOperationTarget.CUT);
-			return true;
-		} else if (actionId.equals(ActionFactory.COPY.getId())) {
-			fSourceViewer.doOperation(ITextOperationTarget.COPY);
-			return true;
-		} else if (actionId.equals(ActionFactory.PASTE.getId())) {
-			fSourceViewer.doOperation(ITextOperationTarget.PASTE);
-			return true;
-		} else if (actionId.equals(ActionFactory.DELETE.getId())) {
-			fSourceViewer.doOperation(ITextOperationTarget.DELETE);
-			return true;
-		} else if (actionId.equals(ActionFactory.UNDO.getId())) {
-			fSourceViewer.doOperation(ITextOperationTarget.UNDO);
-			return true;
-		} else if (actionId.equals(ActionFactory.REDO.getId())) {
-			fSourceViewer.doOperation(ITextOperationTarget.REDO);
-			return true;
-		}
-		return false;
-	}
-
-	public boolean setFormInput(Object input) {
-		if (input instanceof IFeatureInfo) {
-			IFeatureInfo info = (IFeatureInfo) input;
-			int index = info.getIndex();
-			if (index != -1)
-				fTabFolder.setSelection(index);
-			updateEditorInput(input, false);
-			return true;
-		}
-		if (input instanceof IFeatureURLElement
-				|| input instanceof NamedElement) {
-			fTabFolder.setSelection(3);
-			updateEditorInput(input, false);
-			return true;
-		}
-		return false;
-	}
-
-	private void handleApply() {
-		if (0 <= fElementIndex && fElementIndex < 3 && fElement != null) {
-			handleApply((IFeatureInfo) fElement, fTabFolder.getSelectionIndex());
-		} else {
-			handleApply(null, fTabFolder.getSelectionIndex());
-		}
-	}
-
-	private void handleApply(IFeatureInfo info, int index) {
-		if (index >= 3)
-			return;
-		String urlName = fUrlText.getText();
-		String text = fDocument.get();
-		if (info != null) {
-			applyInfoText(info, urlName, text, index);
-			updateTabImage(fTabFolder.getSelection());
-		}
-	}
-
-	private void applyInfoText(IFeatureInfo targetInfo, String urlText,
-			String text, int index) {
-		String url = null;
-
-		if (urlText.length() > 0) {
-			url = urlText;
-		}
-		try {
-			IFeatureModel model = (IFeatureModel) getPage().getModel();
-			IFeature feature = model.getFeature();
-			IFeatureInfo info = targetInfo;
-
-			if (info == null) {
-				info = feature.getFeatureInfo(index);
-			}
-
-			if (targetInfo == null && info == null) {
-				info = model.getFactory().createInfo(index);
-				feature.setFeatureInfo(info, index);
-			}
-			info.setURL(url);
-			info.setDescription(text);
-		} catch (CoreException e) {
-		}
-	}
-
-	protected void fillContextMenu(IMenuManager manager) {
-		getPage().getPDEEditor().getContributor().contextMenuAboutToShow(
-				manager);
-	}
-
-	public void initialize() {
-		IFeatureModel featureModel = (IFeatureModel) getPage().getModel();
-		fDocument.addDocumentListener(new IDocumentListener() {
-			public void documentChanged(DocumentEvent e) {
-				infoModified();
-			}
-
-			public void documentAboutToBeChanged(DocumentEvent e) {
-			}
-		});
-		fUrlText.setEditable(featureModel.isEditable());
-		fSourceViewer.getTextWidget().setEditable(featureModel.isEditable());
-		featureModel.addModelChangedListener(this);
-		updateEditorInput(featureModel.getFeature().getFeatureInfo(0), false);
-	}
-
-	public void dispose() {
-		IFeatureModel featureModel = (IFeatureModel) getPage().getModel();
-		if (featureModel != null)
-			featureModel.removeModelChangedListener(this);
-		super.dispose();
-	}
-
-	private void infoModified() {
-		IFeatureModel featureModel = (IFeatureModel) getPage().getModel();
-		if (!fIgnoreChange && featureModel instanceof IEditable) {
-			markDirty();
-		}
-	}
-
-	public void modelChanged(IModelChangedEvent e) {
-		if (e.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			markStale();
-		}
-	}
-
-	public void refresh() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		int index = fTabFolder.getSelectionIndex();
-		if (index < 3) {
-			IFeatureInfo info = model.getFeature().getFeatureInfo(index);
-			fElement = null;
-			fElementIndex = -1;
-			updateEditorInput(info, false);
-		}
-		super.refresh();
-	}
-
-	private void createTabs() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		IFeature feature = model.getFeature();
-		addTab(PDEUIMessages.FeatureEditor_info_description, feature
-				.getFeatureInfo(0));
-		addTab(PDEUIMessages.FeatureEditor_info_copyright, feature
-				.getFeatureInfo(1));
-		addTab(PDEUIMessages.FeatureEditor_info_license, feature
-				.getFeatureInfo(2));
-		addTab(PDEUIMessages.FeatureEditor_info_discoveryUrls, null);
-	}
-
-	private void addTab(String label, IFeatureInfo info) {
-		CTabItem item = new CTabItem(fTabFolder, SWT.NULL);
-		item.setText(label);
-		item.setData(info);
-		updateTabImage(item);
-	}
-
-	private void updateTabImage(CTabItem item) {
-		if (item == null)
-			return;
-		Object info = (IFeatureInfo) item.getData();
-		if (info != null) {
-			item.setImage(PDEPlugin.getDefault().getLabelProvider().getImage(
-					info));
-		} else {
-			item.setImage(PDEPlugin.getDefault().getLabelProvider().get(
-					PDEPluginImages.DESC_DOC_SECTION_OBJ));
-		}
-	}
-
-	private void updateTabSelection() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		IFeature feature = model.getFeature();
-		int index = fTabFolder.getSelectionIndex();
-		if (index < 3) {
-			IFeatureInfo info = feature.getFeatureInfo(index);
-			updateEditorInput(info, true);
-		}
-		Control oldPage = fNotebookLayout.topControl;
-		if (index < 3)
-			fNotebookLayout.topControl = fInfoPage;
-		else
-			fNotebookLayout.topControl = fUrlsPage;
-		if (oldPage != fNotebookLayout.topControl)
-			fNotebook.layout();
-	}
-
-	public void setFocus() {
-		fSourceViewer.getTextWidget().setFocus();
-		updateSelection(fSourceViewer.getSelection());
-	}
-
-	private void commitPrevious() {
-		IFeatureInfo previous = (IFeatureInfo) fElement;
-		handleApply(previous, fElementIndex);
-	}
-
-	public void updateEditorInput(Object input, boolean commitPrevious) {
-		if (isDirty() && commitPrevious /*
-										 * && element != null && element !=
-										 * input
-										 */) {
-			commitPrevious();
-		}
-		fIgnoreChange = true;
-		String text = ""; //$NON-NLS-1$
-		String url = null;
-		if (input instanceof IFeatureInfo) {
-			IFeatureInfo info = (IFeatureInfo) input;
-			text = info.getDescription();
-			url = info.getURL();
-		}
-		if (text == null)
-			text = ""; //$NON-NLS-1$
-		else
-			text = TextUtil.createMultiLine(text, 60, false);
-		fDocument.set(text);
-		if (url == null)
-			fUrlText.setText(""); //$NON-NLS-1$
-		else
-			fUrlText.setText(url.toString());
-		fElement = input;
-		fElementIndex = fTabFolder.getSelectionIndex();
-
-		Control oldPage = fNotebookLayout.topControl;
-		if (input instanceof IFeatureURLElement
-				|| input instanceof NamedElement) {
-			fNotebookLayout.topControl = fUrlsPage;
-		} else {
-			fNotebookLayout.topControl = fInfoPage;
-		}
-		if (oldPage != fNotebookLayout.topControl)
-			fNotebook.layout();
-
-		fIgnoreChange = false;
-	}
-
-	public boolean canPaste(Clipboard clipboard) {
-		return fSourceViewer.canDoOperation(ITextOperationTarget.PASTE);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/InstallSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/InstallSection.java
deleted file mode 100644
index c7f34f2..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/InstallSection.java
+++ /dev/null

@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.ifeature.IFeature;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ui.editor.PDESection;
-import org.eclipse.pde.internal.ui.parts.FormEntry;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.RTFTransfer;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.dnd.TransferData;
-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.Label;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
-
-public class InstallSection extends PDESection {
-	private Button fExclusiveButton;
-
-	private FormEntry fColocationText;
-
-	private boolean fBlockNotification;
-
-	public InstallSection(FeatureAdvancedPage page, Composite parent) {
-		super(page, parent, Section.DESCRIPTION);
-		getSection().setText(PDEUIMessages.FeatureEditor_InstallSection_title);
-		getSection().setDescription(PDEUIMessages.FeatureEditor_InstallSection_desc);
-		createClient(getSection(), page.getManagedForm().getToolkit());
-	}
-
-	public boolean canPaste(Clipboard clipboard) {
-		TransferData[] types = clipboard.getAvailableTypes();
-		Transfer[] transfers = new Transfer[] { TextTransfer.getInstance(),
-				RTFTransfer.getInstance() };
-		for (int i = 0; i < types.length; i++) {
-			for (int j = 0; j < transfers.length; j++) {
-				if (transfers[j].isSupportedType(types[i]))
-					return true;
-			}
-		}
-		return false;
-	}
-
-	public void commit(boolean onSave) {
-		fColocationText.commit();
-		super.commit(onSave);
-	}
-
-	public void createClient(Section section, FormToolkit toolkit) {
-		Composite container = toolkit.createComposite(section);
-		TableWrapLayout layout = new TableWrapLayout();
-		layout.numColumns = 2;
-		layout.verticalSpacing = 5;
-		layout.horizontalSpacing = 6;
-		container.setLayout(layout);
-
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		final IFeature feature = model.getFeature();
-
-		fExclusiveButton = toolkit.createButton(container, PDEUIMessages.FeatureEditor_InstallSection_exclusive, SWT.CHECK);
-		TableWrapData gd = new TableWrapData(TableWrapData.FILL);
-		gd.colspan = 2;
-		fExclusiveButton.setLayoutData(gd);
-		fExclusiveButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				try {
-					if (!fBlockNotification)
-						feature.setExclusive(fExclusiveButton.getSelection());
-				} catch (CoreException ex) {
-					PDEPlugin.logException(ex);
-				}
-			}
-		});
-
-		Label colocationDescLabel = toolkit.createLabel(container,
-				PDEUIMessages.FeatureEditor_InstallSection_colocation_desc, SWT.WRAP);
-		gd = new TableWrapData(TableWrapData.FILL);
-		gd.colspan = 2;
-		colocationDescLabel.setLayoutData(gd);
-
-		fColocationText = new FormEntry(container, toolkit, PDEUIMessages.FeatureEditor_InstallSection_colocation, null, false);
-		fColocationText.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry text) {
-				IFeatureModel model = (IFeatureModel) getPage().getModel();
-				IFeature feature = model.getFeature();
-				try {
-					feature.setColocationAffinity(fColocationText.getValue());
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		});
-
-		toolkit.paintBordersFor(container);
-		section.setClient(container);
-		initialize();
-	}
-
-	public void dispose() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		if (model != null)
-			model.removeModelChangedListener(this);
-		super.dispose();
-	}
-
-	public void initialize() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		refresh();
-		if (model.isEditable() == false) {
-			fColocationText.getText().setEditable(false);
-			fExclusiveButton.setEnabled(false);
-		}
-		model.addModelChangedListener(this);
-	}
-
-	public void modelChanged(IModelChangedEvent e) {
-		if (e.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			markStale();
-		}
-	}
-
-	public void setFocus() {
-		if (fExclusiveButton != null)
-			fExclusiveButton.setFocus();
-	}
-
-	public void refresh() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		IFeature feature = model.getFeature();
-		fColocationText.setValue(
-				feature.getColocationAffinity() != null ? feature
-						.getColocationAffinity() : "", true); //$NON-NLS-1$
-		fBlockNotification = true;
-		fExclusiveButton.setSelection(feature.isExclusive());
-		fBlockNotification = false;
-		super.refresh();
-	}
-
-	public void cancelEdit() {
-		fColocationText.cancelEdit();
-		super.cancelEdit();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/OpenReferenceAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/OpenReferenceAction.java
deleted file mode 100644
index d60783e..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/OpenReferenceAction.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.pde.internal.core.feature.FeatureChild;
-import org.eclipse.pde.internal.core.feature.FeaturePlugin;
-import org.eclipse.pde.internal.core.ifeature.IFeature;
-import org.eclipse.pde.internal.core.ifeature.IFeatureChild;
-import org.eclipse.pde.internal.core.ifeature.IFeatureData;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.plugin.ManifestEditor;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.SelectionProviderAction;
-import org.eclipse.ui.ide.IDE;
-
-public class OpenReferenceAction extends SelectionProviderAction {
-	public OpenReferenceAction(ISelectionProvider provider) {
-	super(provider, PDEUIMessages.Actions_open_label);
-}
-
-	public void run() {
-		IStructuredSelection sel = (IStructuredSelection) getSelection();
-		Object obj = sel.getFirstElement();
-		
-		if (obj instanceof FeaturePlugin) {
-			FeaturePlugin reference = (FeaturePlugin) obj;
-			String pluginId = reference.getId();
-			ManifestEditor.openPluginEditor(pluginId);
-		} else if (obj instanceof IFeatureData) {
-			IFeatureData data = (IFeatureData) obj;
-			String id = data.getId();
-			IResource resource = data.getModel().getUnderlyingResource();
-			if (resource != null) {
-				IProject project = resource.getProject();
-				IFile file = project.getFile(id);
-				if (file != null && file.exists()) {
-					IWorkbenchPage page = PDEPlugin.getActivePage();
-					try {
-						IDE.openEditor(page, file, true);
-					} catch (PartInitException e) {
-					}
-				}
-			}
-		} else if (obj instanceof IFeatureChild) {
-			IFeatureChild included = (IFeatureChild) obj;
-			IFeature feature = ((FeatureChild) included).getReferencedFeature();
-			FeatureEditor.openFeatureEditor(feature);
-		}
-	}
-
-	public void selectionChanged(IStructuredSelection selection) {
-	setEnabled(!selection.isEmpty());
-}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PluginDetailsSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PluginDetailsSection.java
deleted file mode 100644
index e4d365c..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PluginDetailsSection.java
+++ /dev/null

@@ -1,229 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.core.ifeature.IFeaturePlugin;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.PDESection;
-import org.eclipse.pde.internal.ui.parts.FormEntry;
-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.ui.forms.IFormPart;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.IPartSelectionListener;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-public class PluginDetailsSection extends PDESection implements IFormPart,
-		IPartSelectionListener {
-	protected IFeaturePlugin fInput;
-
-	private FormEntry fNameText;
-
-	private FormEntry fdownloadSizeText;
-
-	private FormEntry fInstallSizeText;
-
-	private Button fUnpackButton;
-
-	private boolean fBlockNotification;
-
-	public PluginDetailsSection(PDEFormPage page, Composite parent) {
-		this(page, parent, PDEUIMessages.SiteEditor_PluginDetailsSection_title,
-				PDEUIMessages.SiteEditor_PluginDetailsSection_desc, SWT.NULL);
-	}
-
-	public PluginDetailsSection(PDEFormPage page, Composite parent,
-			String title, String desc, int toggleStyle) {
-		super(page, parent, Section.DESCRIPTION | toggleStyle);
-		getSection().setText(title);
-		getSection().setDescription(desc);
-		createClient(getSection(), page.getManagedForm().getToolkit());
-	}
-
-	public void cancelEdit() {
-		fdownloadSizeText.cancelEdit();
-		fInstallSizeText.cancelEdit();
-		super.cancelEdit();
-	}
-
-	public void commit(boolean onSave) {
-		fdownloadSizeText.commit();
-		fInstallSizeText.commit();
-		super.commit(onSave);
-	}
-
-	public void createClient(Section section, FormToolkit toolkit) {
-		Composite container = toolkit.createComposite(section);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.verticalSpacing = 5;
-		layout.horizontalSpacing = 6;
-		container.setLayout(layout);
-
-		fNameText = new FormEntry(container, toolkit, PDEUIMessages.SiteEditor_PluginDetailsSection_pluginLabel, null, false);
-		limitTextWidth(fNameText);
-		fNameText.setEditable(false);
-		fNameText.getText().setEnabled(false);
-
-		fdownloadSizeText = new FormEntry(container, toolkit, PDEUIMessages.SiteEditor_PluginDetailsSection_downloadSize, null, false);
-		fdownloadSizeText.setFormEntryListener(new FormEntryAdapter(this) {
-
-			public void textValueChanged(FormEntry text) {
-				if (fInput != null)
-					try {
-						fInput.setDownloadSize(getLong(text.getValue()));
-					} catch (CoreException e) {
-						PDEPlugin.logException(e);
-					}
-			}
-		});
-		limitTextWidth(fdownloadSizeText);
-		fdownloadSizeText.setEditable(isEditable());
-
-		fInstallSizeText = new FormEntry(container, toolkit, PDEUIMessages.SiteEditor_PluginDetailsSection_installSize, null, false);
-		fInstallSizeText.setFormEntryListener(new FormEntryAdapter(this) {
-
-			public void textValueChanged(FormEntry text) {
-				if (fInput != null)
-					try {
-						fInput.setInstallSize(getLong(text.getValue()));
-					} catch (CoreException e) {
-						PDEPlugin.logException(e);
-					}
-			}
-		});
-		limitTextWidth(fInstallSizeText);
-		fInstallSizeText.setEditable(isEditable());
-
-		fUnpackButton = toolkit.createButton(container, PDEUIMessages.SiteEditor_PluginDetailsSection_unpack, SWT.CHECK);
-		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gd.horizontalSpan = 2;
-		fUnpackButton.setLayoutData(gd);
-		fUnpackButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				try {
-					if (!fBlockNotification)
-						fInput.setUnpack(fUnpackButton.getSelection());
-				} catch (CoreException ex) {
-					PDEPlugin.logException(ex);
-				}
-			}
-		});
-
-		toolkit.paintBordersFor(container);
-		section.setClient(container);
-	}
-
-	public void dispose() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		if (model != null)
-			model.removeModelChangedListener(this);
-		super.dispose();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.forms.AbstractFormPart#initialize(org.eclipse.ui.forms.IManagedForm)
-	 */
-	public void initialize(IManagedForm form) {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		if (model != null)
-			model.addModelChangedListener(this);
-		super.initialize(form);
-	}
-
-	protected void limitTextWidth(FormEntry entry) {
-		GridData gd = (GridData) entry.getText().getLayoutData();
-		gd.widthHint = 30;
-	}
-
-	public void modelChanged(IModelChangedEvent e) {
-		markStale();
-	}
-
-	public void refresh() {
-		update();
-		super.refresh();
-	}
-
-	public void selectionChanged(IFormPart part, ISelection selection) {
-		if (selection instanceof IStructuredSelection && !selection.isEmpty()) {
-			Object o = ((IStructuredSelection) selection).getFirstElement();
-			if (o instanceof IFeaturePlugin) {
-				fInput = (IFeaturePlugin) o;
-			} else {
-				fInput = null;
-			}
-		} else
-			fInput = null;
-		update();
-	}
-
-	public void setFocus() {
-		if (fdownloadSizeText != null)
-			fdownloadSizeText.getText().setFocus();
-	}
-
-	private void update() {
-		if (fInput != null) {
-			fNameText.setValue(fInput.getLabel());
-			fdownloadSizeText
-					.setValue(
-							fInput.getDownloadSize() >= 0 ? "" + fInput.getDownloadSize() : null, true); //$NON-NLS-1$
-			fInstallSizeText
-					.setValue(
-							fInput.getInstallSize() >= 0 ? "" + fInput.getInstallSize() : null, true); //$NON-NLS-1$
-			fBlockNotification = true;
-			fUnpackButton.setSelection(fInput.isUnpack());
-			fBlockNotification = false;
-
-		} else {
-			fNameText.setValue(null);
-			fdownloadSizeText.setValue(null, true); 
-			fInstallSizeText.setValue(null, true); 
-			fBlockNotification = true;
-			fUnpackButton.setSelection(true);
-			fBlockNotification = false;
-		}
-		fdownloadSizeText.setEditable(fInput != null && isEditable());
-		fInstallSizeText.setEditable(fInput != null && isEditable());
-		fUnpackButton.setEnabled(fInput != null && isEditable());
-	}
-
-	public boolean isEditable() {
-		return getPage().getPDEEditor().getAggregateModel().isEditable();
-	}
-
-	private long getLong(String svalue) {
-		if (svalue == null)
-			return 0;
-		try {
-			return Long.parseLong(svalue);
-		} catch (NumberFormatException e) {
-			return 0;
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PluginPortabilitySection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PluginPortabilitySection.java
deleted file mode 100644
index e93c71f..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PluginPortabilitySection.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-
-public class PluginPortabilitySection extends DataPortabilitySection {
-	public PluginPortabilitySection(PDEFormPage page, Composite parent) {
-		super(page, parent, PDEUIMessages.FeatureEditor_PluginPortabilitySection_title,
-				PDEUIMessages.FeatureEditor_PluginPortabilitySection_desc, SWT.NULL);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PluginReference.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PluginReference.java
deleted file mode 100644
index 7f398ef..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PluginReference.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.ifeature.*;
-
-
-public class PluginReference {
-	private IFeaturePlugin reference;
-	private IPluginModelBase model;
-	private boolean fragment;
-
-public PluginReference(IFeaturePlugin reference, IPluginModelBase model) {
-	this.reference = reference;
-	this.model = model;
-}
-public IPluginModelBase getModel() {
-	return model;
-}
-public IFeaturePlugin getReference() {
-	return reference;
-}
-public boolean isFragment() {
-	return fragment;
-}
-public boolean isInSync() {
-	if (model == null)
-		return false;
-	if (reference==null) return true;
-	if (!reference.getId().equals(model.getPluginBase().getId()))
-		return false;
-	if (!reference.getVersion().equals(model.getPluginBase().getVersion()))
-		return false;
-	return true;
-}
-public boolean isUnresolved() {
-	return false;
-}
-public void setFragment(boolean newFragment) {
-	fragment = newFragment;
-}
-public void setModel(IPluginModelBase newModel) {
-	model = newModel;
-}
-public void setReference(IFeaturePlugin newReference) {
-	reference = newReference;
-}
-	public String toString() {
-		String name = model.getPluginBase().getName();
-		return model.getResourceString(name);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PluginSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PluginSection.java
deleted file mode 100644
index a2b5706..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PluginSection.java
+++ /dev/null

@@ -1,447 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.pde.core.IModel;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.core.plugin.IPluginBase;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.IPluginModelListener;
-import org.eclipse.pde.internal.core.ModelEntry;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.PluginModelDelta;
-import org.eclipse.pde.internal.core.PluginModelManager;
-import org.eclipse.pde.internal.core.feature.FeaturePlugin;
-import org.eclipse.pde.internal.core.ifeature.IFeature;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.core.ifeature.IFeaturePlugin;
-import org.eclipse.pde.internal.core.util.CoreUtility;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.ModelDataTransfer;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.TableSection;
-import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
-import org.eclipse.pde.internal.ui.parts.TablePart;
-import org.eclipse.pde.internal.ui.wizards.ListUtil;
-import org.eclipse.pde.internal.ui.wizards.PluginSelectionDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-public class PluginSection extends TableSection implements
-		IPluginModelListener {
-	private OpenReferenceAction fOpenAction;
-
-	private TableViewer fPluginViewer;
-
-	private Action fNewAction;
-
-	private Action fDeleteAction;
-
-	class PluginContentProvider extends DefaultContentProvider implements
-			IStructuredContentProvider {
-		public Object[] getElements(Object parent) {
-			if (parent instanceof IFeature) {
-				return ((IFeature) parent).getPlugins();
-			}
-			return new Object[0];
-		}
-	}
-
-	public PluginSection(PDEFormPage page, Composite parent) {
-		super(page, parent, Section.DESCRIPTION, new String[] {
-				PDEUIMessages.FeatureEditor_PluginSection_new, null,
-				PDEUIMessages.FeatureEditor_SpecSection_synchronize });
-		getSection().setText(PDEUIMessages.FeatureEditor_PluginSection_pluginTitle);
-		getSection().setDescription(PDEUIMessages.FeatureEditor_PluginSection_pluginDesc);
-		getTablePart().setEditable(false);
-	}
-
-	public void commit(boolean onSave) {
-		super.commit(onSave);
-	}
-
-	public void createClient(Section section, FormToolkit toolkit) {
-		Composite container = createClientContainer(section, 2, toolkit);
-		GridLayout layout = (GridLayout) container.getLayout();
-		layout.verticalSpacing = 5;
-
-		createViewerPartControl(container, SWT.SINGLE, 2, toolkit);
-		TablePart tablePart = getTablePart();
-		fPluginViewer = tablePart.getTableViewer();
-		fPluginViewer.setContentProvider(new PluginContentProvider());
-		fPluginViewer.setLabelProvider(PDEPlugin.getDefault()
-				.getLabelProvider());
-		fPluginViewer.setSorter(ListUtil.NAME_SORTER);
-		toolkit.paintBordersFor(container);
-		makeActions();
-		section.setClient(container);
-
-		initialize();
-	}
-
-	protected void handleDoubleClick(IStructuredSelection selection) {
-		fOpenAction.run();
-	}
-
-	protected void buttonSelected(int index) {
-		if (index == 0)
-			handleNew();
-		if (index == 2)
-			handleSynchronize();
-	}
-
-	public void dispose() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		if (model != null)
-			model.removeModelChangedListener(this);
-		PluginModelManager mng = PDECore.getDefault().getModelManager();
-		mng.removePluginModelListener(this);
-		super.dispose();
-	}
-
-	public boolean setFormInput(Object object) {
-		if (object instanceof IFeaturePlugin) {
-			fPluginViewer.setSelection(new StructuredSelection(object), true);
-			return true;
-		}
-		return false;
-	}
-
-	protected void fillContextMenu(IMenuManager manager) {
-		manager.add(fOpenAction);
-		// add new
-		manager.add(new Separator());
-		manager.add(fNewAction);
-		manager.add(fDeleteAction);
-		// add delete
-
-		getPage().getPDEEditor().getContributor().contextMenuAboutToShow(
-				manager);
-	}
-
-	private void handleNew() {
-		BusyIndicator.showWhile(fPluginViewer.getTable().getDisplay(),
-				new Runnable() {
-					public void run() {
-						IPluginModelBase[] allModels = PDECore.getDefault()
-								.getModelManager().getPlugins();
-						ArrayList newModels = new ArrayList();
-						for (int i = 0; i < allModels.length; i++) {
-							if (canAdd(allModels[i]))
-								newModels.add(allModels[i]);
-						}
-						IPluginModelBase[] candidateModels = (IPluginModelBase[]) newModels
-								.toArray(new IPluginModelBase[newModels.size()]);
-						PluginSelectionDialog dialog = new PluginSelectionDialog(
-								fPluginViewer.getTable().getShell(),
-								candidateModels, true);
-						if (dialog.open() == Window.OK) {
-							Object[] models = dialog.getResult();
-							try {
-								doAdd(models);
-							} catch (CoreException e) {
-								PDECore.log(e);
-							}
-						}
-					}
-				});
-	}
-
-	private void doAdd(Object[] candidates) throws CoreException {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		IFeature feature = model.getFeature();
-		IFeaturePlugin[] added = new IFeaturePlugin[candidates.length];
-		for (int i = 0; i < candidates.length; i++) {
-			IPluginModelBase candidate = (IPluginModelBase) candidates[i];
-			FeaturePlugin fplugin = (FeaturePlugin) model.getFactory()
-					.createPlugin();
-			fplugin.loadFrom(candidate.getPluginBase());
-			fplugin.setVersion("0.0.0"); //$NON-NLS-1$
-			fplugin.setUnpack(CoreUtility.guessUnpack(candidate
-					.getBundleDescription()));
-			added[i] = fplugin;
-		}
-		feature.addPlugins(added);
-	}
-    
-	private boolean canAdd(IPluginModelBase candidate) {
-		IPluginBase plugin = candidate.getPluginBase();
-
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		IFeaturePlugin[] fplugins = model.getFeature().getPlugins();
-
-		for (int i = 0; i < fplugins.length; i++) {
-			if (fplugins[i].getId().equals(plugin.getId()))
-				return false;
-		}
-		return true;
-	}
-	
-	private void handleSelectAll() {
-		IStructuredContentProvider provider = (IStructuredContentProvider) fPluginViewer
-				.getContentProvider();
-		Object[] elements = provider.getElements(fPluginViewer.getInput());
-		StructuredSelection ssel = new StructuredSelection(elements);
-		fPluginViewer.setSelection(ssel);
-	}
-
-	private void handleDelete() {
-		IStructuredSelection ssel = (IStructuredSelection) fPluginViewer
-				.getSelection();
-
-		if (ssel.isEmpty())
-			return;
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		if (!model.isEditable()) {
-			return;
-		}
-		IFeature feature = model.getFeature();
-
-		try {
-			IFeaturePlugin[] removed = new IFeaturePlugin[ssel.size()];
-			int i = 0;
-			for (Iterator iter = ssel.iterator(); iter.hasNext();) {
-				IFeaturePlugin iobj = (IFeaturePlugin) iter.next();
-				removed[i++] = iobj;
-			}
-			feature.removePlugins(removed);
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	private void handleSynchronize() {
-		final FeatureEditorContributor contributor = (FeatureEditorContributor) getPage()
-				.getPDEEditor().getContributor();
-		BusyIndicator.showWhile(fPluginViewer.getControl().getDisplay(),
-				new Runnable() {
-					public void run() {
-						contributor.getSynchronizeAction().run();
-					}
-				});
-	}
-
-	public boolean doGlobalAction(String actionId) {
-		if (actionId.equals(ActionFactory.DELETE.getId())) {
-			BusyIndicator.showWhile(fPluginViewer.getTable().getDisplay(),
-					new Runnable() {
-						public void run() {
-							handleDelete();
-						}
-					});
-			return true;
-		}
-		if (actionId.equals(ActionFactory.CUT.getId())) {
-			// delete here and let the editor transfer
-			// the selection to the clipboard
-			handleDelete();
-			return false;
-		}
-		if (actionId.equals(ActionFactory.PASTE.getId())) {
-			doPaste();
-			return true;
-		}
-		if (actionId.equals(ActionFactory.SELECT_ALL.getId())) {
-			BusyIndicator.showWhile(fPluginViewer.getTable().getDisplay(),
-					new Runnable() {
-						public void run() {
-							handleSelectAll();
-						}
-					});
-			return true;
-		}
-		return false;
-	}
-
-	protected void selectionChanged(IStructuredSelection selection) {
-		getPage().getPDEEditor().setSelection(selection);
-	}
-
-	public void initialize() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		refresh();
-		getTablePart().setButtonEnabled(0, model.isEditable());
-		getTablePart().setButtonEnabled(2, model.isEditable());
-		model.addModelChangedListener(this);
-		PluginModelManager mng = PDECore.getDefault()
-				.getModelManager();
-		mng.addPluginModelListener(this);
-	}
-
-	public void modelChanged(IModelChangedEvent e) {
-		if (e.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			markStale();
-			return;
-		}
-		Object obj = e.getChangedObjects()[0];
-		if (obj instanceof IFeaturePlugin) {
-			if (e.getChangeType() == IModelChangedEvent.CHANGE) {
-				fPluginViewer.update(obj, null);
-			} else if (e.getChangeType() == IModelChangedEvent.INSERT) {
-				fPluginViewer.add(e.getChangedObjects());
-				if (e.getChangedObjects().length > 0) {
-					fPluginViewer.setSelection(new StructuredSelection(e
-							.getChangedObjects()[0]));
-				}
-			} else if (e.getChangeType() == IModelChangedEvent.REMOVE) {
-				fPluginViewer.remove(e.getChangedObjects());
-			}
-		}
-	}
-
-	private void makeActions() {
-		IModel model = (IModel) getPage().getModel();
-		fNewAction = new Action() {
-			public void run() {
-				handleNew();
-			}
-		};
-		fNewAction.setText(PDEUIMessages.Menus_new_label);
-		fNewAction.setEnabled(model.isEditable());
-
-		fDeleteAction = new Action() {
-			public void run() {
-				BusyIndicator.showWhile(fPluginViewer.getTable().getDisplay(),
-						new Runnable() {
-							public void run() {
-								handleDelete();
-							}
-						});
-			}
-		};
-		fDeleteAction.setText(PDEUIMessages.Actions_delete_label);
-		fDeleteAction.setEnabled(model.isEditable());
-		fOpenAction = new OpenReferenceAction(fPluginViewer);
-	}
-
-	public void modelsChanged(final PluginModelDelta delta) {
-		getSection().getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				if (getSection().isDisposed()) {
-					return;
-				}
-				ModelEntry[] added = delta.getAddedEntries();
-				ModelEntry[] removed = delta.getRemovedEntries();
-				ModelEntry[] changed = delta.getChangedEntries();
-				if (hasPluginModels(added) || hasPluginModels(removed)
-						|| hasPluginModels(changed))
-					markStale();
-			}
-		});
-	}
-
-	private boolean hasPluginModels(ModelEntry[] entries) {
-		if (entries == null)
-			return false;
-		return true;
-	}
-
-	public void setFocus() {
-		if (fPluginViewer != null)
-			fPluginViewer.getTable().setFocus();
-	}
-
-	public void refresh() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		IFeature feature = model.getFeature();
-		fPluginViewer.setInput(feature);
-		super.refresh();
-	}
-
-	/**
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#canPaste(Clipboard)
-	 */
-	public boolean canPaste(Clipboard clipboard) {
-		Object[] objects = (Object[]) clipboard.getContents(ModelDataTransfer
-				.getInstance());
-		if (objects != null && objects.length > 0) {
-			return canPaste(null, objects);
-		}
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#canPaste(Object,
-	 *      Object[])
-	 */
-	protected boolean canPaste(Object target, Object[] objects) {
-		for (int i = 0; i < objects.length; i++) {
-			if (!(objects[i] instanceof FeaturePlugin))
-				return false;
-		}
-		return true;
-	}
-
-	/**
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#doPaste()
-	 */
-	protected void doPaste() {
-		Clipboard clipboard = getPage().getPDEEditor().getClipboard();
-		Object[] objects = (Object[]) clipboard.getContents(ModelDataTransfer
-				.getInstance());
-		if (objects != null && canPaste(null, objects))
-			doPaste(null, objects);
-	}
-
-	/**
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#doPaste(Object,
-	 *      Object[])
-	 */
-	protected void doPaste(Object target, Object[] objects) {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		if (!model.isEditable()) {
-			return;
-		}
-		IFeature feature = model.getFeature();
-		FeaturePlugin[] fPlugins = new FeaturePlugin[objects.length];
-		try {
-			for (int i = 0; i < objects.length; i++) {
-				FeaturePlugin fPlugin = (FeaturePlugin) objects[i];
-				fPlugin.setModel(model);
-				fPlugin.setParent(feature);
-				fPlugins[i] = fPlugin;
-			}
-			feature.addPlugins(fPlugins);
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	void fireSelection() {
-		ISelection sel = fPluginViewer.getSelection();
-		if (!sel.isEmpty()) {
-			fPluginViewer.setSelection(fPluginViewer.getSelection());
-		} else if (fPluginViewer.getElementAt(0) != null) {
-			fPluginViewer.setSelection(new StructuredSelection(fPluginViewer
-					.getElementAt(0)));
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PortabilityChoicesDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PortabilityChoicesDialog.java
deleted file mode 100644
index 5f2b397..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PortabilityChoicesDialog.java
+++ /dev/null

@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.elements.DefaultTableProvider;
-import org.eclipse.pde.internal.ui.parts.WizardCheckboxTablePart;
-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.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-public class PortabilityChoicesDialog extends Dialog {
-	private String value;
-	private Choice[] choices;
-	private CheckboxTableViewer choiceViewer;
-	private WizardCheckboxTablePart checkboxTablePart;
-
-	class ContentProvider extends DefaultTableProvider {
-		public Object[] getElements(Object parent) {
-			return choices;
-		}
-	}
-
-	class ChoiceLabelProvider
-		extends LabelProvider
-		implements ITableLabelProvider {
-		public String getColumnText(Object obj, int index) {
-			return ((Choice) obj).getLabel();
-		}
-
-		public Image getColumnImage(Object obj, int index) {
-			return null;
-		}
-	}
-
-	public PortabilityChoicesDialog(
-		Shell shell,
-		Choice[] choices,
-		String value) {
-		super(shell);
-		this.value = value;
-		this.choices = choices;
-		
-		checkboxTablePart = new WizardCheckboxTablePart(PDEUIMessages.FeatureEditor_PortabilityChoicesDialog_choices);
-	}
-
-	protected void createButtonsForButtonBar(Composite parent) {
-		// create OK and Cancel buttons by default
-		createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-		createButton(
-			parent,
-			IDialogConstants.CANCEL_ID,
-			IDialogConstants.CANCEL_LABEL,
-			false);
-	}
-
-	protected Control createDialogArea(Composite parent) {
-		Composite container = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginWidth = layout.marginHeight = 9;
-		container.setLayout(layout);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		container.setLayoutData(gd);
-		
-		checkboxTablePart.createControl(container);
-		choiceViewer = checkboxTablePart.getTableViewer();
-		choiceViewer.setContentProvider(new ContentProvider());
-		choiceViewer.setLabelProvider(new ChoiceLabelProvider());
-
-		gd = (GridData)checkboxTablePart.getControl().getLayoutData();
-		gd.widthHint = 300;
-		gd.heightHint = 350;
-
-		Dialog.applyDialogFont(parent);
-		initialize();
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(container, IHelpContextIds.FEATURE_PORTABILITY_WIZARD);
-		return container;
-	}
-	public String getValue() {
-		return value;
-	}
-
-	protected void initialize() {
-		choiceViewer.setInput(PDEPlugin.getDefault());
-
-		if (value != null) {
-			Vector selected = new Vector();
-			StringTokenizer stok = new StringTokenizer(value, ","); //$NON-NLS-1$
-			while (stok.hasMoreElements()) {
-				String tok = stok.nextToken();
-				Choice choice = findChoice(tok);
-				if (choice != null)
-					selected.add(choice);
-			}
-			checkboxTablePart.setSelection(selected.toArray());
-		}
-		else 
-			checkboxTablePart.selectAll(false);
-	}
-
-	private Choice findChoice(String value) {
-		for (int i = 0; i < choices.length; i++) {
-			Choice choice = choices[i];
-			if (choice.getValue().equalsIgnoreCase(value))
-				return choice;
-		}
-		return null;
-	}
-
-	protected void okPressed() {
-		value = computeNewValue();
-		super.okPressed();
-	}
-
-	private String computeNewValue() {
-		Object[] checked = checkboxTablePart.getSelection();
-		if (checked.length == 0)
-			return ""; //$NON-NLS-1$
-		StringBuffer buf = new StringBuffer();
-		for (int i = 0; i < checked.length; i++) {
-			Choice choice = (Choice) checked[i];
-			if (i > 0)
-				buf.append(","); //$NON-NLS-1$
-			buf.append(choice.getValue());
-		}
-		return buf.toString();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PortabilitySection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PortabilitySection.java
deleted file mode 100644
index c3f56fe..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/PortabilitySection.java
+++ /dev/null

@@ -1,327 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import java.util.Locale;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.window.Window;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.ifeature.IEnvironment;
-import org.eclipse.pde.internal.core.ifeature.IFeature;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.PDESection;
-import org.eclipse.pde.internal.ui.parts.FormEntry;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.RTFTransfer;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-public class PortabilitySection extends PDESection {
-	public static Choice[] getArchChoices() {
-		return getKnownChoices(Platform.knownOSArchValues());
-	}
-
-	private static Choice[] getKnownChoices(String[] values) {
-		Choice[] choices = new Choice[values.length];
-		for (int i = 0; i < choices.length; i++) {
-			choices[i] = new Choice(values[i], values[i]);
-		}
-		return choices;
-	}
-
-	public static Choice[] getNLChoices() {
-		Locale[] locales = Locale.getAvailableLocales();
-		Choice[] choices = new Choice[locales.length];
-		for (int i = 0; i < locales.length; i++) {
-			Locale locale = locales[i];
-			choices[i] = new Choice(locale.toString(), locale.toString()
-					+ " - " + locale.getDisplayName()); //$NON-NLS-1$
-		}
-		return choices;
-	}
-
-	public static Choice[] getOSChoices() {
-		return getKnownChoices(Platform.knownOSValues());
-	}
-
-	public static Choice[] getWSChoices() {
-		return getKnownChoices(Platform.knownWSValues());
-	}
-
-	private FormEntry fArchText;
-
-	private FormEntry fNlText;
-
-	private FormEntry fOsText;
-
-	private FormEntry fWsText;
-
-	public PortabilitySection(FeatureFormPage page, Composite parent) {
-		this(page, parent, PDEUIMessages.FeatureEditor_PortabilitySection_title,
-				PDEUIMessages.FeatureEditor_PortabilitySection_desc, SWT.NULL);
-	}
-
-	public PortabilitySection(PDEFormPage page, Composite parent, String title,
-			String desc, int toggleStyle) {
-		super(page, parent, Section.DESCRIPTION | toggleStyle);
-		getSection().setText(title);
-		getSection().setDescription(desc);
-		createClient(getSection(), page.getManagedForm().getToolkit());
-	}
-
-	private void applyValue(String property, String value) throws CoreException {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		IFeature feature = model.getFeature();
-		if (property.equals(IEnvironment.P_NL))
-			feature.setNL(value);
-		else if (property.equals(IEnvironment.P_OS))
-			feature.setOS(value);
-		else if (property.equals(IEnvironment.P_WS))
-			feature.setWS(value);
-		else if (property.equals(IEnvironment.P_ARCH))
-			feature.setArch(value);
-	}
-
-	public void cancelEdit() {
-		fOsText.cancelEdit();
-		fWsText.cancelEdit();
-		fNlText.cancelEdit();
-		fArchText.cancelEdit();
-		super.cancelEdit();
-	}
-
-	public boolean canPaste(Clipboard clipboard) {
-		TransferData[] types = clipboard.getAvailableTypes();
-		Transfer[] transfers = new Transfer[] { TextTransfer.getInstance(),
-				RTFTransfer.getInstance() };
-		for (int i = 0; i < types.length; i++) {
-			for (int j = 0; j < transfers.length; j++) {
-				if (transfers[j].isSupportedType(types[i]))
-					return true;
-			}
-		}
-		return false;
-	}
-
-	public void commit(boolean onSave) {
-		fOsText.commit();
-		fWsText.commit();
-		fNlText.commit();
-		fArchText.commit();
-		super.commit(onSave);
-	}
-
-	public void createClient(Section section, FormToolkit toolkit) {
-		Composite container = toolkit.createComposite(section);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		layout.verticalSpacing = 5;
-		layout.horizontalSpacing = 6;
-		container.setLayout(layout);
-
-		String editLabel = PDEUIMessages.FeatureEditor_PortabilitySection_edit;
-
-		fOsText = new FormEntry(container, toolkit, PDEUIMessages.FeatureEditor_PortabilitySection_os, editLabel, false);
-		fOsText.setFormEntryListener(new FormEntryAdapter(this) {
-
-			public void browseButtonSelected(FormEntry entry) {
-				BusyIndicator.showWhile(fOsText.getText().getDisplay(),
-						new Runnable() {
-							public void run() {
-								Choice[] choices = getOSChoices();
-								openPortabilityChoiceDialog(IEnvironment.P_OS,
-										fOsText, choices);
-							}
-						});
-			}
-
-			public void textValueChanged(FormEntry text) {
-				try {
-					applyValue(IEnvironment.P_OS, text.getValue());
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		});
-		limitTextWidth(fOsText);
-		fOsText.setEditable(isEditable());
-
-		fWsText = new FormEntry(container, toolkit, PDEUIMessages.FeatureEditor_PortabilitySection_ws, editLabel, false);
-		fWsText.setFormEntryListener(new FormEntryAdapter(this) {
-
-			public void browseButtonSelected(FormEntry entry) {
-				BusyIndicator.showWhile(fWsText.getText().getDisplay(),
-						new Runnable() {
-							public void run() {
-								Choice[] choices = getWSChoices();
-								openPortabilityChoiceDialog(IEnvironment.P_WS,
-										fWsText, choices);
-							}
-						});
-			}
-
-			public void textValueChanged(FormEntry text) {
-				try {
-					applyValue(IEnvironment.P_WS, text.getValue());
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		});
-		limitTextWidth(fWsText);
-		fWsText.setEditable(isEditable());
-
-		fNlText = new FormEntry(container, toolkit, PDEUIMessages.FeatureEditor_PortabilitySection_nl, editLabel, false);
-
-		fNlText.setFormEntryListener(new FormEntryAdapter(this) {
-
-			public void browseButtonSelected(FormEntry entry) {
-				BusyIndicator.showWhile(fNlText.getText().getDisplay(),
-						new Runnable() {
-							public void run() {
-								Choice[] choices = getNLChoices();
-								openPortabilityChoiceDialog(IEnvironment.P_NL,
-										fNlText, choices);
-							}
-						});
-			}
-
-			public void textValueChanged(FormEntry text) {
-				try {
-					applyValue(IEnvironment.P_NL, text.getValue());
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		});
-		limitTextWidth(fNlText);
-		fNlText.setEditable(isEditable());
-
-		fArchText = new FormEntry(container, toolkit, PDEUIMessages.FeatureEditor_PortabilitySection_arch, editLabel, false);
-		fArchText.setFormEntryListener(new FormEntryAdapter(this) {
-
-			public void browseButtonSelected(FormEntry entry) {
-				BusyIndicator.showWhile(fArchText.getText().getDisplay(),
-						new Runnable() {
-							public void run() {
-								Choice[] choices = getArchChoices();
-								openPortabilityChoiceDialog(
-										IEnvironment.P_ARCH, fArchText, choices);
-							}
-						});
-			}
-
-			public void textValueChanged(FormEntry text) {
-				try {
-					applyValue(IEnvironment.P_ARCH, text.getValue());
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-
-		});
-		limitTextWidth(fArchText);
-		fArchText.setEditable(isEditable());
-
-		toolkit.paintBordersFor(container);
-		section.setClient(container);
-	}
-
-	public void dispose() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		if (model != null)
-			model.removeModelChangedListener(this);
-		super.dispose();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.forms.AbstractFormPart#initialize(org.eclipse.ui.forms.IManagedForm)
-	 */
-	public void initialize(IManagedForm form) {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		if (model != null)
-			model.addModelChangedListener(this);
-		super.initialize(form);
-	}
-
-	private void limitTextWidth(FormEntry entry) {
-		GridData gd = (GridData) entry.getText().getLayoutData();
-		gd.widthHint = 30;
-	}
-
-	public void modelChanged(IModelChangedEvent e) {
-		markStale();
-	}
-
-	private void openPortabilityChoiceDialog(String property, FormEntry text,
-			Choice[] choices) {
-		String value = text.getValue();
-
-		PortabilityChoicesDialog dialog = new PortabilityChoicesDialog(
-				PDEPlugin.getActiveWorkbenchShell(), choices, value);
-		dialog.create();
-		dialog.getShell().setText(PDEUIMessages.FeatureEditor_PortabilityChoicesDialog_title);
-
-		int result = dialog.open();
-		if (result == Window.OK) {
-			value = dialog.getValue();
-			text.setValue(value);
-			try {
-				applyValue(property, value);
-			} catch (CoreException e) {
-				PDEPlugin.logException(e);
-			}
-		}
-	}
-
-	public void refresh() {
-		setValue(IEnvironment.P_OS);
-		setValue(IEnvironment.P_WS);
-		setValue(IEnvironment.P_ARCH);
-		setValue(IEnvironment.P_NL);
-		super.refresh();
-	}
-
-	public void setFocus() {
-		if (fOsText != null)
-			fOsText.getText().setFocus();
-	}
-
-	private void setValue(String property) {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		IFeature feature = model.getFeature();
-		if (property.equals(IEnvironment.P_NL))
-			fNlText.setValue(feature.getNL(), true);
-		else if (property.equals(IEnvironment.P_OS))
-			fOsText.setValue(feature.getOS(), true);
-		else if (property.equals(IEnvironment.P_WS))
-			fWsText.setValue(feature.getWS(), true);
-		else if (property.equals(IEnvironment.P_ARCH))
-			fArchText.setValue(feature.getArch(), true);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/RequiresSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/RequiresSection.java
deleted file mode 100644
index ff0d7c7..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/RequiresSection.java
+++ /dev/null

@@ -1,547 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.core.plugin.IPluginBase;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.IFeatureModelDelta;
-import org.eclipse.pde.internal.core.IFeatureModelListener;
-import org.eclipse.pde.internal.core.IPluginModelListener;
-import org.eclipse.pde.internal.core.ModelEntry;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.PluginModelDelta;
-import org.eclipse.pde.internal.core.feature.FeatureImport;
-import org.eclipse.pde.internal.core.ifeature.IFeature;
-import org.eclipse.pde.internal.core.ifeature.IFeatureImport;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.core.ifeature.IFeaturePlugin;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.ModelDataTransfer;
-import org.eclipse.pde.internal.ui.editor.TableSection;
-import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
-import org.eclipse.pde.internal.ui.parts.TablePart;
-import org.eclipse.pde.internal.ui.wizards.FeatureSelectionDialog;
-import org.eclipse.pde.internal.ui.wizards.ListUtil;
-import org.eclipse.pde.internal.ui.wizards.PluginSelectionDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-public class RequiresSection extends TableSection implements
-		IPluginModelListener, IFeatureModelListener {
-	private Button fSyncButton;
-
-	private TableViewer fPluginViewer;
-
-	private Action fDeleteAction;
-
-	class ImportContentProvider extends DefaultContentProvider implements
-			IStructuredContentProvider {
-		public Object[] getElements(Object parent) {
-			if (parent instanceof IFeature) {
-				IFeatureImport[] imports = ((IFeature) parent).getImports();
-				ArrayList displayable = new ArrayList();
-				for (int i = 0; i < imports.length; i++) {
-					if (imports[i].isPatch())
-						continue;
-					displayable.add(imports[i]);
-				}
-
-				return (IFeatureImport[]) displayable
-						.toArray(new IFeatureImport[displayable.size()]);
-			}
-			return new Object[0];
-		}
-	}
-
-	public RequiresSection(FeatureDependenciesPage page, Composite parent) {
-		super(page, parent, Section.DESCRIPTION, new String[] {
-				PDEUIMessages.FeatureEditor_RequiresSection_plugin,
-				PDEUIMessages.FeatureEditor_RequiresSection_feature, null,
-				PDEUIMessages.FeatureEditor_RequiresSection_compute });
-		getSection().setText(PDEUIMessages.FeatureEditor_RequiresSection_title);
-		getSection().setDescription(PDEUIMessages.FeatureEditor_RequiresSection_desc);
-		getTablePart().setEditable(false);
-	}
-
-	public void commit(boolean onSave) {
-		super.commit(onSave);
-	}
-
-	public void createClient(Section section, FormToolkit toolkit) {
-		Composite container = createClientContainer(section, 2, toolkit);
-
-		fSyncButton = toolkit.createButton(container, PDEUIMessages.FeatureEditor_RequiresSection_sync, SWT.CHECK);
-		// syncButton.setSelection(true);
-		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gd.horizontalSpan = 2;
-		fSyncButton.setLayoutData(gd);
-
-		createViewerPartControl(container, SWT.SINGLE, 2, toolkit);
-
-		TablePart tablePart = getTablePart();
-		fPluginViewer = tablePart.getTableViewer();
-		fPluginViewer.setContentProvider(new ImportContentProvider());
-		fPluginViewer.setSorter(ListUtil.NAME_SORTER);
-		fPluginViewer.setLabelProvider(PDEPlugin.getDefault()
-				.getLabelProvider());
-
-		fDeleteAction = new Action() {
-			public void run() {
-				handleDelete();
-			}
-		};
-		fDeleteAction.setText(PDEUIMessages.Actions_delete_label);
-		toolkit.paintBordersFor(container);
-		section.setClient(container);
-		initialize();
-	}
-
-	protected void buttonSelected(int index) {
-		switch (index) {
-		case 0:
-			handleNewPlugin();
-			break;
-		case 1:
-			handleNewFeature();
-			break;
-		case 2:
-			break;
-		case 3:
-			recomputeImports();
-			break;
-		}
-	}
-
-	private void handleNewPlugin() {
-		BusyIndicator.showWhile(fPluginViewer.getTable().getDisplay(),
-				new Runnable() {
-					public void run() {
-						IPluginModelBase[] allModels = PDECore.getDefault()
-								.getModelManager().getPlugins();
-						ArrayList newModels = new ArrayList();
-						for (int i = 0; i < allModels.length; i++) {
-							if (canAdd(allModels[i]))
-								newModels.add(allModels[i]);
-						}
-						IPluginModelBase[] candidateModels = (IPluginModelBase[]) newModels
-								.toArray(new IPluginModelBase[newModels.size()]);
-						PluginSelectionDialog dialog = new PluginSelectionDialog(
-								fPluginViewer.getTable().getShell(),
-								candidateModels, true);
-						if (dialog.open() == Window.OK) {
-							Object[] models = dialog.getResult();
-							try {
-								doAdd(models);
-							} catch (CoreException e) {
-								PDECore.log(e);
-							}
-						}
-					}
-				});
-	}
-
-	private boolean canAdd(IPluginModelBase candidate) {
-		IPluginBase plugin = candidate.getPluginBase();
-		if (candidate.isFragmentModel())
-			return false;
-
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		IFeatureImport[] imports = model.getFeature().getImports();
-
-		for (int i = 0; i < imports.length; i++) {
-			IFeatureImport fimport = imports[i];
-			if (plugin.getId().equals(fimport.getId()))
-				return false;
-		}
-		// don't show plug-ins that are listed in this feature
-		IFeaturePlugin[] fplugins = model.getFeature().getPlugins();
-		for (int i = 0; i < fplugins.length; i++) {
-			IFeaturePlugin fplugin = fplugins[i];
-			if (plugin.getId().equals(fplugin.getId()))
-				return false;
-		}
-		return true;
-	}
-
-	private void handleNewFeature() {
-		BusyIndicator.showWhile(fPluginViewer.getTable().getDisplay(),
-				new Runnable() {
-					public void run() {
-						IFeatureModel[] allModels = PDECore.getDefault()
-								.getFeatureModelManager().getModels();
-						ArrayList newModels = new ArrayList();
-						for (int i = 0; i < allModels.length; i++) {
-							if (canAdd(allModels[i]))
-								newModels.add(allModels[i]);
-						}
-						IFeatureModel[] candidateModels = (IFeatureModel[]) newModels
-								.toArray(new IFeatureModel[newModels.size()]);
-						FeatureSelectionDialog dialog = new FeatureSelectionDialog(
-								fPluginViewer.getTable().getShell(),
-								candidateModels, true);
-						if (dialog.open() == Window.OK) {
-							Object[] models = dialog.getResult();
-							try {
-								doAdd(models);
-							} catch (CoreException e) {
-								PDECore.log(e);
-							}
-						}
-					}
-				});
-	}
-
-	private void doAdd(Object[] candidates) throws CoreException {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		IFeature feature = model.getFeature();
-		IFeatureImport[] added = new IFeatureImport[candidates.length];
-		for (int i = 0; i < candidates.length; i++) {
-			FeatureImport fimport = (FeatureImport) model.getFactory()
-			.createImport();
-			if (candidates[i] instanceof IFeatureModel) {
-				IFeatureModel candidate = (IFeatureModel) candidates[i];
-				fimport.loadFrom(candidate.getFeature());
-			} else { // instanceof IPluginModelBase
-				IPluginModelBase candidate = (IPluginModelBase) candidates[i];
-				IPluginBase pluginBase = candidate.getPluginBase();
-				fimport.setId(pluginBase.getId());
-			}
-			added[i] = fimport;
-		}
-		feature.addImports(added);
-	}
-
-	private boolean canAdd(IFeatureModel candidate) {
-		IFeature cfeature = candidate.getFeature();
-
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		IFeature feature = model.getFeature();
-
-		if (cfeature.getId().equals(feature.getId())
-				&& cfeature.getVersion().equals(feature.getVersion())) {
-			return false;
-		}
-
-		IFeatureImport[] features = feature.getImports();
-
-		for (int i = 0; i < features.length; i++) {
-			if (features[i].getId().equals(cfeature.getId())
-					&& features[i].getVersion().equals(cfeature.getVersion()))
-				return false;
-		}
-		return true;
-	}
-
-	private void handleDelete() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		if (!model.isEditable()) {
-			return;
-		}
-		IFeature feature = model.getFeature();
-		IStructuredSelection selection = (IStructuredSelection) fPluginViewer
-				.getSelection();
-		if (selection.isEmpty())
-			return;
-
-		try {
-			IFeatureImport[] deleted = new IFeatureImport[selection.size()];
-			int i = 0;
-			for (Iterator iter = selection.iterator(); iter.hasNext();) {
-				IFeatureImport iimport = (IFeatureImport) iter.next();
-				deleted[i++] = iimport;
-			}
-			feature.removeImports(deleted);
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	private void handleSelectAll() {
-		IStructuredContentProvider provider = (IStructuredContentProvider) fPluginViewer
-				.getContentProvider();
-		Object[] elements = provider.getElements(fPluginViewer.getInput());
-		StructuredSelection ssel = new StructuredSelection(elements);
-		fPluginViewer.setSelection(ssel);
-	}
-
-	public void dispose() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		if (model != null)
-			model.removeModelChangedListener(this);
-		PDECore.getDefault().getModelManager().removePluginModelListener(this);
-		PDECore.getDefault().getFeatureModelManager()
-				.removeFeatureModelListener(this);
-		super.dispose();
-	}
-
-	public boolean doGlobalAction(String actionId) {
-		if (actionId.equals(ActionFactory.DELETE.getId())) {
-			BusyIndicator.showWhile(fPluginViewer.getTable().getDisplay(),
-					new Runnable() {
-						public void run() {
-							handleDelete();
-						}
-					});
-			return true;
-		}
-		if (actionId.equals(ActionFactory.CUT.getId())) {
-			// delete here and let the editor transfer
-			// the selection to the clipboard
-			handleDelete();
-			return false;
-		}
-		if (actionId.equals(ActionFactory.PASTE.getId())) {
-			doPaste();
-			return true;
-		}
-		if (actionId.equals(ActionFactory.SELECT_ALL.getId())) {
-			BusyIndicator.showWhile(fPluginViewer.getTable().getDisplay(),
-					new Runnable() {
-						public void run() {
-							handleSelectAll();
-						}
-					});
-			return true;
-		}
-		return false;
-	}
-
-	public void expandTo(Object object) {
-		if (object instanceof IFeatureImport) {
-			StructuredSelection ssel = new StructuredSelection(object);
-			fPluginViewer.setSelection(ssel);
-		}
-	}
-
-	protected void fillContextMenu(IMenuManager manager) {
-		IStructuredSelection selection = (StructuredSelection) fPluginViewer
-				.getSelection();
-		if (!selection.isEmpty()) {
-			manager.add(fDeleteAction);
-			manager.add(new Separator());
-		}
-		getPage().getPDEEditor().getContributor().contextMenuAboutToShow(
-				manager);
-	}
-
-	protected void selectionChanged(IStructuredSelection selection) {
-		getPage().getPDEEditor().setSelection(selection);
-		getPage().getManagedForm().fireSelectionChanged(this, selection);
-	}
-
-	public void initialize() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		refresh();
-		if (model.isEditable() == false) {
-			getTablePart().setButtonEnabled(0, false);
-			getTablePart().setButtonEnabled(1, false);
-			getTablePart().setButtonEnabled(3, false);
-			fSyncButton.setEnabled(false);
-		}
-		model.addModelChangedListener(this);
-		PDECore.getDefault().getModelManager().addPluginModelListener(this);
-		PDECore.getDefault().getFeatureModelManager().addFeatureModelListener(
-				this);
-	}
-
-	public void modelChanged(IModelChangedEvent e) {
-		if (e.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			markStale();
-			return;
-		} else if (e.getChangeType() == IModelChangedEvent.CHANGE) {
-			Object obj = e.getChangedObjects()[0];
-			if (obj instanceof IFeatureImport) {
-				fPluginViewer.refresh(obj);
-			}
-		} else {
-			Object obj = e.getChangedObjects()[0];
-			if (obj instanceof IFeatureImport) {
-				if (e.getChangeType() == IModelChangedEvent.INSERT) {
-					fPluginViewer.add(e.getChangedObjects());
-					if (e.getChangedObjects().length > 0) {
-						fPluginViewer.setSelection(new StructuredSelection(e
-								.getChangedObjects()[0]));
-					}
-				} else
-					fPluginViewer.remove(e.getChangedObjects());
-			} else if (obj instanceof IFeaturePlugin) {
-				if (fSyncButton.getSelection()) {
-					recomputeImports();
-				}
-			}
-		}
-	}
-
-	private void recomputeImports() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		IFeature feature = model.getFeature();
-		try {
-			feature.computeImports();
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	public void modelsChanged(final PluginModelDelta delta) {
-		getSection().getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				if (getSection().isDisposed()) {
-					return;
-				}
-				ModelEntry[] added = delta.getAddedEntries();
-				ModelEntry[] removed = delta.getRemovedEntries();
-				ModelEntry[] changed = delta.getChangedEntries();
-				if (hasModels(added) || hasModels(removed)
-						|| hasModels(changed))
-					markStale();
-			}
-		});
-	}
-
-	private boolean hasModels(ModelEntry[] entries) {
-		if (entries == null)
-			return false;
-		return entries.length > 0;
-	}
-
-	public void modelsChanged(final IFeatureModelDelta delta) {
-		getSection().getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				if (getSection().isDisposed()) {
-					return;
-				}
-				IFeatureModel[] added = delta.getAdded();
-				IFeatureModel[] removed = delta.getRemoved();
-				IFeatureModel[] changed = delta.getChanged();
-				if (hasModels(added) || hasModels(removed)
-						|| hasModels(changed))
-					markStale();
-			}
-		});
-	}
-
-	private boolean hasModels(IFeatureModel[] models) {
-		if (models == null)
-			return false;
-		IFeatureModel thisModel = (IFeatureModel) getPage().getModel();
-		for (int i = 0; i < models.length; i++) {
-			if (models[i] != thisModel) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public void setFocus() {
-		if (fPluginViewer != null)
-			fPluginViewer.getTable().setFocus();
-	}
-
-	public void refresh() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		IFeature feature = model.getFeature();
-		fPluginViewer.setInput(feature);
-		super.refresh();
-	}
-
-	/**
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#canPaste(Clipboard)
-	 */
-	public boolean canPaste(Clipboard clipboard) {
-		Object[] objects = (Object[]) clipboard.getContents(ModelDataTransfer
-				.getInstance());
-		if (objects != null && objects.length > 0) {
-			return canPaste(null, objects);
-		}
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#canPaste(Object,
-	 *      Object[])
-	 */
-	protected boolean canPaste(Object target, Object[] objects) {
-		for (int i = 0; i < objects.length; i++) {
-			if (!(objects[i] instanceof FeatureImport))
-				return false;
-		}
-		return true;
-	}
-
-	/**
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#doPaste()
-	 */
-	protected void doPaste() {
-		Clipboard clipboard = getPage().getPDEEditor().getClipboard();
-		Object[] objects = (Object[]) clipboard.getContents(ModelDataTransfer
-				.getInstance());
-		if (objects != null && canPaste(null, objects))
-			doPaste(null, objects);
-	}
-
-	/**
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#doPaste(Object,
-	 *      Object[])
-	 */
-	protected void doPaste(Object target, Object[] objects) {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		IFeature feature = model.getFeature();
-		if (!model.isEditable()) {
-			return;
-		}
-
-		IFeatureImport[] imports = new IFeatureImport[objects.length];
-		try {
-			for (int i = 0; i < objects.length; i++) {
-				FeatureImport fImport = (FeatureImport) objects[i];
-				fImport.setModel(model);
-				fImport.setParent(feature);
-				imports[i] = fImport;
-			}
-			feature.addImports(imports);
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-
-	}
-
-	void fireSelection() {
-		ISelection sel = fPluginViewer.getSelection();
-		if (!sel.isEmpty()) {
-			fPluginViewer.setSelection(fPluginViewer.getSelection());
-		} else if (fPluginViewer.getElementAt(0) != null) {
-			fPluginViewer.setSelection(new StructuredSelection(fPluginViewer
-					.getElementAt(0)));
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/SynchronizeVersionsAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/SynchronizeVersionsAction.java
deleted file mode 100644
index e7db497..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/SynchronizeVersionsAction.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.pde.core.IModel;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.ui.PlatformUI;
-
-public class SynchronizeVersionsAction extends Action {
-	private FeatureEditor activeEditor;
-	public SynchronizeVersionsAction() {
-		setText(PDEUIMessages.Actions_synchronizeVersions_label);
-	}
-	private void ensureContentSaved() {
-		if (activeEditor.isDirty()) {
-			try {
-				IRunnableWithProgress op = new IRunnableWithProgress() {
-					public void run(IProgressMonitor monitor) {
-						activeEditor.doSave(monitor);
-					}
-				};
-				PlatformUI.getWorkbench().getProgressService().runInUI(
-						PDEPlugin.getActiveWorkbenchWindow(), op,
-						PDEPlugin.getWorkspace().getRoot());
-			} catch (InvocationTargetException e) {
-				PDEPlugin.logException(e);
-			} catch (InterruptedException e) {
-			}
-		}
-	}
-
-	public void run() {
-		ensureContentSaved();
-		SynchronizeVersionsWizard wizard = new SynchronizeVersionsWizard(
-				activeEditor);
-		WizardDialog dialog = new WizardDialog(PDEPlugin
-				.getActiveWorkbenchShell(), wizard);
-		dialog.open();
-	}
-	public void setActiveEditor(FeatureEditor editor) {
-		this.activeEditor = editor;
-		IModel model = (IModel) editor.getAggregateModel();
-		setEnabled(model.isEditable());
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/SynchronizeVersionsWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/SynchronizeVersionsWizard.java
deleted file mode 100644
index 38d1aa9..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/SynchronizeVersionsWizard.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import org.eclipse.jface.wizard.*;
-import org.eclipse.pde.internal.ui.*;
-
-public class SynchronizeVersionsWizard extends Wizard {
-	private FeatureEditor featureEditor;
-	private SynchronizeVersionsWizardPage mainPage;
-	public SynchronizeVersionsWizard(FeatureEditor featureEditor) {
-	setDefaultPageImageDescriptor(PDEPluginImages.DESC_NEWFTRPRJ_WIZ);
-	setDialogSettings(PDEPlugin.getDefault().getDialogSettings());
-	setNeedsProgressMonitor(true);
-	setWindowTitle(PDEUIMessages.VersionSyncWizard_wtitle);
-	this.featureEditor = featureEditor;
-}
-public void addPages() {
-	mainPage = new SynchronizeVersionsWizardPage(featureEditor);
-	addPage(mainPage);
-}
-public boolean performFinish() {
-	return mainPage.finish();
-}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/SynchronizeVersionsWizardPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/SynchronizeVersionsWizardPage.java
deleted file mode 100644
index f79d218..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/SynchronizeVersionsWizardPage.java
+++ /dev/null

@@ -1,327 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-import org.eclipse.core.resources.IFile;
-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.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.TextUtilities;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.pde.core.plugin.IPluginBase;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.feature.WorkspaceFeatureModel;
-import org.eclipse.pde.internal.core.ifeature.IFeature;
-import org.eclipse.pde.internal.core.ifeature.IFeaturePlugin;
-import org.eclipse.pde.internal.core.plugin.WorkspacePluginModelBase;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.IPDEUIConstants;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.model.AbstractEditingModel;
-import org.eclipse.pde.internal.ui.model.IDocumentAttribute;
-import org.eclipse.pde.internal.ui.model.IEditingModel;
-import org.eclipse.pde.internal.ui.model.bundle.Bundle;
-import org.eclipse.pde.internal.ui.model.bundle.BundleModel;
-import org.eclipse.pde.internal.ui.model.bundle.ManifestHeader;
-import org.eclipse.pde.internal.ui.model.plugin.FragmentModel;
-import org.eclipse.pde.internal.ui.model.plugin.PluginBaseNode;
-import org.eclipse.pde.internal.ui.model.plugin.PluginModel;
-import org.eclipse.pde.internal.ui.model.plugin.PluginModelBase;
-import org.eclipse.swt.SWT;
-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.Group;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.ReplaceEdit;
-import org.eclipse.text.edits.TextEdit;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.osgi.framework.Constants;
-
-public class SynchronizeVersionsWizardPage extends WizardPage {
-	public static final int USE_PLUGINS_AT_BUILD = 0;
-	public static final int USE_FEATURE = 1;
-	public static final int USE_PLUGINS = 2;
-	private FeatureEditor fFeatureEditor;
-	private Button fUsePluginsAtBuildButton;
-	private Button fUseComponentButton;
-	private Button fUsePluginsButton;
-
-	private static final String PREFIX =
-		PDEPlugin.getPluginId() + ".synchronizeVersions."; //$NON-NLS-1$
-	private static final String PROP_SYNCHRO_MODE = PREFIX + "mode"; //$NON-NLS-1$
-	public SynchronizeVersionsWizardPage(FeatureEditor featureEditor) {
-	super("featureJar"); //$NON-NLS-1$
-	setTitle(PDEUIMessages.VersionSyncWizard_title);
-	setDescription(PDEUIMessages.VersionSyncWizard_desc);
-	this.fFeatureEditor = featureEditor;
-}
-public void createControl(Composite parent) {
-	Composite container = new Composite(parent, SWT.NULL);
-	GridLayout layout = new GridLayout();
-	container.setLayout(layout);
-
-	Group group = new Group(container, SWT.SHADOW_ETCHED_IN);
-	GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-	layout = new GridLayout();
-	group.setLayout(layout);
-	group.setLayoutData(gd);
-	group.setText(PDEUIMessages.VersionSyncWizard_group);
-
-	fUsePluginsAtBuildButton = new Button(group, SWT.RADIO);
-	fUsePluginsAtBuildButton.setText(PDEUIMessages.VersionSyncWizard_usePluginsAtBuild);
-	gd = new GridData(GridData.FILL_HORIZONTAL);
-	fUsePluginsAtBuildButton.setLayoutData(gd);
-	
-	fUsePluginsButton = new Button(group, SWT.RADIO);
-	fUsePluginsButton.setText(PDEUIMessages.VersionSyncWizard_usePlugins);
-	gd = new GridData(GridData.FILL_HORIZONTAL);
-	fUsePluginsButton.setLayoutData(gd);
-	
-	fUseComponentButton = new Button(group, SWT.RADIO);
-	fUseComponentButton.setText(PDEUIMessages.VersionSyncWizard_useComponent);
-	gd = new GridData(GridData.FILL_HORIZONTAL);
-	fUseComponentButton.setLayoutData(gd);
-
-	setControl(container);
-	Dialog.applyDialogFont(container);
-	loadSettings();
-	PlatformUI.getWorkbench().getHelpSystem().setHelp(container, IHelpContextIds.FEATURE_SYNCHRONIZE_VERSIONS);
-}
-
-private IPluginModelBase findModel(String id) {
-	IPluginModelBase [] models = PDECore.getDefault().getModelManager().getWorkspaceModels();
-	for (int i = 0; i < models.length; i++) {
-		IPluginModelBase modelBase = models[i];
-		if (modelBase.getPluginBase().getId().equals(id))
-			return modelBase;
-	}
-	return null;
-}
-
-public boolean finish() {
-	final int mode = saveSettings();
-
-	IRunnableWithProgress operation = new WorkspaceModifyOperation() {
-		public void execute(IProgressMonitor monitor) {
-			try {
-				runOperation(mode, monitor);
-			} catch (CoreException e) {
-				PDEPlugin.logException(e);
-			} catch (BadLocationException e) {
-				PDEPlugin.logException(e);
-			} finally {
-				monitor.done();
-			}
-		}
-	};
-	try {
-		getContainer().run(false, true, operation);
-	} catch (InvocationTargetException e) {
-		PDEPlugin.logException(e);
-		return false;
-	} catch (InterruptedException e) {
-		return false;
-	}
-	return true;
-}
-
-	/**
-	 * Forces a version into plugin/fragment .xml
-	 * 
-	 * @param targetVersion
-	 * @param modelBase
-	 * @throws CoreException
-	 */
-	private void forceVersion(String targetVersion, IPluginModelBase modelBase,
-			IProgressMonitor monitor) throws CoreException,
-			BadLocationException {
-		IFile file = (IFile) modelBase.getUnderlyingResource();
-		if (file == null) {
-			return;
-		}
-		ITextFileBufferManager manager = FileBuffers.getTextFileBufferManager();
-		try {
-			manager.connect(file.getFullPath(), monitor);
-			ITextFileBuffer buffer = manager.getTextFileBuffer(file
-					.getFullPath());
-
-			IDocument document = buffer.getDocument();
-			AbstractEditingModel model = null;
-			if(modelBase instanceof WorkspacePluginModelBase){
-				model = getPluginEditingModel(document, "fragment.xml".equals(file.getName())); //$NON-NLS-1$	
-			} else {
-				model = getBundleEditingModel(document);
-			}
-			model.load();
-			if (!model.isLoaded())
-				throw new CoreException(
-						new Status(
-								IStatus.ERROR,
-								IPDEUIConstants.PLUGIN_ID,
-								IStatus.ERROR,
-								"The synchronize version operation cannot proceed because plug-in '" + modelBase.getPluginBase().getId() + "' has a malformed manifest file.", null)); //$NON-NLS-1$ //$NON-NLS-2$
-			TextEdit edit = null;
-			if(model instanceof PluginModelBase){
-				edit = modifyVersion((PluginModelBase)model, targetVersion);
-			} else if( model instanceof BundleModel){
-				edit = modifyVersion((BundleModel)model, targetVersion);
-				
-			}
-			if (edit != null) {
-				edit.apply(document);
-				buffer.commit(monitor, true);
-			}
-		} finally {
-			manager.disconnect(file.getFullPath(), monitor);
-		}
-	}
-
-	private TextEdit modifyVersion(BundleModel model, String targetVersion) {
-		Bundle bundle = (Bundle)model.getBundle();
-		ManifestHeader header = bundle.getManifestHeader(Constants.BUNDLE_VERSION);
-		header.setValue(targetVersion);
-		return new ReplaceEdit(header.getOffset(), header.getLength(), header.write()); 
-	}
-
-	private TextEdit modifyVersion(PluginModelBase model, String version)
-			throws CoreException, MalformedTreeException, BadLocationException {
-		IPluginBase pluginBase = model.getPluginBase();
-
-		PluginBaseNode element = (PluginBaseNode) pluginBase;// (PluginElementNode)extension.getChildren()[0];
-		IDocumentAttribute versionAttr = element
-				.getDocumentAttribute("version"); //$NON-NLS-1$
-		if (versionAttr != null)
-			return new ReplaceEdit(versionAttr.getValueOffset(), versionAttr
-					.getValueLength(), version);
-		// insert new version attribute (after name, or id attribute)
-		IDocumentAttribute attr = element.getDocumentAttribute("name"); //$NON-NLS-1$
-		if (attr == null) {
-			attr = element.getDocumentAttribute("id"); //$NON-NLS-1$			
-		}
-		if (attr != null) {
-			String newLine = TextUtilities
-					.getDefaultLineDelimiter(((IEditingModel) model)
-							.getDocument());
-			return new ReplaceEdit(attr.getValueOffset()
-					+ attr.getValueLength() + 1, 0, newLine + "   version=\"" //$NON-NLS-1$
-					+ version + "\""); //$NON-NLS-1$
-		}
-		return null;
-	}
-
-	private PluginModelBase getPluginEditingModel(IDocument document,
-			boolean isFragment) {
-		if (isFragment)
-			return new FragmentModel(document, false);
-		return new PluginModel(document, false);
-	}
-
-	private BundleModel getBundleEditingModel(IDocument document) {
-		return new BundleModel(document, false);
-	}
-
-private void loadSettings() {
-	IDialogSettings settings = getDialogSettings();
-	if (settings.get(PROP_SYNCHRO_MODE) != null) {
-		int mode = settings.getInt(PROP_SYNCHRO_MODE);
-		switch (mode) {
-			case USE_FEATURE :
-				fUseComponentButton.setSelection(true);
-				break;
-			case USE_PLUGINS :
-				fUsePluginsButton.setSelection(true);
-				break;
-			default: // USE_PLUGINS_AT_BUILD
-				fUsePluginsAtBuildButton.setSelection(true);
-				break;
-		}
-	}
-	else 
-	   fUsePluginsAtBuildButton.setSelection(true);
-}
-private void runOperation(int mode, IProgressMonitor monitor)
-	throws CoreException, BadLocationException {
-	WorkspaceFeatureModel model =
-		(WorkspaceFeatureModel) fFeatureEditor.getAggregateModel();
-	IFeature feature = model.getFeature();
-	IFeaturePlugin[] plugins = feature.getPlugins();
-	int size = plugins.length;
-	monitor.beginTask(PDEUIMessages.VersionSyncWizard_synchronizing, size);
-	for (int i = 0; i < plugins.length; i++) {
-		synchronizeVersion(mode, feature.getVersion(), plugins[i], monitor);
-	}
-}
-private int saveSettings() {
-	IDialogSettings settings = getDialogSettings();
-
-	int mode = USE_PLUGINS_AT_BUILD;
-
-	if (fUseComponentButton.getSelection())
-		mode = USE_FEATURE;
-	else if (fUsePluginsButton.getSelection())
-		mode = USE_PLUGINS;
-	settings.put(PROP_SYNCHRO_MODE, mode);
-	return mode;
-}
-private void synchronizeVersion(
-	int mode,
-	String featureVersion,
-	IFeaturePlugin ref,
-	IProgressMonitor monitor)
-	throws CoreException,
-	BadLocationException{
-	String id = ref.getId();
-	
-	if (mode == USE_PLUGINS_AT_BUILD) {
-		if (!"0.0.0".equals(ref.getVersion())) { //$NON-NLS-1$
-			ref.setVersion("0.0.0"); //$NON-NLS-1$
-		}
-	} else if (mode == USE_PLUGINS) {
-		IPluginModelBase modelBase = PDECore.getDefault().getModelManager()
-		.findModel(id);
-		if (modelBase == null) {
-			return;
-		}
-		String baseVersion = modelBase.getPluginBase().getVersion();
-		if (!ref.getVersion().equals(baseVersion)) {
-			ref.setVersion(baseVersion);
-		}
-	} else /* mode == USE_FEATURE */{
-		IPluginModelBase modelBase = findModel(id);
-		if (modelBase == null) {
-			return;
-		}
-		ref.setVersion(featureVersion);
-		String baseVersion = modelBase.getPluginBase().getVersion();
-		if (!featureVersion.equals(baseVersion)) {
-			forceVersion(featureVersion, modelBase, monitor);
-		}
-		
-	}
-	monitor.worked(1);
-}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/URLDetailsSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/URLDetailsSection.java
deleted file mode 100644
index 899bd68..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/URLDetailsSection.java
+++ /dev/null

@@ -1,253 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.ifeature.IFeature;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.core.ifeature.IFeatureURL;
-import org.eclipse.pde.internal.core.ifeature.IFeatureURLElement;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.PDESection;
-import org.eclipse.pde.internal.ui.parts.FormEntry;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.RTFTransfer;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IFormPart;
-import org.eclipse.ui.forms.IPartSelectionListener;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-public class URLDetailsSection extends PDESection implements
-		IPartSelectionListener {
-	private FormEntry fNameText;
-
-	private FormEntry fUrlText;
-
-	private IFeatureURLElement fInput;
-
-	public URLDetailsSection(PDEFormPage page, Composite parent) {
-		super(page, parent, Section.DESCRIPTION | ExpandableComposite.NO_TITLE,
-				false);
-		getSection().setDescription(PDEUIMessages.FeatureEditor_URLDetailsSection_desc);
-		createClient(getSection(), page.getManagedForm().getToolkit());
-	}
-
-	public void commit(boolean onSave) {
-		fUrlText.commit();
-		fNameText.commit();
-		super.commit(onSave);
-	}
-
-	private void commitSiteUrl(String value) {
-		if (fInput == null) {
-			return;
-		}
-		try {
-			if (value.length() > 0) {
-				URL siteUrl = new URL(value);
-				fInput.setURL(siteUrl);
-			} else {
-				fInput.setURL(null);
-			}
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		} catch (MalformedURLException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	private void commitSiteName(String value) {
-		if (fInput == null) {
-			return;
-		}
-		try {
-			fInput.setLabel(value);
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	public void createClient(Section section, FormToolkit toolkit) {
-		Composite container = toolkit.createComposite(section);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.verticalSpacing = 5;
-		layout.horizontalSpacing = 6;
-		container.setLayout(layout);
-
-		final IFeatureModel model = (IFeatureModel) getPage().getModel();
-		final IFeature feature = model.getFeature();
-
-		fUrlText = new FormEntry(container, toolkit, PDEUIMessages.FeatureEditor_URLDetailsSection_updateUrl, null, false);
-		fUrlText.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry text) {
-				String url = text.getValue() != null ? text.getValue() : ""; //$NON-NLS-1$
-				if (url.length() > 0 && !verifySiteUrl(feature, url)) {
-					warnBadUrl(url);
-					setUrlText();
-				} else {
-					commitSiteUrl(url);
-				}
-			}
-		});
-
-		fNameText = new FormEntry(container, toolkit, PDEUIMessages.FeatureEditor_URLDetailsSection_updateUrlLabel, null, false);
-		fNameText.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry text) {
-				String name = text.getValue() != null ? text.getValue() : ""; //$NON-NLS-1$
-				commitSiteName(name);
-			}
-		});
-
-		GridData gd = (GridData) fUrlText.getText().getLayoutData();
-		gd.widthHint = 150;
-
-		toolkit.paintBordersFor(container);
-		section.setClient(container);
-		initialize();
-	}
-
-	private boolean verifySiteUrl(IFeature feature, String value) {
-		try {
-			new URL(value);
-		} catch (MalformedURLException e) {
-			return false;
-		}
-		return true;
-	}
-
-	private void warnBadUrl(String text) {
-		MessageDialog.openError(PDEPlugin.getActiveWorkbenchShell(), PDEUIMessages.FeatureEditor_URLDetailsSection_badUrlTitle, PDEUIMessages.FeatureEditor_URLDetailsSection_badUrlMessage);
-	}
-
-	public void dispose() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		if (model != null)
-			model.removeModelChangedListener(this);
-		super.dispose();
-	}
-
-	public void initialize() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		refresh();
-		if (!model.isEditable()) {
-			fUrlText.getText().setEditable(false);
-			fNameText.getText().setEditable(false);
-		}
-		model.addModelChangedListener(this);
-	}
-
-	public void modelChanged(IModelChangedEvent e) {
-		if (e.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			markStale();
-			return;
-		}
-		if (e.getChangeType() == IModelChangedEvent.CHANGE) {
-			Object objs[] = e.getChangedObjects();
-			if (objs.length > 0 && objs[0] instanceof IFeatureURL) {
-				markStale();
-			}
-		}
-		Object objs[] = e.getChangedObjects();
-		if (objs.length > 0 && objs[0] instanceof IFeatureURLElement) {
-			markStale();
-		}
-	}
-
-	public void setFocus() {
-		if (fUrlText != null)
-			fUrlText.getText().setFocus();
-	}
-
-	public void refresh() {
-		update();
-		super.refresh();
-	}
-
-	private void setUrlText() {
-		String updateSiteUrl = ""; //$NON-NLS-1$
-		if (fInput != null && fInput.getURL() != null) {
-			updateSiteUrl = fInput.getURL().toExternalForm();
-		}
-		fUrlText.setValue(updateSiteUrl != null ? updateSiteUrl : "", //$NON-NLS-1$
-				true);
-
-	}
-
-	private void update() {
-		fUrlText.setEditable(fInput != null && fInput.getModel().isEditable());
-		fNameText.setEditable(fInput != null && fInput.getModel().isEditable());
-		setUrlText();
-		setNameText();
-	}
-
-	private void setNameText() {
-		String updateSiteLabel = ""; //$NON-NLS-1$
-		if (fInput != null) {
-			updateSiteLabel = fInput.getLabel();
-		}
-		fNameText
-				.setValue(updateSiteLabel != null ? updateSiteLabel : "", true); //$NON-NLS-1$
-	}
-
-	public void cancelEdit() {
-		fNameText.cancelEdit();
-		fUrlText.cancelEdit();
-		super.cancelEdit();
-	}
-
-	/**
-	 * @see org.eclipse.update.ui.forms.internal.FormSection#canPaste(Clipboard)
-	 */
-	public boolean canPaste(Clipboard clipboard) {
-		TransferData[] types = clipboard.getAvailableTypes();
-		Transfer[] transfers = new Transfer[] { TextTransfer.getInstance(),
-				RTFTransfer.getInstance() };
-		for (int i = 0; i < types.length; i++) {
-			for (int j = 0; j < transfers.length; j++) {
-				if (transfers[j].isSupportedType(types[i]))
-					return true;
-			}
-		}
-		return false;
-	}
-
-	public void selectionChanged(IFormPart part, ISelection selection) {
-		if (selection instanceof IStructuredSelection && !selection.isEmpty()) {
-			Object o = ((IStructuredSelection) selection).getFirstElement();
-			if (o instanceof IFeatureURLElement
-					&& ((IFeatureURLElement) o).getElementType() == IFeatureURLElement.DISCOVERY) {
-				fInput = (IFeatureURLElement) o;
-			} else {
-				fInput = null;
-			}
-		} else
-			fInput = null;
-		update();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/URLSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/URLSection.java
deleted file mode 100644
index 32c4db4..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/feature/URLSection.java
+++ /dev/null

@@ -1,375 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.feature;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.pde.core.IModel;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.feature.FeatureURLElement;
-import org.eclipse.pde.internal.core.ifeature.IFeature;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.core.ifeature.IFeatureURL;
-import org.eclipse.pde.internal.core.ifeature.IFeatureURLElement;
-import org.eclipse.pde.internal.ui.PDELabelProvider;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.ModelDataTransfer;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.TableSection;
-import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
-import org.eclipse.pde.internal.ui.parts.TablePart;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-public class URLSection extends TableSection {
-	private TableViewer fUrlViewer;
-
-	private Action fNewAction;
-
-	private Action fDeleteAction;
-
-	private Image fUrlImage;
-
-	class URLContentProvider extends DefaultContentProvider implements
-			IStructuredContentProvider {
-		public Object[] getElements(Object input) {
-			IFeature feature = (IFeature) input;
-			IFeatureURL featureUrl = feature.getURL();
-			if (featureUrl != null) {
-				return featureUrl.getDiscoveries();
-			}
-			return new Object[0];
-		}
-	}
-
-	class URLLabelProvider extends LabelProvider {
-
-		public Image getImage(Object obj) {
-			if (obj instanceof IFeatureURLElement) {
-				return fUrlImage;
-			}
-			return null;
-		}
-
-	}
-
-	public URLSection(PDEFormPage page, Composite parent) {
-		super(page, parent, Section.DESCRIPTION | ExpandableComposite.NO_TITLE,
-				false, new String[] { PDEUIMessages.FeatureEditor_URLSection_new });
-		PDELabelProvider provider = PDEPlugin.getDefault().getLabelProvider();
-		fUrlImage = provider.get(PDEPluginImages.DESC_LINK_OBJ);
-		createClient(getSection(), page.getManagedForm().getToolkit());
-
-		getSection().setDescription(PDEUIMessages.FeatureEditor_URLSection_desc);
-	}
-
-	public void commit(boolean onSave) {
-		super.commit(onSave);
-	}
-
-	public void createClient(Section section, FormToolkit toolkit) {
-		Composite container = createClientContainer(section, 2, toolkit);
-		GridLayout layout = (GridLayout) container.getLayout();
-		layout.verticalSpacing = 5;
-
-		createViewerPartControl(container, SWT.SINGLE, 2, toolkit);
-		TablePart tablePart = getTablePart();
-		fUrlViewer = tablePart.getTableViewer();
-		fUrlViewer.setContentProvider(new URLContentProvider());
-		fUrlViewer.setLabelProvider(new URLLabelProvider());
-		toolkit.paintBordersFor(container);
-		makeActions();
-		section.setClient(container);
-		initialize();
-	}
-
-	protected void buttonSelected(int index) {
-		if (index == 0)
-			handleNew();
-	}
-
-	public void dispose() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		if (model != null)
-			model.removeModelChangedListener(this);
-		super.dispose();
-	}
-
-	protected void fillContextMenu(IMenuManager manager) {
-		IModel model = (IModel) getPage().getModel();
-		ISelection selection = fUrlViewer.getSelection();
-		Object object = ((IStructuredSelection) selection).getFirstElement();
-
-		manager.add(fNewAction);
-		fNewAction.setEnabled(model.isEditable());
-
-		if (object != null && object instanceof IFeatureURLElement) {
-			manager.add(fDeleteAction);
-			fDeleteAction.setEnabled(model.isEditable());
-		}
-
-		manager.add(new Separator());
-		getPage().getPDEEditor().getContributor().contextMenuAboutToShow(
-				manager);
-	}
-
-	private void handleNew() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		IFeature feature = model.getFeature();
-		IFeatureURL url = feature.getURL();
-
-		if (url == null) {
-			url = model.getFactory().createURL();
-			try {
-				feature.setURL(url);
-			} catch (CoreException e) {
-				return;
-			}
-		}
-		try {
-			IFeatureURLElement element = model.getFactory().createURLElement(
-					url, IFeatureURLElement.DISCOVERY);
-			element.setLabel(PDEUIMessages.FeatureEditor_URLSection_newDiscoverySite);
-			element.setURL(new URL(PDEUIMessages.FeatureEditor_URLSection_newURL));
-			url.addDiscovery(element);
-			fUrlViewer.setSelection(new StructuredSelection(element));
-
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		} catch (MalformedURLException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	private void handleSelectAll() {
-		IStructuredContentProvider provider = (IStructuredContentProvider) fUrlViewer
-				.getContentProvider();
-		Object[] elements = provider.getElements(fUrlViewer.getInput());
-		StructuredSelection ssel = new StructuredSelection(elements);
-		fUrlViewer.setSelection(ssel);
-	}
-
-	private void handleDelete() {
-		IStructuredSelection ssel = (IStructuredSelection) fUrlViewer
-				.getSelection();
-
-		if (ssel.isEmpty())
-			return;
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		if (!model.isEditable()) {
-			return;
-		}
-		IFeature feature = model.getFeature();
-
-		IFeatureURL url = feature.getURL();
-		if (url == null) {
-			return;
-		}
-		for (Iterator iter = ssel.iterator(); iter.hasNext();) {
-			IFeatureURLElement urlElement = (IFeatureURLElement) iter.next();
-			// IFeature feature = urlElement.getFeature();
-			try {
-				url.removeDiscovery(urlElement);
-			} catch (CoreException e) {
-				PDEPlugin.logException(e);
-			}
-		}
-	}
-
-	public boolean doGlobalAction(String actionId) {
-		if (actionId.equals(ActionFactory.DELETE.getId())) {
-			BusyIndicator.showWhile(fUrlViewer.getTable().getDisplay(),
-					new Runnable() {
-						public void run() {
-							handleDelete();
-						}
-					});
-			return true;
-		}
-		if (actionId.equals(ActionFactory.CUT.getId())) {
-			// delete here and let the editor transfer
-			// the selection to the clipboard
-			handleDelete();
-			return false;
-		}
-		if (actionId.equals(ActionFactory.PASTE.getId())) {
-			doPaste();
-			return true;
-		}
-		if (actionId.equals(ActionFactory.SELECT_ALL.getId())) {
-			BusyIndicator.showWhile(fUrlViewer.getTable().getDisplay(),
-					new Runnable() {
-						public void run() {
-							handleSelectAll();
-						}
-					});
-			return true;
-		}
-		return false;
-	}
-
-	protected void selectionChanged(IStructuredSelection selection) {
-		getPage().getPDEEditor().setSelection(selection);
-	}
-
-	public void initialize() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		refresh();
-		getTablePart().setButtonEnabled(0, model.isEditable());
-		model.addModelChangedListener(this);
-	}
-
-	public void modelChanged(IModelChangedEvent e) {
-		if (e.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			markStale();
-			return;
-		}
-		Object obj = e.getChangedObjects()[0];
-		if (obj instanceof IFeatureURL) {
-			markStale();
-			return;
-		}
-		if (obj instanceof IFeatureURLElement) {
-			markStale();
-			return;
-			// IFeatureURLElement element = (IFeatureURLElement) obj;
-			// if (element.getElementType() == IFeatureURLElement.DISCOVERY) {
-			// if (e.getChangeType() == IModelChangedEvent.INSERT) {
-			// fUrlViewer.add(element);
-			// fUrlViewer
-			// .setSelection(new StructuredSelection(element),
-			// true);
-			// } else if (e.getChangeType() == IModelChangedEvent.REMOVE) {
-			// fUrlViewer.remove(obj);
-			// } else {
-			// fUrlViewer.update(obj, null);
-			// }
-			// }
-		}
-	}
-
-	private void makeActions() {
-		IModel model = (IModel) getPage().getModel();
-		fNewAction = new Action() {
-			public void run() {
-				handleNew();
-			}
-		};
-		fNewAction.setText(PDEUIMessages.Menus_new_label);
-		fNewAction.setEnabled(model.isEditable());
-
-		fDeleteAction = new Action() {
-			public void run() {
-				BusyIndicator.showWhile(fUrlViewer.getTable().getDisplay(),
-						new Runnable() {
-							public void run() {
-								handleDelete();
-							}
-						});
-			}
-		};
-		fDeleteAction.setText(PDEUIMessages.Actions_delete_label);
-		fDeleteAction.setEnabled(model.isEditable());
-	}
-
-	public void setFocus() {
-		if (fUrlViewer != null)
-			fUrlViewer.getTable().setFocus();
-	}
-
-	public void refresh() {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		IFeature feature = model.getFeature();
-		fUrlViewer.setInput(feature);
-		super.refresh();
-	}
-
-	public boolean canPaste(Clipboard clipboard) {
-		ModelDataTransfer modelTransfer = ModelDataTransfer.getInstance();
-		Object[] objects = (Object[]) clipboard.getContents(modelTransfer);
-		if (objects != null && objects.length > 0) {
-			return canPaste(null, objects);
-		}
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#canPaste(Object,
-	 *      Object[])
-	 */
-	protected boolean canPaste(Object target, Object[] objects) {
-		for (int i = 0; i < objects.length; i++) {
-			if (!(objects[i] instanceof FeatureURLElement))
-				return false;
-		}
-		return true;
-	}
-
-	protected void doPaste() {
-		Clipboard clipboard = getPage().getPDEEditor().getClipboard();
-		ModelDataTransfer modelTransfer = ModelDataTransfer.getInstance();
-		Object[] objects = (Object[]) clipboard.getContents(modelTransfer);
-		if (objects != null) {
-			doPaste(null, objects);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#doPaste(Object,
-	 *      Object[])
-	 */
-	protected void doPaste(Object target, Object[] objects) {
-		IFeatureModel model = (IFeatureModel) getPage().getModel();
-		if (!model.isEditable()) {
-			return;
-		}
-		IFeature feature = model.getFeature();
-		for (int i = 0; i < objects.length; i++) {
-			if (objects[i] instanceof FeatureURLElement) {
-				FeatureURLElement element = (FeatureURLElement) objects[i];
-				element.setModel(model);
-				element.setParent(feature);
-				try {
-					feature.getURL().addDiscovery(element);
-				} catch (CoreException e) {
-					PDECore.logException(e);
-				}
-			}
-		}
-	}
-
-	void fireSelection() {
-		fUrlViewer.setSelection(fUrlViewer.getSelection());
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/BodyTextSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/BodyTextSection.java
deleted file mode 100644
index 2f0a00b..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/BodyTextSection.java
+++ /dev/null

@@ -1,245 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.actions.*;
-import org.eclipse.ui.forms.*;
-import org.eclipse.ui.forms.widgets.*;
-
-public class BodyTextSection
-	extends PDESection
-	implements IModelChangedListener, IPartSelectionListener {
-	private Button applyButton;
-	private Button resetButton;
-	private IPluginElement currentElement;
-	private Text text;
-	private boolean blockNotification;
-
-	public BodyTextSection(ExtensionsPage page, Composite parent) {
-		super(page, parent, Section.TWISTIE);
-		getSection().setText(PDEUIMessages.ManifestEditor_BodyTextSection_title);
-		createClient(getSection(), page.getManagedForm().getToolkit());
-	}
-
-	private void updateTitle(boolean hasContents) {
-		String title;
-		if (hasContents)
-			title = PDEUIMessages.ManifestEditor_BodyTextSection_titleFull;
-		else
-			title = PDEUIMessages.ManifestEditor_BodyTextSection_title;
-		if (!getSection().getText().equals(title)) {
-			getSection().setText(title);
-			getSection().layout();
-		}
-	}
-
-	public void createClient(
-		Section section,
-		FormToolkit toolkit) {
-		GridData gd;
-
-		Composite container = toolkit.createComposite(section);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginHeight = 2;
-		layout.marginWidth = 2;
-		container.setLayout(layout);
-
-		// text
-		text =
-			toolkit.createText(
-				container,
-				"", //$NON-NLS-1$
-				SWT.MULTI
-					| SWT.WRAP
-					| SWT.V_SCROLL);
-		text.setEditable(false);
-		gd = new GridData(GridData.FILL_BOTH);
-		text.setLayoutData(gd);
-		text.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				if (blockNotification) return;
-				markDirty();
-				applyButton.setEnabled(true);
-				resetButton.setEnabled(true);
-			}
-		});
-		text.addFocusListener(new FocusAdapter() {
-			public void focusGained(FocusEvent e) {
-				getPage().getPDEEditor().getContributor().updateSelectableActions(new StructuredSelection());
-			}
-		});
-
-		Composite buttonContainer = toolkit.createComposite(container);
-		layout = new GridLayout();
-		layout.marginHeight = 0;
-		buttonContainer.setLayout(layout);
-		gd =
-			new GridData(
-				GridData.HORIZONTAL_ALIGN_BEGINNING
-					| GridData.VERTICAL_ALIGN_FILL);
-		buttonContainer.setLayoutData(gd);
-
-		// add buttons
-		applyButton =
-			toolkit.createButton(
-				buttonContainer,
-				PDEUIMessages.Actions_apply_flabel,
-				SWT.PUSH);
-		gd =
-			new GridData(
-				GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-		applyButton.setLayoutData(gd);
-		applyButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleApply();
-			}
-		});
-
-		resetButton =
-			toolkit.createButton(
-				buttonContainer,
-				PDEUIMessages.Actions_reset_flabel,
-				SWT.PUSH);
-		gd =
-			new GridData(
-				GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-		resetButton.setLayoutData(gd);
-		resetButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleReset();
-			}
-		});
-
-		if (SWT.getPlatform().equals("motif") == false) //$NON-NLS-1$
-			toolkit.paintBordersFor(container);
-		section.setClient(container);
-		initialize();
-	}
-
-	public void dispose() {
-		IPluginModelBase model = (IPluginModelBase) getPage().getModel();
-		if (model!=null)
-			model.removeModelChangedListener(this);
-		super.dispose();
-	}
-
-	public boolean doGlobalAction(String actionId) {
-		if (actionId.equals(ActionFactory.DELETE.getId())) {
-			handleDelete();
-			return true;
-		}
-		if (actionId.equals(ActionFactory.CUT.getId())) {
-			// delete here and let the editor transfer
-			// the selection to the clipboard
-			handleDelete();
-			return false;
-		}
-		if (actionId.equals(ActionFactory.SELECT_ALL.getId())) {
-			text.selectAll();
-			return true;
-		}
-		if (actionId.equals(ActionFactory.COPY.getId())) {
-			text.copy();
-			return true;
-		}
-		if (actionId.equals(ActionFactory.PASTE.getId())) {
-			text.paste();
-			return true;
-		}
-		return false;
-	}
-
-	private void handleDelete() {
-		text.cut();
-	}
-
-	private void handleApply() {
-		try {
-			if (currentElement!=null)
-				currentElement.setText(
-						text.getText().length() > 0 ? text.getText() : ""); //$NON-NLS-1$
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-		applyButton.setEnabled(false);
-	}
-
-	public void commit(boolean onSave) {
-		handleApply();
-		if (onSave) {
-			resetButton.setEnabled(false);
-		}
-		super.commit(onSave);
-	}
-
-	private void handleReset() {
-		updateText(currentElement);
-		resetButton.setEnabled(false);
-		applyButton.setEnabled(false);
-	}
-
-	public void initialize() {
-		IPluginModelBase model = (IPluginModelBase) getPage().getModel();
-		model.addModelChangedListener(this);
-		text.setEditable(model.isEditable());
-		updateInput();
-	}
-
-	public void modelChanged(IModelChangedEvent event) {
-		if (event.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			return;
-		}
-	}
-
-	public void selectionChanged(IFormPart part, ISelection selection) {
-		Object changeObject = ((IStructuredSelection)selection).getFirstElement();
-		if (currentElement != null && currentElement == changeObject)
-			return;
-		if (changeObject instanceof IPluginElement)
-			this.currentElement = (IPluginElement) changeObject;
-		else
-			currentElement = null;
-		updateInput();
-	}
-	private void updateInput() {
-		applyButton.setEnabled(false);
-		resetButton.setEnabled(false);
-		updateText(currentElement);
-		text.setEditable(isEditable() && currentElement != null);
-	}
-
-	private void updateText(IPluginElement element) {
-		String bodyText = element != null ? element.getText() : null;
-
-		blockNotification=true;
-		text.setText(bodyText != null && bodyText.length()>0? bodyText : ""); //$NON-NLS-1$
-		applyButton.setEnabled(false);
-		resetButton.setEnabled(false);
-
-		updateTitle(bodyText != null && bodyText.length()>0);
-		blockNotification=false;
-	}
-	public boolean canPaste(Clipboard clipboard) {
-		return true;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/BundleInputContext.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/BundleInputContext.java
deleted file mode 100644
index 2452dba..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/BundleInputContext.java
+++ /dev/null

@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-
-import java.io.*;
-import java.util.*;
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.text.*;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.editor.context.*;
-import org.eclipse.pde.internal.ui.model.*;
-import org.eclipse.pde.internal.ui.model.bundle.*;
-import org.eclipse.text.edits.*;
-import org.eclipse.ui.*;
-
-public class BundleInputContext extends UTF8InputContext {
-	public static final String CONTEXT_ID = "bundle-context"; //$NON-NLS-1$
-	
-	private HashMap fOperationTable = new HashMap();
-	/**
-	 * @param editor
-	 * @param input
-	 */
-	public BundleInputContext(PDEFormEditor editor, IEditorInput input, boolean primary) {
-		super(editor, input, primary);
-		create();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.InputContext#createModel(org.eclipse.ui.IEditorInput)
-	 */
-	protected IBaseModel createModel(IEditorInput input) throws CoreException {
-		BundleModel model = null;
-		if (input instanceof IStorageEditorInput) {
-			boolean isReconciling = input instanceof IFileEditorInput;
-			IDocument document = getDocumentProvider().getDocument(input);
-			model = new BundleModel(document, isReconciling);
-			if (input instanceof IFileEditorInput) {
-				IFile file = ((IFileEditorInput)input).getFile();
-				model.setUnderlyingResource(file);
-				model.setCharset(file.getCharset());
-			} else if (input instanceof SystemFileEditorInput){
-				File file = (File)((SystemFileEditorInput)input).getAdapter(File.class);
-				IPath path = new Path(file.getAbsolutePath()).removeLastSegments(2);
-				model.setInstallLocation(path.addTrailingSeparator().toString());
-				model.setCharset(getDefaultCharset());
-			} else if (input instanceof JarEntryEditorInput){
-				File file = (File)((JarEntryEditorInput)input).getAdapter(File.class);
-				model.setInstallLocation(file.toString());
-				model.setCharset(getDefaultCharset());
-			} else {
-				model.setCharset(getDefaultCharset());				
-			}
-			model.load();
-		}
-		return model;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.InputContext#getId()
-	 */
-	public String getId() {
-		return CONTEXT_ID;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.context.InputContext#addTextEditOperation(java.util.ArrayList, org.eclipse.pde.core.IModelChangedEvent)
-	 */
-	protected void addTextEditOperation(ArrayList ops, IModelChangedEvent event) {
-		Object[] objects = event.getChangedObjects();
-		if (objects != null) {
-			for (int i = 0; i < objects.length; i++) {
-				Object object = objects[i];
-                if (object instanceof PackageObject)
-                    object = ((PackageObject)object).getHeader();
-                else if (object instanceof PackageFriend)
-                    object = ((PackageFriend)object).getHeader();
-                
-				if (object instanceof ManifestHeader) {
-					ManifestHeader header = (ManifestHeader)object;
-					TextEdit op = (TextEdit)fOperationTable.get(header);
-					if (op != null) {
-						fOperationTable.remove(header);
-						ops.remove(op);
-					}
-					if (header.getValue() == null || header.getValue().trim().length() == 0) {
-							deleteKey(header, ops);						
-					} else {
-						modifyKey(header, ops);
-					}
-				}
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.context.InputContext#getMoveOperations()
-	 */
-	protected TextEdit[] getMoveOperations() {
-		return new TextEdit[0];
-	}
-	
-	private void insertKey(IDocumentKey key, ArrayList ops) {
-		IDocument doc = getDocumentProvider().getDocument(getInput());
-		int offset = doc.getLength();
-		for (int i = doc.getNumberOfLines() - 1; i >= 0; i--) {
-			try {
-				if (doc.get(doc.getLineOffset(i), doc.getLineLength(i)).trim().length() > 0) {
-					break;
-				}
-				offset = doc.getLineOffset(i);
-			} catch (BadLocationException e) {
-			}
-		}
-		InsertEdit op = new InsertEdit(offset, key.write()); 
-		fOperationTable.put(key, op);
-		ops.add(op);
-	}
-	
-	private void deleteKey(IDocumentKey key, ArrayList ops) {
-		if (key.getOffset() > 0) {
-			TextEdit op = new DeleteEdit(key.getOffset(), key.getLength());
-			fOperationTable.put(key, op);
-			ops.add(op);
-		}
-	}
-	
-	private void modifyKey(IDocumentKey key, ArrayList ops) {		
-		if (key.getOffset() == -1) {
-			insertKey(key, ops);
-		} else {
-			TextEdit op = new ReplaceEdit(key.getOffset(), key.getLength(), key.write()); 
-			fOperationTable.put(key, op);
-			ops.add(op);
-		}	
-	}
-	public void doRevert() {
-		fEditOperations.clear();
-		fOperationTable.clear();
-		AbstractEditingModel model = (AbstractEditingModel)getModel();
-		model.reconciled(model.getDocument());
-	}
-	protected String getPartitionName() {
-		return "___bundle_partition"; //$NON-NLS-1$
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/BundleSourcePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/BundleSourcePage.java
deleted file mode 100644
index 46c6eb4..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/BundleSourcePage.java
+++ /dev/null

@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-import java.util.*;
-
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.internal.core.ibundle.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.elements.*;
-import org.eclipse.pde.internal.ui.model.IDocumentKey;
-import org.eclipse.pde.internal.ui.model.IDocumentRange;
-import org.eclipse.pde.internal.ui.model.bundle.*;
-import org.eclipse.swt.graphics.*;
-
-public class BundleSourcePage extends KeyValueSourcePage {
-	class BundleOutlineContentProvider extends DefaultContentProvider
-			implements ITreeContentProvider {
-		public Object[] getChildren(Object parent) {
-			return new Object[0];
-		}
-		public boolean hasChildren(Object parent) {
-			return false;
-		}
-		public Object getParent(Object child) {
-			return null;
-		}
-		public Object[] getElements(Object parent) {
-			if (parent instanceof BundleModel) {
-				BundleModel model = (BundleModel) parent;
-				Dictionary manifest = ((Bundle)model.getBundle()).getHeaders();
-				ArrayList keys = new ArrayList();
-				for (Enumeration elements = manifest.keys(); elements.hasMoreElements();) {
-					IDocumentKey key = (IDocumentKey) manifest.get(elements.nextElement());
-					if (key.getOffset() > -1)
-						keys.add(key);
-				}
-				return keys.toArray();
-			}
-			return new Object[0];
-		}
-	}
-	class BundleLabelProvider extends LabelProvider {
-		public String getText(Object obj) {
-			if (obj instanceof ManifestHeader) {
-				return ((ManifestHeader) obj).getName();
-			}
-			return super.getText(obj);
-		}
-		public Image getImage(Object obj) {
-			if (obj instanceof ManifestHeader)
-				return PDEPlugin.getDefault().getLabelProvider().get(
-					PDEPluginImages.DESC_BUILD_VAR_OBJ);
-			return null;
-		}
-	}
-	
-	public BundleSourcePage(PDEFormEditor editor, String id, String title) {
-		super(editor, id, title);
-	}
-	
-	protected ILabelProvider createOutlineLabelProvider() {
-		return new BundleLabelProvider();
-	}
-	
-	protected ITreeContentProvider createOutlineContentProvider() {
-		return new BundleOutlineContentProvider();
-	}
-	protected IDocumentRange getRangeElement(ITextSelection selection) {
-		if (selection.isEmpty())
-			return null;
-		IBundleModel model = (IBundleModel) getInputContext().getModel();
-		Dictionary manifest = ((Bundle) model.getBundle()).getHeaders();
-		int offset = selection.getOffset();
-		
-		for (Enumeration elements = manifest.elements(); elements.hasMoreElements();) {
-		    IDocumentRange node = (IDocumentRange) elements.nextElement();
-
-		    if (offset >= node.getOffset() &&
-		        offset < node.getOffset() + node.getLength()) {
-		        return node;
-		    }
-		}
-		return null;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/CreateManifestOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/CreateManifestOperation.java
deleted file mode 100644
index 6f13733..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/CreateManifestOperation.java
+++ /dev/null

@@ -1,111 +0,0 @@
-package org.eclipse.pde.internal.ui.editor.plugin;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-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.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.ClasspathHelper;
-import org.eclipse.pde.internal.core.PDEPluginConverter;
-import org.eclipse.pde.internal.core.TargetPlatform;
-import org.eclipse.text.edits.DeleteEdit;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.text.edits.ReplaceEdit;
-import org.eclipse.text.edits.TextEdit;
-
-public class CreateManifestOperation implements IRunnableWithProgress{
-	
-	private IPluginModelBase fModel;
-
-	public CreateManifestOperation(IPluginModelBase model) {
-		fModel = model;
-	}
-
-	public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-		try {
-			handleConvert();
-			trimOldManifest();
-		} catch (BadLocationException e) {
-			throw new InvocationTargetException(e);
-		} catch (CoreException e) {
-			throw new InvocationTargetException(e);
-		}	
-	}
-
-	private void handleConvert() throws CoreException {
-		IProject project = fModel.getUnderlyingResource().getProject();
-		String target = TargetPlatform.getTargetVersionString();
-		PDEPluginConverter.convertToOSGIFormat(project, target, ClasspathHelper.getDevDictionary(fModel), new NullProgressMonitor()); 
-		
-	}
-	
-	private void trimOldManifest() throws BadLocationException, CoreException {
-		ITextFileBufferManager manager = FileBuffers.getTextFileBufferManager();
-		String filename = fModel.isFragmentModel() ? "fragment.xml" : "plugin.xml"; //$NON-NLS-1$ //$NON-NLS-2$
-		IFile file = fModel.getUnderlyingResource().getProject().getFile(filename);
-		try {
-			manager.connect(file.getFullPath(), null);
-			ITextFileBuffer buffer = manager.getTextFileBuffer(file.getFullPath());
-			IDocument doc =  buffer.getDocument();
-			FindReplaceDocumentAdapter adapter = new FindReplaceDocumentAdapter(doc);
-			MultiTextEdit multiEdit = new MultiTextEdit();
-			TextEdit edit = editRootElement(fModel.isFragmentModel() ? "fragment" : "plugin", adapter, doc, 0); //$NON-NLS-1$ //$NON-NLS-2$
-			if (edit != null)
-				multiEdit.addChild(edit);
-			edit = removeElement("requires", adapter, doc, 0); //$NON-NLS-1$
-			if (edit != null)
-				multiEdit.addChild(edit);
-			edit = removeElement("runtime", adapter, doc, 0); //$NON-NLS-1$
-			if (edit != null)
-				multiEdit.addChild(edit);
-			
-			if (multiEdit.hasChildren()) {
-				multiEdit.apply(doc);
-				buffer.commit(null, true);
-			}
-		} finally {
-			manager.disconnect(file.getFullPath(), null);
-		}
-	}
-	
-	private TextEdit editRootElement(String elementName, FindReplaceDocumentAdapter adapter, IDocument doc, int offset) throws BadLocationException {
-		IRegion region = adapter.find(0, "<" + elementName + "[^>]*", true, true, false, true); //$NON-NLS-1$ //$NON-NLS-2$
-		if (region != null) {
-			String replacementString = "<" + elementName; //$NON-NLS-1$
-			if (doc.getChar(region.getOffset() + region.getLength()) == '/')
-				replacementString += "/"; //$NON-NLS-1$
-			return new ReplaceEdit(region.getOffset(), region.getLength(), replacementString);
-		}
-		return null;
-	}
-	
-	private TextEdit removeElement(String elementName, FindReplaceDocumentAdapter adapter, IDocument doc, int offset) throws BadLocationException {
-		IRegion region = adapter.find(0, "<" + elementName + "[^>]*", true, true, false, true); //$NON-NLS-1$ //$NON-NLS-2$
-		if (region != null) {
-			if (doc.getChar(region.getOffset() + region.getLength()) == '/')
-				return new DeleteEdit(region.getOffset(), region.getLength() + 1);
-			IRegion endRegion = adapter.find(0, "</" + elementName +">", true, true, false, true); //$NON-NLS-1$ //$NON-NLS-2$
-			if (endRegion != null) {
-				int lastPos = endRegion.getOffset() + endRegion.getLength() + 1;
-				while (Character.isWhitespace(doc.getChar(lastPos))) {
-					lastPos += 1;
-				}
-				lastPos -= 1;
-				return new DeleteEdit(region.getOffset(), lastPos - region.getOffset());
-			}
-		}
-		return null;
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/DependenciesPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/DependenciesPage.java
deleted file mode 100644
index 40dd2c1..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/DependenciesPage.java
+++ /dev/null

@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-import java.util.*;
-
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.*;
-import org.eclipse.ui.forms.editor.*;
-import org.eclipse.ui.forms.widgets.*;
-
-public class DependenciesPage extends PDEFormPage {
-	
-	public static final String PAGE_ID = "dependencies"; //$NON-NLS-1$
-	
-	public DependenciesPage(FormEditor editor) {
-		super(editor, PAGE_ID, PDEUIMessages.DependenciesPage_tabName);  
-	}
-	
-	protected void createFormContent(IManagedForm managedForm) {
-		super.createFormContent(managedForm);
-		boolean isBundle = isBundle();
-		ScrolledForm form = managedForm.getForm();
-		form.setText(PDEUIMessages.DependenciesPage_title); 
-		Composite body = form.getBody();
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginWidth = 10;
-		layout.verticalSpacing = 20;
-		layout.horizontalSpacing = 10;
-		layout.makeColumnsEqualWidth = isBundle;
-		body.setLayout(layout);
-		
-		managedForm.addPart(new RequiresSection(this, body, getRequiredSectionLabels()));		
-		if (isBundle)
-			managedForm.addPart(new ImportPackageSection(this, body));
-		else
-			managedForm.addPart(new MatchSection(this, body, true));
-		
-		DependencyAnalysisSection section = new DependencyAnalysisSection(this, body, isBundle ? Section.COMPACT : Section.EXPANDED);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL|GridData.VERTICAL_ALIGN_BEGINNING);
-		if (isBundle)
-			gd.horizontalSpan = 2;
-		else
-			gd.widthHint = 150;
-		section.getSection().setLayoutData(gd);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.MANIFEST_PLUGIN_DEPENDENCIES);
-	}
-	
-	private boolean isBundle() {
-		return getPDEEditor().getContextManager().findContext(BundleInputContext.CONTEXT_ID) != null;
-	}
-    
-    private String[] getRequiredSectionLabels() {
-        ArrayList labels = new ArrayList();
-        labels.add(PDEUIMessages.RequiresSection_add);
-        labels.add(PDEUIMessages.RequiresSection_delete);
-        labels.add(PDEUIMessages.RequiresSection_up);
-        labels.add(PDEUIMessages.RequiresSection_down);
-        if (isBundle())
-            labels.add(PDEUIMessages.DependenciesPage_properties);
-        return (String[])labels.toArray(new String[labels.size()]);
-    }
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/DependencyAnalysisSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/DependencyAnalysisSection.java
deleted file mode 100644
index 7a38999..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/DependencyAnalysisSection.java
+++ /dev/null

@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.builders.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.search.*;
-import org.eclipse.pde.internal.ui.search.dependencies.*;
-import org.eclipse.pde.internal.ui.view.OpenDependenciesAction;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.forms.events.*;
-import org.eclipse.ui.forms.widgets.*;
-
-public class DependencyAnalysisSection extends PDESection {
-	private FormText formText;
-
-	public DependencyAnalysisSection(PDEFormPage page, Composite parent, int style) {
-		super(page, parent, Section.TITLE_BAR|Section.TWISTIE|style);
-		createClient(getSection(), page.getEditor().getToolkit());
-	}
-
-	private String getFormText() {
-		boolean editable = getPage().getModel().isEditable();
-		if (getPage().getModel() instanceof IPluginModel) {
-			if (editable)
-				return PDEUIMessages.DependencyAnalysisSection_plugin_editable;  
-			return PDEUIMessages.DependencyAnalysisSection_plugin_notEditable; 
-		}
-		if (editable)
-			return PDEUIMessages.DependencyAnalysisSection_fragment_editable;  
-		return PDEUIMessages.DependencyAnalysisSection_fragment_notEditable; 
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.PDESection#createClient(org.eclipse.ui.forms.widgets.Section, org.eclipse.ui.forms.widgets.FormToolkit)
-	 */
-	protected void createClient(Section section, FormToolkit toolkit) {
-		section.setText(PDEUIMessages.DependencyAnalysisSection_title); 
-
-		formText = toolkit.createFormText(section, true);
-		formText.setText(getFormText(), true, false);		
-		PDELabelProvider lp = PDEPlugin.getDefault().getLabelProvider();
-		formText.setImage("loops", lp.get(PDEPluginImages.DESC_LOOP_OBJ)); //$NON-NLS-1$
-		formText.setImage("search", lp.get(PDEPluginImages.DESC_PSEARCH_OBJ)); //$NON-NLS-1$
-		formText.setImage("hierarchy", lp.get(PDEPluginImages.DESC_HIERARCHICAL_LAYOUT)); //$NON-NLS-1$
-		formText.addHyperlinkListener(new HyperlinkAdapter() {
-			public void linkActivated(HyperlinkEvent e) {
-				if (e.getHref().equals("unused")) //$NON-NLS-1$
-					doFindUnusedDependencies();
-				else if (e.getHref().equals("loops")) //$NON-NLS-1$
-					doFindLoops();
-				else if (e.getHref().equals("references")) //$NON-NLS-1$
-					doFindReferences();
-				else if (e.getHref().equals("hierarchy")) //$NON-NLS-1$
-					OpenDependenciesAction.openDependencies((IPluginModelBase)getPage().getModel());
-			}
-		});
-		
-		section.setClient(formText);
-	}
-
-	protected void doFindLoops() {
-		IBaseModel model = getPage().getModel();
-		if (model instanceof IPluginModel) {
-			IPlugin plugin = ((IPluginModel)model).getPlugin();
-			DependencyLoop[] loops = DependencyLoopFinder.findLoops(plugin);
-			if (loops.length == 0)
-				MessageDialog.openInformation(PDEPlugin.getActiveWorkbenchShell(), PDEUIMessages.DependencyAnalysisSection_loops, PDEUIMessages.DependencyAnalysisSection_noCycles); // 
-			else {
-				LoopDialog dialog = new LoopDialog(PDEPlugin.getActiveWorkbenchShell(), loops);
-				dialog.open();
-			}
-		}	
-	}
-
-	protected void doFindUnusedDependencies() {
-		IBaseModel model = getPage().getModel();
-		if (model instanceof IPluginModelBase) {
-			new UnusedDependenciesAction((IPluginModelBase)model, false).run();
-		}		
-	}
-	
-	private void doFindReferences() {
-		IBaseModel model = getPage().getModel();
-		if (model instanceof IPluginModel) {
-			new FindReferencesAction(((IPluginModel)model).getPlugin()).run();
-		} else if (model instanceof IFragmentModel){
-			IFragment fragment = ((IFragmentModel)model).getFragment();
-			String id = fragment.getPluginId();
-			ModelEntry entry = PDECore.getDefault().getModelManager().findEntry(id);
-			if (entry != null) {
-				IPluginModelBase pluginModel = entry.getActiveModel();
-				new FindDeclarationsAction(pluginModel.getPluginBase()).run();
-			} else {
-				MessageDialog.openInformation(
-						PDEPlugin.getActiveWorkbenchShell(), 
-						PDEUIMessages.DependencyAnalysisSection_references,  
-						PDEUIMessages.DependencyAnalysisSection_noReferencesFound);  
-			}
-		}
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/DependencyPropertiesDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/DependencyPropertiesDialog.java
deleted file mode 100644
index 80adf35..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/DependencyPropertiesDialog.java
+++ /dev/null

@@ -1,299 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.PluginVersionIdentifier;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.StatusDialog;
-import org.eclipse.osgi.service.resolver.VersionRange;
-import org.eclipse.pde.core.plugin.IPluginImport;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.model.bundle.ExportPackageObject;
-import org.eclipse.pde.internal.ui.model.bundle.ImportPackageObject;
-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.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.Text;
-import org.osgi.framework.Version;
-
-public class DependencyPropertiesDialog extends StatusDialog {
-
-    private Button fReexportButton;
-    private Button fOptionalButton;
-    private boolean fEditable;
-    private boolean fShowReexport;
-    
-    private boolean fExported;
-    private boolean fOptional;
-
-    private Text fMinVersionText;
-    private Text fMaxVersionText;
-    private Combo fMinVersionBound;
-    private Combo fMaxVersionBound;
-    
-    private VersionRange fVersionRange;
-    private boolean ranged;
-    private String fVersion;
-    
-    private boolean fShowOptional;
-	private boolean fRangeAllowed;
-
-    public DependencyPropertiesDialog(boolean editable, IPluginImport plugin) {
-        this (editable, true, plugin.isReexported(), plugin.isOptional(), plugin.getVersion(), true, true);
-    }
-    
-    public DependencyPropertiesDialog(boolean editable, ImportPackageObject object) {
-        this (editable, false, false, object.isOptional(), object.getVersion(), true, true);
-    }
-
-    public DependencyPropertiesDialog(boolean editable, ExportPackageObject object) {
-        this (editable, false, false, false, object.getVersion(), false, false);
-    }
-
-    public DependencyPropertiesDialog(boolean editable, boolean showReexport, boolean export, boolean optional, String version, boolean showOptional, boolean rangeAllowed) {
-        super(PDEPlugin.getActiveWorkbenchShell());
-        fEditable = editable;
-        fShowReexport = showReexport;
-        fExported = export;
-        fOptional = optional;
-        fShowOptional = showOptional;
-        fRangeAllowed = rangeAllowed;
-        loadVersion(version);
-    }
-    
-    
-    private void loadVersion(String version) {
-    	try {
-        	if (version != null && !version.equals("")) { //$NON-NLS-1$
-        		fVersionRange = new VersionRange(version);
-        	} 
-        } catch (IllegalArgumentException e) {
-        	// illegal version string passed
-        	fVersionRange = new VersionRange("[0.0.0,0.0.0]"); //$NON-NLS-1$
-        }
-	}
-
-	protected void createButtonsForButtonBar(Composite parent) {
-        super.createButtonsForButtonBar(parent);
-    }
-    
-    protected Control createDialogArea(Composite parent) {
-        Composite comp = (Composite)super.createDialogArea(parent);
-        
-        if (fShowOptional || fShowReexport) {
-		    Group container = new Group(comp, SWT.NONE);
-		    container.setText(PDEUIMessages.DependencyPropertiesDialog_properties);
-		    container.setLayout(new GridLayout());
-		    container.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-        
-	        if (fShowOptional) {
-	            fOptionalButton = new Button(container, SWT.CHECK);
-	            fOptionalButton.setText(PDEUIMessages.DependencyPropertiesDialog_optional);
-	            GridData gd = new GridData();
-	            gd.horizontalSpan = 2;
-	            fOptionalButton.setLayoutData(gd); 
-	            fOptionalButton.setEnabled(fEditable);
-	            fOptionalButton.setSelection(fOptional);
-	        }
-	        
-	        if (fShowReexport) {
-	            fReexportButton = new Button(container, SWT.CHECK);
-	            fReexportButton.setText(PDEUIMessages.DependencyPropertiesDialog_reexport);
-	            GridData gd = new GridData();
-	            gd.horizontalSpan = 2;
-	            fReexportButton.setLayoutData(gd);
-	            fReexportButton.setEnabled(fEditable);
-	            fReexportButton.setSelection(fExported);
-	        }
-        }
-        if (fRangeAllowed)
-    	    createRangedGroup(comp);
-        else
-        	createSingleGroup(comp);
-
-        preloadFields();
-        
-        return comp;
-    }
-    
-    private void createRangedGroup(Composite parent) {
-	    Group rangedGroup = new Group(parent, SWT.NONE);
-	    rangedGroup.setText(PDEUIMessages.DependencyPropertiesDialog_groupText);
-	    rangedGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-	    rangedGroup.setLayout(new GridLayout(3, false));
-        String[] comboItems = new String[] {PDEUIMessages.DependencyPropertiesDialog_comboInclusive, PDEUIMessages.DependencyPropertiesDialog_comboExclusive};        
-	    
-	    Label minlabel = new Label(rangedGroup, SWT.NONE);
-	    minlabel.setText(PDEUIMessages.DependencyPropertiesDialog_minimumVersion);
-	    fMinVersionText = new Text(rangedGroup, SWT.SINGLE|SWT.BORDER);
-	    fMinVersionText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-	    fMinVersionText.setEnabled(fEditable);
-	    fMinVersionText.addModifyListener(new ModifyListener() {
-            public void modifyText(ModifyEvent e) {
-            	updateStatus(validateFullVersionRangeText());
-            }
-        });
-	    
-	    fMinVersionBound = new Combo(rangedGroup, SWT.SINGLE|SWT.BORDER|SWT.READ_ONLY );
-	    fMinVersionBound.setEnabled(fEditable);
-	    fMinVersionBound.setItems(comboItems);
-	    
-	    Label maxlabel = new Label(rangedGroup, SWT.NONE);
-	    maxlabel.setText(PDEUIMessages.DependencyPropertiesDialog_maximumVersion);
-	    fMaxVersionText = new Text(rangedGroup, SWT.SINGLE|SWT.BORDER);
-	    fMaxVersionText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-	    fMaxVersionText.setEnabled(fEditable);
-	    fMaxVersionText.addModifyListener(new ModifyListener() {
-            public void modifyText(ModifyEvent e) {
-            	updateStatus(validateFullVersionRangeText());
-            }
-        });
-	    
-	    fMaxVersionBound = new Combo(rangedGroup, SWT.SINGLE|SWT.BORDER|SWT.READ_ONLY);
-	    fMaxVersionBound.setEnabled(fEditable);
-	    fMaxVersionBound.setItems(comboItems);
-    }
-    
-
-
-	private void createSingleGroup(Composite parent) {
-	    Group singleGroup = new Group(parent, SWT.NONE);
-	    singleGroup.setText(PDEUIMessages.DependencyPropertiesDialog_groupText);
-        singleGroup.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING|GridData.FILL_HORIZONTAL));
-        singleGroup.setLayout(new GridLayout(2, false));
-        
-        Label label = new Label(singleGroup, SWT.NONE);
-        label.setText(PDEUIMessages.DependencyPropertiesDialog_version);
-        
-        fMinVersionText = new Text(singleGroup, SWT.SINGLE|SWT.BORDER);
-        fMinVersionText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-        fMinVersionText.setEnabled(fEditable);
-        fMinVersionText.addModifyListener(new ModifyListener() {
-            public void modifyText(ModifyEvent e) {
-                updateStatus(validateVersion(getMinVersion()));
-            }
-        });
-	}
-    
-	private void preloadFields() {
-		if (fRangeAllowed) {
-		    fMinVersionText.setText((fVersionRange != null) ? fVersionRange.getMinimum().toString() : ""); //$NON-NLS-1$
-		    fMaxVersionText.setText((fVersionRange != null && fVersionRange.getMaximum().getMajor() != Integer.MAX_VALUE) ? fVersionRange.getMaximum().toString() : ""); //$NON-NLS-1$
-
-		    if (fVersionRange != null)
-		    	fMinVersionBound.select((fVersionRange.getIncludeMinimum()) ? 0 : 1);
-		    else
-		    	fMinVersionBound.select(0);
-		    
-		    if (fVersionRange != null)
-		    	fMaxVersionBound.select((fVersionRange.getIncludeMaximum()) ? 0 : 1);
-		    else
-		    	fMaxVersionBound.select(1);
-		}
-        fMinVersionText.setText((fVersionRange != null) ? fVersionRange.getMinimum().toString() : ""); //$NON-NLS-1$
-	}
-	
-    private IStatus validateVersion(String text) {
-    	if (text.length() == 0) return Status.OK_STATUS;
-        if (PluginVersionIdentifier.validateVersion(text).getSeverity() != IStatus.OK)
-            return new Status(IStatus.ERROR, "org.eclipse.pde.ui", IStatus.ERROR, PDEUIMessages.DependencyPropertiesDialog_invalidFormat, null); //$NON-NLS-1$
-        return Status.OK_STATUS;
-    }
-    
-	protected IStatus validateVersionRange() {
-		if (getMinVersion().length() == 0 || getMaxVersion().length() == 0) {
-			ranged = false;
-			return Status.OK_STATUS;
-		}
-		Version v1 = new Version(getMinVersion());
-		Version v2 = new Version(getMaxVersion());
-        if (v1.compareTo(v2) == 0) {
-        	ranged = false;
-        	return Status.OK_STATUS;
-        } else if (v1.compareTo(v2) < 0) {
-        	ranged = true;
-            return Status.OK_STATUS;
-        }
-		return new Status(IStatus.ERROR, "org.eclipse.pde.ui", IStatus.ERROR, PDEUIMessages.DependencyPropertiesDialog_versionRangeError, null); //$NON-NLS-1$;
-	}
-    
-
-	private IStatus validateFullVersionRangeText() {
-    	IStatus status = validateVersion(getMinVersion());
-    	if (status.isOK()) status = validateVersion(getMaxVersion());
-    	if (status.isOK()) status = validateVersionRange();
-        return status;
-	}
-	
-	private String getMinVersion() {
-		return fMinVersionText.getText().trim();
-	}
-	private String getMaxVersion() {
-		if (fMaxVersionText != null)
-			return fMaxVersionText.getText().trim();
-		return ""; //$NON-NLS-1$
-	}
-	private boolean getMinInclusive() {
-		if (fMinVersionBound != null)
-			return fMinVersionBound.getSelectionIndex() == 0;
-		return false;
-	}
-	private boolean getMaxInclusive() {
-		if (fMaxVersionBound != null)
-			return fMaxVersionBound.getSelectionIndex() == 0;
-		return true;
-	}
-	
-	private String extractSingleVersionFromText() {
-		if (!fRangeAllowed) return getMinVersion();
-		if (getMinVersion().length() == 0)
-			return getMaxVersion();
-		return getMinVersion();
-	}
-	
-    public boolean isReexported() {
-        return fExported;
-    }
-    
-    public boolean isOptional() {
-        return fOptional;
-    }
-    
-    public String getVersion() {
-    	return fVersion;
-    }
-    
-    protected void okPressed() {
-        fOptional = (fOptionalButton == null) ? false : fOptionalButton.getSelection();
-        fExported = (fReexportButton == null) ? false : fReexportButton.getSelection();
-        
-        if (ranged)
-        	fVersion = new VersionRange(new Version(getMinVersion()), getMinInclusive(), new Version(getMaxVersion()), getMaxInclusive()).toString();
-        else {
-        	String version = extractSingleVersionFromText();
-        	if (version == null || version.length() == 0)
-        		fVersion = version;
-        	else
-        		fVersion = new Version(version).toString(); 
-        }
-        super.okPressed();
-    }
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExportPackageSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExportPackageSection.java
deleted file mode 100644
index 62636ff..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExportPackageSection.java
+++ /dev/null

@@ -1,417 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.editor.plugin;
-
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.ui.ISharedImages;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-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.osgi.service.resolver.ExportPackageDescription;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.core.IModelChangedListener;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.ICoreConstants;
-import org.eclipse.pde.internal.core.bundle.BundlePluginBase;
-import org.eclipse.pde.internal.core.ibundle.IBundle;
-import org.eclipse.pde.internal.core.ibundle.IBundleModel;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.TableSection;
-import org.eclipse.pde.internal.ui.editor.context.InputContextManager;
-import org.eclipse.pde.internal.ui.elements.DefaultTableProvider;
-import org.eclipse.pde.internal.ui.model.bundle.Bundle;
-import org.eclipse.pde.internal.ui.model.bundle.ExportPackageHeader;
-import org.eclipse.pde.internal.ui.model.bundle.ExportPackageObject;
-import org.eclipse.pde.internal.ui.model.bundle.PackageObject;
-import org.eclipse.pde.internal.ui.parts.TablePart;
-import org.eclipse.pde.internal.ui.util.SWTUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-import org.osgi.framework.Constants;
-import org.osgi.framework.Version;
-
-public class ExportPackageSection extends TableSection implements IModelChangedListener {
-
-    private static final int ADD_INDEX = 0;
-    private static final int REMOVE_INDEX = 1;
-    private static final int PROPERTIES_INDEX = 2;
-    
-	class ExportPackageContentProvider extends DefaultTableProvider {
-		public Object[] getElements(Object parent) {
-			if (fHeader == null) {
-                Bundle bundle = (Bundle)getBundle();
-                fHeader = (ExportPackageHeader)bundle.getManifestHeader(getExportedPackageHeader());
-            }
-            return fHeader == null ? new Object[0] : fHeader.getPackages();
-		}
-    }
-
-	class ExportPackageDialogLabelProvider extends LabelProvider {
-		public Image getImage(Object element) {
-			return JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_PACKAGE);
-		}
-
-		public String getText(Object element) {
-			ExportPackageDescription p = (ExportPackageDescription) element;
-            StringBuffer buffer = new StringBuffer(p.getName());
-            String version = p.getVersion().toString();
-            if (!version.equals(Version.emptyVersion.toString())) {
-                buffer.append(PDEUIMessages.ExportPackageSection_0);
-                buffer.append(version);
-                buffer.append(")"); //$NON-NLS-1$
-            }
-			return buffer.toString();
-		}
-	}
-
-    private TableViewer fPackageViewer;
-
-    private Action fAddAction;
-    private Action fRemoveAction;
-    private Action fPropertiesAction;
-    private ExportPackageHeader fHeader;
-
-	public ExportPackageSection(PDEFormPage page, Composite parent) {
-		super(
-				page,
-				parent,
-				Section.DESCRIPTION,
-				new String[] {PDEUIMessages.ExportPackageSection_add, PDEUIMessages.ExportPackageSection_remove, PDEUIMessages.ExportPackageSection_properties}); 
-	}
-
-    private boolean isFragment() {
-        IPluginModelBase model = (IPluginModelBase)getPage().getPDEEditor().getAggregateModel();
-        return model.isFragmentModel();
-    }
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.editor.PDESection#createClient(org.eclipse.ui.forms.widgets.Section,
-	 *      org.eclipse.ui.forms.widgets.FormToolkit)
-	 */
-	protected void createClient(Section section, FormToolkit toolkit) {
-        section.setText(PDEUIMessages.ExportPackageSection_title); 
-        if (isFragment())
-			section.setDescription(PDEUIMessages.ExportPackageSection_descFragment);
-		else
-			section.setDescription(PDEUIMessages.ExportPackageSection_desc);
-
-        Composite container = createClientContainer(section, 2, toolkit);
-		createViewerPartControl(container, SWT.MULTI, 2, toolkit);
-		TablePart tablePart = getTablePart();
-		fPackageViewer = tablePart.getTableViewer();
-		fPackageViewer.setContentProvider(new ExportPackageContentProvider());
-		fPackageViewer.setLabelProvider(PDEPlugin.getDefault().getLabelProvider());
-		fPackageViewer.setSorter(new ViewerSorter() {
-            public int compare(Viewer viewer, Object e1, Object e2) {
-                String s1 = e1.toString();
-                String s2 = e2.toString();
-                if (s1.indexOf(" ") != -1) //$NON-NLS-1$
-                    s1 = s1.substring(0, s1.indexOf(" ")); //$NON-NLS-1$
-                if (s2.indexOf(" ") != -1) //$NON-NLS-1$
-                    s2 = s2.substring(0, s2.indexOf(" ")); //$NON-NLS-1$
-                return super.compare(viewer, s1, s2);
-            }
-        });
-		toolkit.paintBordersFor(container);
-		section.setClient(container);
-        GridData gd = new GridData(GridData.FILL_BOTH);
-        if (((ManifestEditor)getPage().getEditor()).isEquinox()) {
-	        gd.verticalSpan = 2;
-	        gd.minimumWidth = 300;
-        }
-		section.setLayoutData(gd);
-        makeActions();
-        
-        IBundleModel model = getBundleModel();
-        fPackageViewer.setInput(model);
-        model.addModelChangedListener(this);
-        updateButtons();
-	}
-    
-    public boolean doGlobalAction(String actionId) {
-        if (actionId.equals(ActionFactory.DELETE.getId())) {
-            handleRemove();
-            return true;
-        }
-        if (actionId.equals(ActionFactory.CUT.getId())) {
-            // delete here and let the editor transfer
-            // the selection to the clipboard
-            handleRemove();
-            return false;
-        }
-        if (actionId.equals(ActionFactory.PASTE.getId())) {
-            doPaste();
-            return true;
-        }
-        return false;
-    }
-    
-    public void dispose() {
-        IBundleModel model = getBundleModel();
-        if (model != null)
-            model.removeModelChangedListener(this);
-        super.dispose();
-    }
-        
-    protected void doPaste() {
-    }
-
-	protected void selectionChanged(IStructuredSelection sel) {
-        getPage().getPDEEditor().setSelection(sel);
-        updateButtons();
-	}
-
-	private void updateButtons() {
-		Object[] selected = ((IStructuredSelection)fPackageViewer.getSelection()).toArray();
-
-		TablePart tablePart = getTablePart();
-        tablePart.setButtonEnabled(ADD_INDEX, isEditable());
-        tablePart.setButtonEnabled(REMOVE_INDEX, isEditable() && selected.length > 0);
-    	tablePart.setButtonEnabled(PROPERTIES_INDEX, shouldEnableProperties(selected));  
-        
-    }
-	
-	private boolean shouldEnableProperties(Object[] selected) {
-		if (selected.length == 0)
-			return false;
-		if (selected.length == 1)
-			return true;
-
-		String version = ((ExportPackageObject) selected[0]).getVersion();
-		for (int i = 1; i < selected.length; i++) {
-			ExportPackageObject object = (ExportPackageObject) selected[i];
-			if (version == null) {
-				if (object.getVersion() != null) {
-					return false;
-				}
-			} else if (!version.equals(object.getVersion())) {
-				return false;
-			}
-		}
-		return true;
-	}
-    
-    protected void handleDoubleClick(IStructuredSelection selection) {
-        handleOpenProperties();
-    }
-
-    protected void buttonSelected(int index) {
-        switch (index) {
-        case ADD_INDEX:
-            handleAdd();
-            break;
-        case REMOVE_INDEX:
-            handleRemove();
-            break;
-        case PROPERTIES_INDEX:
-            handleOpenProperties();
-        }
-	}
-
-	private void handleOpenProperties() {
-		Object[] selected = ((IStructuredSelection) fPackageViewer.getSelection()).toArray();
-		ExportPackageObject first = (ExportPackageObject)selected[0];
-        DependencyPropertiesDialog dialog = new DependencyPropertiesDialog(isEditable(), first);
-        dialog.create();
-        SWTUtil.setDialogSize(dialog, 400, -1);
-        if (selected.length == 1)
-        	dialog.setTitle(((ExportPackageObject)selected[0]).getName());
-        else 
-        	dialog.setTitle(PDEUIMessages.ExportPackageSection_props);
-        if (dialog.open() == DependencyPropertiesDialog.OK && isEditable()) {
-        	String newVersion = dialog.getVersion();
-        	for (int i = 0; i < selected.length; i++) {
-        		ExportPackageObject object = (ExportPackageObject)selected[i];
-        		if (!newVersion.equals(object.getVersion()))
-        			object.setVersion(newVersion);
-        	}
-         }
-    }
-
-	private void handleRemove() {
-		Object[] removed = ((IStructuredSelection) fPackageViewer.getSelection()).toArray();
-        for (int i = 0; i < removed.length; i++) {
-            fHeader.removePackage((PackageObject) removed[i]);
-        }
-	}
-
-	private void handleAdd() {
-        IPluginModelBase model = (IPluginModelBase) getPage().getModel();
-        IProject project = model.getUnderlyingResource().getProject();
-        try {
-            if (project.hasNature(JavaCore.NATURE_ID)) {
-                ILabelProvider labelProvider = new JavaElementLabelProvider();
-                PackageSelectionDialog dialog = new PackageSelectionDialog(
-                        PDEPlugin.getActiveWorkbenchShell(),
-                        labelProvider, 
-                        JavaCore.create(project), 
-                        fHeader == null ? new Vector() : fHeader.getPackageNames(),
-                        "true".equals(getBundle().getHeader(ICoreConstants.ECLIPSE_JREBUNDLE))); //$NON-NLS-1$
-                if (dialog.open() == PackageSelectionDialog.OK) {
-                    Object[] selected = dialog.getResult();
-                    if (fHeader != null) {
-                        for (int i = 0; i < selected.length; i++) {
-                            IPackageFragment candidate = (IPackageFragment) selected[i];
-                            fHeader.addPackage(new ExportPackageObject(fHeader, candidate, getVersionAttribute()));
-                        }
-                    } else {
-                        getBundle().setHeader(getExportedPackageHeader(), getValue(selected));
-                    }
-                }
-                labelProvider.dispose();
-            }
-        } catch (CoreException e) {
-        }
-	}
-    
-    private String getValue(Object[] objects) {
-        StringBuffer buffer = new StringBuffer();
-        for (int i = 0; i < objects.length; i++) {
-            IPackageFragment fragment = (IPackageFragment)objects[i];
-            if (buffer.length() > 0)
-                buffer.append("," + getLineDelimiter() + " "); //$NON-NLS-1$ //$NON-NLS-2$
-            buffer.append(fragment.getElementName());
-        }
-        return buffer.toString();
-    }
-    
-	public void modelChanged(IModelChangedEvent event) {
-		if (event.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-            fHeader = null;
-			markStale();
-			return;
-		}   
-        
-        if (getExportedPackageHeader().equals(event.getChangedProperty())) {
-            refresh();
-            return;
-        }
-        
-        Object[] objects = event.getChangedObjects();
-        for (int i = 0; i < objects.length; i++) {
-            if (objects[i] instanceof ExportPackageObject) {
-                ExportPackageObject object = (ExportPackageObject)objects[i];
-                switch (event.getChangeType()) {
-                    case IModelChangedEvent.INSERT:
-                        fPackageViewer.add(object);
-                        fPackageViewer.setSelection(new StructuredSelection(object));
-                        fPackageViewer.getTable().setFocus();
-                        break;
-                    case IModelChangedEvent.REMOVE:
-                        Table table = fPackageViewer.getTable();
-                        int index = table.getSelectionIndex();
-                        fPackageViewer.remove(object);
-                        table.setSelection(index < table.getItemCount() ? index : table.getItemCount() -1);
-                        break;
-                    default:
-                        fPackageViewer.refresh(object);
-                }
-            }
-        }
-	}
-
-	public void refresh() {
-		fPackageViewer.refresh();
-		super.refresh();
-	}
-    
-    private void makeActions() {
-        fAddAction = new Action(PDEUIMessages.RequiresSection_add) { 
-            public void run() {
-                handleAdd();
-            }
-        };
-        fAddAction.setEnabled(isEditable());
-        fRemoveAction = new Action(PDEUIMessages.RequiresSection_delete) { 
-            public void run() {
-                handleRemove();
-            }
-        };
-        fRemoveAction.setEnabled(isEditable());
-        
-        fPropertiesAction = new Action(PDEUIMessages.ExportPackageSection_propertyAction) { 
-            public void run() {
-                handleOpenProperties();
-            }
-        };
-    }
-
-	protected void fillContextMenu(IMenuManager manager) {
-        manager.add(fAddAction);
-        manager.add(new Separator());
-        manager.add(fRemoveAction);
-		getPage().getPDEEditor().getContributor().contextMenuAboutToShow(manager);
-        if (shouldEnableProperties(((IStructuredSelection)fPackageViewer.getSelection()).toArray())) {
-            manager.add(new Separator());
-            manager.add(fPropertiesAction);
-        }
-	}
-
-    private BundleInputContext getBundleContext() {
-        InputContextManager manager = getPage().getPDEEditor().getContextManager();
-        return (BundleInputContext) manager.findContext(BundleInputContext.CONTEXT_ID);
-    }
-    
-    private IBundleModel getBundleModel() {
-        BundleInputContext context = getBundleContext();
-        return (context != null) ? (IBundleModel)context.getModel() : null;
-        
-    }
-    
-     private String getLineDelimiter() {
-		BundleInputContext inputContext = getBundleContext();
-		if (inputContext != null) {
-			return inputContext.getLineDelimiter();
-		}
-		return System.getProperty("line.separator"); //$NON-NLS-1$
-	}
-
-     private IBundle getBundle() {
-        IBundleModel model = getBundleModel();
-         return (model != null) ? model.getBundle() : null;
-    }
-    
-    private String getVersionAttribute() {
-        int manifestVersion = BundlePluginBase.getBundleManifestVersion(getBundle());
-        return (manifestVersion < 2) ? ICoreConstants.PACKAGE_SPECIFICATION_VERSION : Constants.VERSION_ATTRIBUTE;
-    }
- 
-    public String getExportedPackageHeader() {
-        int manifestVersion = BundlePluginBase.getBundleManifestVersion(getBundle());
-        return (manifestVersion < 2) ? ICoreConstants.PROVIDE_PACKAGE : Constants.EXPORT_PACKAGE;
-    }
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExportPackageVisibilitySection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExportPackageVisibilitySection.java
deleted file mode 100644
index b296ab6..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExportPackageVisibilitySection.java
+++ /dev/null

@@ -1,298 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.viewers.ISelection;
-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.TableViewer;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.core.plugin.IPluginModel;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.ibundle.IBundleModel;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.TableSection;
-import org.eclipse.pde.internal.ui.editor.context.InputContextManager;
-import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
-import org.eclipse.pde.internal.ui.model.bundle.ExportPackageObject;
-import org.eclipse.pde.internal.ui.model.bundle.PackageFriend;
-import org.eclipse.pde.internal.ui.parts.EditableTablePart;
-import org.eclipse.pde.internal.ui.wizards.PluginSelectionDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-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.ui.actions.ActionFactory;
-import org.eclipse.ui.forms.IFormPart;
-import org.eclipse.ui.forms.IPartSelectionListener;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-import org.osgi.framework.Constants;
-
-public class ExportPackageVisibilitySection extends TableSection
-		implements IPartSelectionListener {
-    
-    private static int ADD_INDEX = 0;
-    private static int REMOVE_INDEX = 1;
-    
-	private TableViewer fFriendViewer;
-    private Action fAddAction;
-    private Action fRemoveAction;
-    private Button fInternalButton;
-    private boolean fBlockChanges;
-    private ExportPackageObject[] fSelectedObjects;
-    private Image fImage;
-	private Button fVisibleButton;
-	
-	class TableContentProvider extends DefaultContentProvider
-			implements IStructuredContentProvider {
-		public Object[] getElements(Object parent) {
-            ExportPackageObject object = (ExportPackageObject)parent;
-            if (!object.isInternal()) return new Object[0];
-            return (object != null) ? object.getFriends() : new Object[0];
-		}
-	}
-	class TableLabelProvider extends LabelProvider
-			implements ITableLabelProvider {
-        
-		public String getColumnText(Object obj, int index) {
-			return obj.toString();
-		}
-		public Image getColumnImage(Object obj, int index) {
-			return fImage;
-		}
-	}
-    
-	public ExportPackageVisibilitySection(PDEFormPage formPage, Composite parent) {
-		super(formPage, parent, Section.DESCRIPTION, new String[]{
-				PDEUIMessages.ManifestEditor_ExportSection_add,
-				PDEUIMessages.ManifestEditor_ExportSection_remove});
-		handleDefaultButton = false;
-	}
-    
-	public void createClient(Section section, FormToolkit toolkit) {
-        section.setText(PDEUIMessages.ExportPackageVisibilitySection_title);
-        section.setDescription(PDEUIMessages.ExportPackageVisibilitySection_default);
-		Composite comp = toolkit.createComposite(section);
-        GridLayout layout = new GridLayout();
-        layout.verticalSpacing = 5;
-		comp.setLayout(layout);
-        
-        fVisibleButton = toolkit.createButton(comp, PDEUIMessages.ExportPackageVisibilitySection_unconditional, SWT.RADIO);
-
-        fInternalButton = toolkit.createButton(comp, PDEUIMessages.ExportPackageVisibilitySection_hideAll, SWT.RADIO);
-        fInternalButton.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
-                if (!fBlockChanges) {
-                	for (int i = 0; i < fSelectedObjects.length; i++) {
-                		fSelectedObjects[i].setInternal(fInternalButton.getSelection());
-                	}
-                	getTablePart().setButtonEnabled(ADD_INDEX, fInternalButton.getSelection());
-                	getTablePart().setButtonEnabled(REMOVE_INDEX, fInternalButton.getSelection());
-                	fFriendViewer.refresh();
-                }
-            }
-        });
-        
-        Composite container = toolkit.createComposite(comp);
-        container.setLayoutData(new GridData(GridData.FILL_BOTH));
-        layout = new GridLayout();
-        layout.marginWidth = 1;
-        layout.marginHeight = 1;
-        layout.numColumns = 2;
-        container.setLayout(layout);
-        container.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-        EditableTablePart tablePart = getTablePart();
-        tablePart.setEditable(getPage().getModel().isEditable());
-        createViewerPartControl(container, SWT.FULL_SELECTION, 2, toolkit);
-        fFriendViewer = tablePart.getTableViewer();
-        fFriendViewer.setContentProvider(new TableContentProvider());
-        fFriendViewer.setLabelProvider(new TableLabelProvider());
-        toolkit.paintBordersFor(container);
-
-        makeActions();
-        fImage = PDEPluginImages.DESC_PLUGIN_OBJ.createImage();
-        update(null);
-        getBundleModel().addModelChangedListener(this);
-        
-        section.setLayoutData(new GridData(GridData.FILL_BOTH));
-		section.setClient(comp);
-	}
-    
-	private void makeActions() {
-        fAddAction = new Action(PDEUIMessages.ManifestEditor_ExportSection_add) {
-            public void run() {
-                handleAdd();
-            }
-        };
-        fAddAction.setEnabled(isEditable());
-        
-        fRemoveAction = new Action(PDEUIMessages.ManifestEditor_ExportSection_remove) {
-            public void run() {
-                handleRemove();
-            }
-        }; 
-        fRemoveAction.setEnabled(isEditable());
-    }
-
-	protected void selectionChanged(IStructuredSelection selection) {
-		Object item = selection.getFirstElement();
-		getTablePart().setButtonEnabled(1, item != null);
-	}
-    
-	protected void buttonSelected(int index) {
-		if (index == ADD_INDEX)
-			handleAdd();
-		else if (index == REMOVE_INDEX)
-			handleRemove();
-	}
-    
-	public boolean doGlobalAction(String actionId) {
-		if (actionId.equals(ActionFactory.DELETE.getId())) {
-			handleRemove();
-			return true;
-		}
-		return false;
-	}
-    
-	public void dispose() {
-		IBundleModel model = getBundleModel();
-		if (model != null)
-			model.removeModelChangedListener(this);
-        if (fImage != null)
-            fImage.dispose();
-		super.dispose();
-	}
-    
-	protected void fillContextMenu(IMenuManager manager) {
-		getPage().getPDEEditor().getContributor().contextMenuAboutToShow(manager);
-	}
-    
-	private void handleAdd() {
-        PluginSelectionDialog dialog = new PluginSelectionDialog(PDEPlugin.getActiveWorkbenchShell(), getModels(), true);
-        dialog.create();
-        if (dialog.open() == PluginSelectionDialog.OK) {
-            Object[] selected = dialog.getResult();
-            for (int i = 0; i < selected.length; i++) {
-                IPluginModelBase model = (IPluginModelBase)selected[i];
-                for (int j = 0; j < fSelectedObjects.length; j++) {
-                	fSelectedObjects[j].addFriend(new PackageFriend(fSelectedObjects[j], model.getPluginBase().getId()));
-                }
-            }
-        }
-	}
-    
-    private IPluginModelBase[] getModels() {
-        ArrayList list = new ArrayList();
-        IPluginModel[] models = PDECore.getDefault().getModelManager().getPluginsOnly();
-        for (int i = 0; i < models.length; i++) {
-        	String id = models[i].getPlugin().getId();
-            if (!fSelectedObjects[0].hasFriend(id))
-                list.add(models[i]);
-        }
-        return (IPluginModelBase[])list.toArray(new IPluginModelBase[list.size()]);
-    }
-    
-	private void handleRemove() {
-        Object[] removed = ((IStructuredSelection) fFriendViewer.getSelection()).toArray();
-        for (int i = 0; i < removed.length; i++) {
-        	for (int j = 0; j < fSelectedObjects.length; j++) {
-        		fSelectedObjects[j].removeFriend((PackageFriend) removed[i]);
-        	}
-        }
-	}
-    
-	public void modelChanged(IModelChangedEvent event) {
-		if (event.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			markStale();
-			return;
-		}
-        
-        if (Constants.EXPORT_PACKAGE.equals(event.getChangedProperty())) {
-            refresh();
-            return;
-        }
-        int index = fFriendViewer.getTable().getSelectionIndex();
-		fFriendViewer.refresh();
-		fFriendViewer.getTable().setSelection(Math.min(index, fFriendViewer.getTable().getItemCount() - 1));
-	}
-
-	public void refresh() {
-        update(null);
-		super.refresh();
-	}
-
-	public void selectionChanged(IFormPart source, ISelection selection) {
-        List list = ((IStructuredSelection)selection).toList();
-        if (list.size() > 0) {
-            Object[] objects = list.toArray();
-            ExportPackageObject first = null;
-            for (int i = 0; i < objects.length; i++) {
-            	if (!(objects[i] instanceof ExportPackageObject)) {
-            		update(null);
-            		return;
-            	}
-            	if (first == null) {
-            		first = (ExportPackageObject)objects[i];
-            		continue;
-            	}
-            	if (!first.hasSameVisibility((ExportPackageObject)objects[i])) {
-            		update(null);
-            		return;
-            	}
-            }
-            update((ExportPackageObject[])list.toArray(new ExportPackageObject[list.size()]));
-        } else {
-            update(null);
-        }
-	}
-    
-    private void update(ExportPackageObject[] objects) {
-        fBlockChanges = true;
-        fSelectedObjects = objects;
-
-        ExportPackageObject object = objects == null ? null : objects[0];
-        fVisibleButton.setEnabled(object != null && isEditable());
-        fVisibleButton.setSelection(objects != null && !object.isInternal());
-
-        fInternalButton.setEnabled(object != null && isEditable());
-        fInternalButton.setSelection(objects != null && object.isInternal());
-        
-        getTablePart().setButtonEnabled(0, fInternalButton.getSelection());
-        getTablePart().setButtonEnabled(1, fInternalButton.getSelection());
-        fFriendViewer.setInput(object);
-        fBlockChanges = false;
-    }
-    
-    private BundleInputContext getBundleContext() {
-        InputContextManager manager = getPage().getPDEEditor().getContextManager();
-        return (BundleInputContext) manager.findContext(BundleInputContext.CONTEXT_ID);
-    }
-    
-    private IBundleModel getBundleModel() {
-        BundleInputContext context = getBundleContext();
-        return (context != null) ? (IBundleModel)context.getModel() : null;       
-    }
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionDetails.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionDetails.java
deleted file mode 100644
index 0162b55..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionDetails.java
+++ /dev/null

@@ -1,241 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.parts.*;
-import org.eclipse.pde.internal.ui.search.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.forms.*;
-import org.eclipse.ui.forms.events.*;
-import org.eclipse.ui.forms.widgets.*;
-
-public class ExtensionDetails extends PDEDetails {
-	private IPluginExtension input;
-	private FormEntry id;
-	private FormEntry name;
-	private FormEntry point;
-	private FormText rtext;
-
-	private static final String RTEXT_DATA =
-		PDEUIMessages.ExtensionDetails_extensionPointLinks; 
-	/**
-	 * 
-	 */
-	public ExtensionDetails() {
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.IDetailsPage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createContents(Composite parent) {
-		TableWrapLayout layout = new TableWrapLayout();
-		FormToolkit toolkit = getManagedForm().getToolkit();
-		boolean paintedBorder = toolkit.getBorderStyle()!=SWT.BORDER;
-		layout.topMargin = 0;
-		layout.leftMargin = 5;
-		layout.rightMargin = 0;
-		layout.bottomMargin = 0;
-		parent.setLayout(layout);
-
-
-		Section section = toolkit.createSection(parent, Section.TITLE_BAR|Section.DESCRIPTION);
-		section.clientVerticalSpacing = PDESection.CLIENT_VSPACING;
-		section.marginHeight = 5;		
-		section.marginWidth = 5;
-		section.setText(PDEUIMessages.ExtensionDetails_title); 
-		section.setDescription(PDEUIMessages.ExtensionDetails_desc); 
-		TableWrapData td = new TableWrapData(TableWrapData.FILL, TableWrapData.TOP);
-		td.grabHorizontal = true;
-		section.setLayoutData(td);
-		//toolkit.createCompositeSeparator(section);
-		Composite client = toolkit.createComposite(section);
-		GridLayout glayout = new GridLayout();
-		glayout.marginWidth = glayout.marginHeight = 2;//paintedBorder?2:0;
-		glayout.numColumns = 2;
-		if (paintedBorder) glayout.verticalSpacing = 7;
-		client.setLayout(glayout);
-		
-		GridData gd = new GridData();
-		gd.horizontalSpan = 2;
-
-		id = new FormEntry(client, toolkit, PDEUIMessages.ExtensionDetails_id, null, false); 
-		id.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry entry) {
-				if (input!=null)
-					try {
-						input.setId(id.getValue());
-					} catch (CoreException e) {
-						PDEPlugin.logException(e);
-					}
-			}
-		});
-		
-		name = new FormEntry(client, toolkit, PDEUIMessages.ExtensionDetails_name, null, false); 
-		name.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry entry) {
-				if (input!=null)
-					try {
-						input.setName(name.getValue());
-					} catch (CoreException e) {
-						PDEPlugin.logException(e);
-					}
-			}
-		});
-		
-		point = new FormEntry(client, toolkit, PDEUIMessages.ExtensionDetails_point, null, false); 
-		point.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry entry) {
-				if (input!=null)
-					try {
-						input.setPoint(point.getValue());
-					} catch (CoreException e) {
-						PDEPlugin.logException(e);
-					}
-			}
-		});
-		
-		createSpacer(toolkit, client, 2);
-		
-		rtext = toolkit.createFormText(parent, true);
-		td = new TableWrapData(TableWrapData.FILL, TableWrapData.TOP);
-		td.grabHorizontal = true;
-		td.indent = 10;
-		rtext.setLayoutData(td);
-		rtext.setImage("desc", PDEPlugin.getDefault().getLabelProvider().get(PDEPluginImages.DESC_DOC_SECTION_OBJ)); //$NON-NLS-1$
-		rtext.setImage("search", PDEPlugin.getDefault().getLabelProvider().get(PDEPluginImages.DESC_PSEARCH_OBJ));		 //$NON-NLS-1$
-		rtext.addHyperlinkListener(new HyperlinkAdapter() {
-			public void linkActivated(HyperlinkEvent e) {
-				if (e.getHref().equals("search")){ //$NON-NLS-1$
-					FindDeclarationsAction findDeclarationsAction = new FindDeclarationsAction(input);
-					findDeclarationsAction.run();
-				} else {
-					if (input == null || input.getPoint() == null)
-						return;
-					IPluginExtensionPoint point = PDECore.getDefault().findExtensionPoint(input.getPoint());
-					if (point != null){
-						ShowDescriptionAction showDescAction = new ShowDescriptionAction(point);
-						showDescAction.run();
-					} else {
-						showNoExtensionPointMessage();
-					}
-				}
-			}
-		});
-		rtext.setText(RTEXT_DATA, true, false);
-		id.setEditable(isEditable());
-		name.setEditable(isEditable());
-		point.setEditable(isEditable());
-		
-		toolkit.paintBordersFor(client);
-		section.setClient(client);
-		IPluginModelBase model = (IPluginModelBase)getPage().getModel();
-		model.addModelChangedListener(this);
-		markDetailsPart(section);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.IDetailsPage#inputChanged(org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	public void selectionChanged(IFormPart part, ISelection selection) {
-		IStructuredSelection ssel = (IStructuredSelection)selection;
-		if (ssel.size()==1) {
-			input = (IPluginExtension)ssel.getFirstElement();
-		}
-		else
-			input = null;
-		update();
-	}
-	
-	private void update() {
-		id.setValue(input!=null?input.getId():null, true);
-		name.setValue(input!=null?input.getName():null, true);
-		point.setValue(input!=null?input.getPoint():null, true);
-	}
-	public void cancelEdit() {
-		id.cancelEdit();
-		name.cancelEdit();
-		point.cancelEdit();
-		super.cancelEdit();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.IDetailsPage#commit()
-	 */
-	public void commit(boolean onSave) {
-		id.commit();
-		name.commit();
-		point.commit();
-		super.commit(onSave);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.IDetailsPage#setFocus()
-	 */
-	public void setFocus() {
-		id.getText().setFocus();
-	}
-	
-	public void dispose() {
-		IPluginModelBase model = (IPluginModelBase)getPage().getModel();
-		if (model!=null)
-			model.removeModelChangedListener(this);
-		super.dispose();
-	}
-
-	public void modelChanged(IModelChangedEvent e) {
-		if (e.getChangeType()==IModelChangedEvent.CHANGE) {
-			Object obj = e.getChangedObjects()[0];
-			if (obj.equals(input))
-				refresh();
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.IDetailsPage#refresh()
-	 */
-	public void refresh() {
-		update();
-		super.refresh();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.IContextPart#fireSaveNeeded()
-	 */
-	public void fireSaveNeeded() {
-		markDirty();
-		PDEFormPage page = (PDEFormPage)getManagedForm().getContainer();
-		page.getPDEEditor().fireSaveNeeded(getContextId(), false);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.IContextPart#getContextId()
-	 */
-	public String getContextId() {
-		return PluginInputContext.CONTEXT_ID;
-	}
-	public PDEFormPage getPage() {
-		return (PDEFormPage)getManagedForm().getContainer();
-	}
-	public boolean isEditable() {
-		return getPage().getPDEEditor().getAggregateModel().isEditable();
-	}
-	private void showNoExtensionPointMessage() {
-		String title = PDEUIMessages.ExtensionDetails_noPoint_title; 
-		String message = NLS.bind(PDEUIMessages.ShowDescriptionAction_noPoint_desc, input.getPoint()); 
-		
-		MessageDialog.openWarning(PDEPlugin.getActiveWorkbenchShell(), title, message);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionElementDetails.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionElementDetails.java
deleted file mode 100644
index 56c44b0..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionElementDetails.java
+++ /dev/null

@@ -1,275 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-import java.util.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.ischema.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.editor.plugin.rows.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.forms.*;
-import org.eclipse.ui.forms.widgets.*;
-
-
-public class ExtensionElementDetails extends PDEDetails {
-	private IPluginElement input;
-	private ISchemaElement schemaElement;
-	private ArrayList rows;
-	private Section section;
-	/**
-	 *  
-	 */
-	public ExtensionElementDetails(ISchemaElement schemaElement) {
-		this.schemaElement = schemaElement;
-		rows = new ArrayList();
-	}
-	public String getContextId() {
-		return PluginInputContext.CONTEXT_ID;
-	}
-	public void fireSaveNeeded() {
-		markDirty();
-		getPage().getPDEEditor().fireSaveNeeded(getContextId(), false);
-	}
-	public PDEFormPage getPage() {
-		return (PDEFormPage) getManagedForm().getContainer();
-	}
-	public boolean isEditable() {
-		return getPage().getPDEEditor().getAggregateModel().isEditable();
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.forms.IDetailsPage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createContents(Composite parent) {
-		TableWrapLayout layout = new TableWrapLayout();
-		layout.topMargin = 0;
-		layout.leftMargin = 5;
-		layout.rightMargin = 0;
-		layout.bottomMargin = 0;
-		parent.setLayout(layout);
-		FormToolkit toolkit = getManagedForm().getToolkit();
-		section = toolkit.createSection(parent, Section.TITLE_BAR
-				| Section.DESCRIPTION);
-		section.clientVerticalSpacing = PDESection.CLIENT_VSPACING;
-		section.marginHeight = 5;
-		section.marginWidth = 5;
-		section.setText(PDEUIMessages.ExtensionElementDetails_title); 
-		section.setDescription(PDEUIMessages.ExtensionElementDetails_desc); 
-		TableWrapData td = new TableWrapData(TableWrapData.FILL,
-				TableWrapData.TOP);
-		td.grabHorizontal = true;
-		section.setLayoutData(td);
-		//toolkit.createCompositeSeparator(section);
-		Composite client = toolkit.createComposite(section);
-		GridLayout glayout = new GridLayout();
-		boolean paintedBorder = toolkit.getBorderStyle() != SWT.BORDER;
-		glayout.marginWidth = glayout.marginHeight = 2;//paintedBorder?2:0;
-		int span = 2;
-		glayout.numColumns = span;
-		if (paintedBorder)
-			glayout.verticalSpacing = 7;
-		client.setLayout(glayout);
-		if (schemaElement != null) {
-			ISchemaAttribute atts[] = schemaElement.getAttributes();
-			// Compute horizontal span
-			for (int i = 0; i < atts.length; i++) {
-				if (atts[i].getKind() == ISchemaAttribute.JAVA
-						|| atts[i].getKind() == ISchemaAttribute.RESOURCE) {
-					span = 3;
-					break;
-				}
-			}
-			glayout.numColumns = span;
-			// Add required attributes first
-			for (int i = 0; i < atts.length; i++) {
-				if (atts[i].getUse() == ISchemaAttribute.REQUIRED)
-					rows
-							.add(createAttributeRow(atts[i], client, toolkit,
-									span));
-			}
-			// Add the rest
-			for (int i = 0; i < atts.length; i++) {
-				if (atts[i].getUse() != ISchemaAttribute.REQUIRED)
-					rows
-							.add(createAttributeRow(atts[i], client, toolkit,
-									span));
-			}
-			createSpacer(toolkit, client, span);
-		}
-		else {
-			// no schema - delay until input is set
-		}
-		toolkit.paintBordersFor(client);
-		section.setClient(client);
-		markDetailsPart(section);
-	}
-	private ExtensionAttributeRow createAttributeRow(ISchemaAttribute att,
-			Composite parent, FormToolkit toolkit, int span) {
-		ExtensionAttributeRow row;
-		if (att.getKind() == ISchemaAttribute.JAVA)
-			row = new ClassAttributeRow(this, att);
-		else if (att.getKind() == ISchemaAttribute.RESOURCE)
-			row = new ResourceAttributeRow(this, att);
-		else {
-			ISchemaSimpleType type = att.getType();
-			if (type.getName().equals("boolean")) //$NON-NLS-1$
-				row = new BooleanAttributeRow(this, att);
-			else {
-				ISchemaRestriction restriction = type.getRestriction();
-				if (restriction != null)
-					row = new ChoiceAttributeRow(this, att);
-				else
-					row = new TextAttributeRow(this, att);
-			}
-		}
-		row.createContents(parent, toolkit, span);
-		return row;
-	}
-	
-	private ExtensionAttributeRow createAttributeRow(IPluginAttribute att,
-			Composite parent, FormToolkit toolkit, int span) {
-		ExtensionAttributeRow row;
-		row = new TextAttributeRow(this, att);
-		row.createContents(parent, toolkit, span);
-		return row;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.forms.IDetailsPage#inputChanged(org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	public void selectionChanged(IFormPart masterPart, ISelection selection) {
-		IStructuredSelection ssel = (IStructuredSelection) selection;
-		if (ssel.size() == 1) {
-			input = (IPluginElement) ssel.getFirstElement();
-		} else
-			input = null;
-		update();
-	}
-
-	public void modelChanged(IModelChangedEvent e) {
-		if (e.getChangeType()==IModelChangedEvent.CHANGE) {
-			Object obj = e.getChangedObjects()[0];
-			if (obj.equals(input))
-				refresh();
-		}
-	}
-	
-	private void update() {
-		updateDescription();
-		if (schemaElement==null)
-			updateRows();
-		for (int i = 0; i < rows.size(); i++) {
-			ExtensionAttributeRow row = (ExtensionAttributeRow) rows.get(i);
-			row.setInput(input);
-		}
-	}
-	private void updateRows() {
-		if (input==null) return;
-		IPluginAttribute [] atts = input.getAttributes();
-		FormToolkit toolkit = getManagedForm().getToolkit();
-		boolean rowsAdded=false;
-		for (int i=0; i<atts.length; i++) {
-			if (!hasAttribute(atts[i].getName())) {
-				rows.add(createAttributeRow(atts[i], (Composite)section.getClient(), 
-						toolkit, 2)); 
-				rowsAdded=true;
-			}
-		}
-		if (rowsAdded) {
-			((Composite)section.getClient()).layout(true);
-			section.layout(true);
-			section.getParent().layout(true);
-			reflow();
-		}
-	}
-	private void reflow() {
-		Composite parent = section.getParent();
-		while (parent!=null) {
-			if (parent instanceof SharedScrolledComposite) {
-				((SharedScrolledComposite)parent).reflow(true);
-				return;
-			}
-			parent = parent.getParent();
-		}
-	}
-	private boolean hasAttribute(String attName) {
-		for (int i=0; i<rows.size(); i++) {
-			ExtensionAttributeRow row = (ExtensionAttributeRow)rows.get(i);
-			if (row.getName().equals(attName))
-				return true;
-		}
-		return false;
-	}
-	private void updateDescription() {
-		if (input != null) {
-			String iname = input.getName();
-			section.setDescription(NLS.bind(PDEUIMessages.ExtensionElementDetails_setDesc, iname)); 
-		} else {
-			section
-					.setDescription(PDEUIMessages.ExtensionElementDetails_setSelectedDesc); 
-		}
-		section.layout();
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.forms.IDetailsPage#commit()
-	 */
-	public void commit(boolean onSave) {
-		for (int i = 0; i < rows.size(); i++) {
-			ExtensionAttributeRow row = (ExtensionAttributeRow) rows.get(i);
-			row.commit();
-		}
-		super.commit(onSave);
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.forms.IDetailsPage#setFocus()
-	 */
-	public void setFocus() {
-		if (rows.size() > 0)
-			((ExtensionAttributeRow) rows.get(0)).setFocus();
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.forms.IDetailsPage#dispose()
-	 */
-	public void dispose() {
-		for (int i = 0; i < rows.size(); i++) {
-			ExtensionAttributeRow row = (ExtensionAttributeRow) rows.get(i);
-			row.dispose();
-		}
-		IPluginModelBase model = (IPluginModelBase)getPage().getModel();
-		if (model!=null)
-			model.removeModelChangedListener(this);
-		super.dispose();
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.forms.IDetailsPage#refresh()
-	 */
-	public void refresh() {
-		update();
-		super.refresh();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionPointDetails.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionPointDetails.java
deleted file mode 100644
index 1561f50..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionPointDetails.java
+++ /dev/null

@@ -1,378 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.pde.core.IBaseModel;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.parts.*;
-import org.eclipse.pde.internal.ui.search.*;
-import org.eclipse.pde.internal.ui.util.*;
-import org.eclipse.pde.internal.ui.wizards.extension.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.custom.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.dialogs.*;
-import org.eclipse.ui.forms.*;
-import org.eclipse.ui.forms.events.*;
-import org.eclipse.ui.forms.widgets.*;
-import org.eclipse.ui.model.*;
-import org.eclipse.ui.part.*;
-import org.eclipse.ui.views.navigator.*;
-
-public class ExtensionPointDetails extends PDEDetails {
-	private IPluginExtensionPoint fInput;
-	private FormEntry fIdEntry;
-	private FormEntry fNameEntry;
-	private FormEntry fSchemaEntry;
-	private FormText fRichText;
-	private String fRichTextData;
-
-	private static final String SCHEMA_RTEXT_DATA = PDEUIMessages.ExtensionPointDetails_schemaLinks; 
-	private static final String NO_SCHEMA_RTEXT_DATA = PDEUIMessages.ExtensionPointDetails_noSchemaLinks; 
-	public ExtensionPointDetails() {
-	}
-	public String getContextId() {
-		return PluginInputContext.CONTEXT_ID;
-	}
-	public void fireSaveNeeded() {
-		markDirty();
-		getPage().getPDEEditor().fireSaveNeeded(getContextId(), false);
-	}
-	public PDEFormPage getPage() {
-		return (PDEFormPage)getManagedForm().getContainer();
-	}
-	public boolean isEditable() {
-		return getPage().getPDEEditor().getAggregateModel().isEditable();
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.forms.IDetailsPage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createContents(Composite parent) {
-		TableWrapLayout layout = new TableWrapLayout();
-		layout.topMargin = 0;
-		layout.leftMargin = 5;
-		layout.rightMargin = 0;
-		layout.bottomMargin = 0;
-		parent.setLayout(layout);
-		FormToolkit toolkit = getManagedForm().getToolkit();
-		Section section = toolkit.createSection(parent, Section.DESCRIPTION|ExpandableComposite.TITLE_BAR);
-		section.clientVerticalSpacing = PDESection.CLIENT_VSPACING;
-		section.marginHeight = 5;
-		section.marginWidth = 5;
-		section.setText(PDEUIMessages.ExtensionPointDetails_title); 
-		section
-				.setDescription(PDEUIMessages.ExtensionPointDetails_desc); 
-		TableWrapData td = new TableWrapData(TableWrapData.FILL,
-				TableWrapData.TOP);
-		td.grabHorizontal = true;
-		section.setLayoutData(td);
-		//toolkit.createCompositeSeparator(section);
-		Composite client = toolkit.createComposite(section);
-		GridLayout glayout = new GridLayout();
-		boolean paintedBorder = toolkit.getBorderStyle()!=SWT.BORDER;
-		glayout.marginWidth = glayout.marginHeight = 2;//paintedBorder?2:0;
-		glayout.numColumns = 3;
-		if (paintedBorder) glayout.verticalSpacing = 7;
-		client.setLayout(glayout);
-		GridData gd = new GridData();
-		gd.horizontalSpan = 3;
-		
-		fIdEntry = new FormEntry(client, toolkit, PDEUIMessages.ExtensionPointDetails_id, null, false); 
-		fIdEntry.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry entry) {
-				if (fInput != null) {
-					try {
-						fInput.setId(fIdEntry.getValue());
-					} catch (CoreException e) {
-						PDEPlugin.logException(e);
-					}
-				}
-			}
-		});
-		fNameEntry = new FormEntry(client, toolkit, PDEUIMessages.ExtensionPointDetails_name, null, false); 
-		fNameEntry.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry entry) {
-				if (fInput != null)
-					try {
-						fInput.setName(fNameEntry.getValue());
-					} catch (CoreException e) {
-						PDEPlugin.logException(e);
-					}
-			}
-		});
-		boolean editable = getPage().getModel().isEditable();
-		fSchemaEntry = new FormEntry(client, toolkit, PDEUIMessages.ExtensionPointDetails_schema, PDEUIMessages.ExtensionPointDetails_browse, editable); // 
-		fSchemaEntry.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry entry) {
-				if (fInput != null) {
-					try {
-						fInput.setSchema(fSchemaEntry.getValue());
-					} catch (CoreException e) {
-						PDEPlugin.logException(e);
-					}
-					updateRichText();
-				}
-			}
-
-			public void linkActivated(HyperlinkEvent e) {
-				IProject project = getPage().getPDEEditor().getCommonProject();
-				if (fSchemaEntry.getValue() == null || fSchemaEntry.getValue().length() ==0){
-					generateSchema();
-					return;
-				}
-				IFile file = project.getFile(fSchemaEntry.getValue());
-				if (file.exists())
-					openSchemaFile(file);
-				else
-					generateSchema();
-			}
-
-			public void browseButtonSelected(FormEntry entry) {
-				final IProject project = getPage().getPDEEditor().getCommonProject();
-				ElementTreeSelectionDialog dialog =
-					new ElementTreeSelectionDialog(
-						PDEPlugin.getActiveWorkbenchShell(),
-						new WorkbenchLabelProvider(),
-						new WorkbenchContentProvider());
-				dialog.setTitle(PDEUIMessages.ManifestEditor_ExtensionPointDetails_schemaLocation_title); 
-				dialog.setMessage(PDEUIMessages.ManifestEditor_ExtensionPointDetails_schemaLocation_desc); 
-				dialog.setDoubleClickSelects(false);
-				dialog.setAllowMultiple(false);
-				dialog.addFilter(new ViewerFilter(){
-					public boolean select(Viewer viewer, Object parent,
-							Object element) {
-						if (element instanceof IFile){
-							String ext = ((IFile)element).getFullPath().getFileExtension();
-								return "exsd".equals(ext) || "mxsd".equals(ext); //$NON-NLS-1$ //$NON-NLS-2$
-						} else if (element instanceof IContainer){ // i.e. IProject, IFolder
-							try {
-								IResource[] resources = ((IContainer)element).members();
-								for (int i = 0; i < resources.length; i++){
-									if (select(viewer, parent, resources[i]))
-										return true;
-								}
-							} catch (CoreException e) {
-								PDEPlugin.logException(e);
-							}
-						}
-						return false;
-					}
-				});
-				dialog.setValidator(new ISelectionStatusValidator() {
-					public IStatus validate(Object[] selection) {
-						IPluginModelBase model = (IPluginModelBase) getPage()
-								.getPDEEditor().getAggregateModel();
-						String pluginName = model.getPluginBase().getId();
-
-						if (selection == null || selection.length != 1
-								|| !(selection[0] instanceof IFile))
-							return new Status(
-									IStatus.ERROR,
-									pluginName,
-									IStatus.ERROR,
-									PDEUIMessages.ManifestEditor_ExtensionPointDetails_validate_errorStatus, 
-									null);
-						IFile file = (IFile) selection[0];
-						String ext = file.getFullPath().getFileExtension();
-						if ("exsd".equals(ext) || "mxsd".equals(ext)) //$NON-NLS-1$ //$NON-NLS-2$
-							return new Status(IStatus.OK, pluginName,
-									IStatus.OK, "", null); //$NON-NLS-1$
-						return new Status(
-								IStatus.ERROR,
-								pluginName,
-								IStatus.ERROR,
-								PDEUIMessages.ManifestEditor_ExtensionPointDetails_validate_errorStatus, 
-								null);
-					}
-				});
-				dialog.setDoubleClickSelects(true);
-				dialog.setStatusLineAboveButtons(true);
-				dialog.setInput(project);
-				dialog.setSorter(new ResourceSorter(ResourceSorter.NAME));
-				String filePath = fSchemaEntry.getValue();
-				if (filePath!=null && filePath.length()!=0 && project.exists(new Path(filePath)))
-					dialog.setInitialSelection(project.getFile(new Path(filePath)));
-				else
-					dialog.setInitialSelection(null);
-				if (dialog.open() == Window.OK) {
-					Object[] elements = dialog.getResult();
-					if (elements.length >0){
-						IResource elem = (IResource) elements[0];
-						fSchemaEntry.setValue(elem.getProjectRelativePath().toString());
-					}
-				}
-			}
-		});
-		createSpacer(toolkit, client, 2);
-		fRichText = toolkit.createFormText(parent, true);
-		td = new TableWrapData(TableWrapData.FILL, TableWrapData.TOP);
-		td.grabHorizontal = true;
-		td.indent = 10;
-		fRichText.setLayoutData(td);
-		fRichText.setImage("schema", PDEPlugin.getDefault().getLabelProvider().get( //$NON-NLS-1$
-				PDEPluginImages.DESC_SCHEMA_OBJ));
-		fRichText.setImage("desc", PDEPlugin.getDefault().getLabelProvider().get( //$NON-NLS-1$
-				PDEPluginImages.DESC_DOC_SECTION_OBJ));
-		fRichText.setImage("search", PDEPlugin.getDefault().getLabelProvider().get( //$NON-NLS-1$
-				PDEPluginImages.DESC_PSEARCH_OBJ));
-		fRichText.addHyperlinkListener(new HyperlinkAdapter() {
-			public void linkActivated(HyperlinkEvent e) {
-				IBaseModel model = getPage().getPDEEditor().getAggregateModel();
-				String pluginID = ((IPluginModelBase)model).getPluginBase().getId();
-				String pointID = pluginID + "." + fInput.getId(); //$NON-NLS-1$
-				if (e.getHref().equals("search")) { //$NON-NLS-1$
-					new FindReferencesAction(fInput, pluginID).run();
-				} else {
-					new ShowDescriptionAction(pointID).run();
-				}
-			}
-		});
-		
-		fIdEntry.setEditable(isEditable());
-		fNameEntry.setEditable(isEditable());
-		fSchemaEntry.setEditable(isEditable());
-		toolkit.paintBordersFor(client);
-		section.setClient(client);
-		IPluginModelBase model = (IPluginModelBase)getPage().getModel();
-		model.addModelChangedListener(this);
-		markDetailsPart(section);
-	}
-
-	public void dispose() {
-		IPluginModelBase model = (IPluginModelBase)getPage().getModel();
-		if (model!=null)
-			model.removeModelChangedListener(this);
-		super.dispose();
-	}
-	public void modelChanged(IModelChangedEvent e) {
-		if (e.getChangeType()==IModelChangedEvent.CHANGE) {
-			Object obj = e.getChangedObjects()[0];
-			if (obj.equals(fInput))
-				refresh();
-		}
-	}
-	private void update() {
-		fIdEntry.setValue(
-				fInput != null && fInput.getId() != null ? fInput.getId() : "", //$NON-NLS-1$
-				true);
-		fNameEntry.setValue(fInput != null && fInput.getName() != null ? fInput
-				.getName() : "", true); //$NON-NLS-1$
-		fSchemaEntry.setValue(fInput != null && fInput.getSchema() != null ? fInput
-				.getSchema() : "", true); //$NON-NLS-1$
-		updateRichText();
-	}
-	public void cancelEdit() {
-		fIdEntry.cancelEdit();
-		fNameEntry.cancelEdit();
-		fSchemaEntry.cancelEdit();
-		updateRichText();
-		super.cancelEdit();
-	}
-	private void updateRichText() {
-		boolean hasSchema = fSchemaEntry.getValue().length() > 0;
-		if (hasSchema && fRichTextData == SCHEMA_RTEXT_DATA)
-			return;
-		if (!hasSchema && fRichTextData == NO_SCHEMA_RTEXT_DATA)
-			return;
-		fRichTextData = hasSchema ? SCHEMA_RTEXT_DATA : NO_SCHEMA_RTEXT_DATA;
-		fRichText.setText(fRichTextData, true, false);
-		getManagedForm().getForm().reflow(true);
-	}
-	private void openSchemaFile(final IFile file) {
-		final IWorkbenchWindow ww = PDEPlugin.getActiveWorkbenchWindow();
-
-		Display d = ww.getShell().getDisplay();
-		d.asyncExec(new Runnable() {
-			public void run() {
-				try {
-					String editorId = IPDEUIConstants.SCHEMA_EDITOR_ID;
-					ww.getActivePage().openEditor(
-						new FileEditorInput(file),
-						editorId);
-				} catch (PartInitException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		});
-	}
-	
-	private void generateSchema() {
-		final IProject project = getPage().getPDEEditor().getCommonProject();
-		BusyIndicator
-			.showWhile(getPage().getPartControl().getDisplay(), new Runnable() {
-			public void run() {
-				NewSchemaFileWizard wizard =
-					new NewSchemaFileWizard(project, fInput, true);
-				WizardDialog dialog =
-					new WizardDialog(
-						PDEPlugin.getActiveWorkbenchShell(),
-						wizard);
-				dialog.create();
-				SWTUtil.setDialogSize(dialog, 400, 450);
-				if(dialog.open() == Window.OK)
-					update();
-			}
-		});
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.forms.IDetailsPage#inputChanged(org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	public void selectionChanged(IFormPart masterPart, ISelection selection) {
-		IStructuredSelection ssel = (IStructuredSelection) selection;
-		if (ssel.size() == 1) {
-			fInput = (IPluginExtensionPoint) ssel.getFirstElement();
-		} else
-			fInput = null;
-		update();
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.forms.IDetailsPage#commit()
-	 */
-	public void commit(boolean onSave) {
-		fIdEntry.commit();
-		fNameEntry.commit();
-		fSchemaEntry.commit();
-		super.commit(onSave);
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.forms.IDetailsPage#setFocus()
-	 */
-	public void setFocus() {
-		fIdEntry.getText().setFocus();
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.forms.IDetailsPage#refresh()
-	 */
-	public void refresh() {
-		update();
-		super.refresh();
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionPointsPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionPointsPage.java
deleted file mode 100644
index 9c9b74e..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionPointsPage.java
+++ /dev/null

@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.*;
-import org.eclipse.ui.forms.editor.*;
-import org.eclipse.ui.forms.widgets.*;
-
-public class ExtensionPointsPage extends PDEFormPage {
-	public static final String PAGE_ID = "ex-points"; //$NON-NLS-1$
-	private ExtensionPointsSection extensionPointsSection;
-	private ExtensionPointsBlock block;
-	public class ExtensionPointsBlock extends PDEMasterDetailsBlock {
-		public ExtensionPointsBlock() {
-			super(ExtensionPointsPage.this);
-		}
-		protected PDESection createMasterSection(IManagedForm managedForm,
-				Composite parent) {
-			extensionPointsSection = new ExtensionPointsSection(getPage(), parent);
-			return extensionPointsSection;
-		}
-		protected void registerPages(DetailsPart detailsPart) {
-			detailsPart.setPageProvider(new IDetailsPageProvider() {
-				public Object getPageKey(Object object) {
-					if (object instanceof IPluginExtensionPoint)
-						return IPluginExtensionPoint.class;
-					return object.getClass();
-				}
-				public IDetailsPage getPage(Object key) {
-					if (key.equals(IPluginExtensionPoint.class))
-						return new ExtensionPointDetails();
-					return null;
-				}
-			});
-		}
-	}
-	/**
-	 * @param editor
-	 * @param id
-	 * @param title
-	 */
-	public ExtensionPointsPage(FormEditor editor) {
-		super(editor, PAGE_ID, PDEUIMessages.ExtensionPointsPage_tabName);  
-		block = new ExtensionPointsBlock();
-	}
-	protected void createFormContent(IManagedForm managedForm) {
-		super.createFormContent(managedForm);
-		ScrolledForm form = managedForm.getForm();
-		form.setText(PDEUIMessages.ExtensionPointsPage_title); 
-		block.createContent(managedForm);
-		extensionPointsSection.fireSelection();
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.MANIFEST_PLUGIN_EXT_POINTS);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionPointsSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionPointsSection.java
deleted file mode 100644
index 22f4e2e..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionPointsSection.java
+++ /dev/null

@@ -1,313 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-
-import java.io.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.elements.*;
-import org.eclipse.pde.internal.ui.parts.*;
-import org.eclipse.pde.internal.ui.search.*;
-import org.eclipse.pde.internal.ui.util.*;
-import org.eclipse.pde.internal.ui.wizards.extension.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.custom.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.actions.*;
-import org.eclipse.ui.forms.widgets.*;
-import org.eclipse.ui.part.*;
-
-public class ExtensionPointsSection extends TableSection {
-	private TableViewer pointTable;
-
-	class TableContentProvider extends DefaultContentProvider implements
-			IStructuredContentProvider {
-		public Object[] getElements(Object parent) {
-			IPluginModelBase model = (IPluginModelBase) getPage().getModel();
-			IPluginBase pluginBase = model.getPluginBase();
-			if (pluginBase != null)
-				return pluginBase.getExtensionPoints();
-			return new Object[0];
-		}
-	}
-
-	public ExtensionPointsSection(PDEFormPage page, Composite parent) {
-		super(page, parent, Section.TITLE_BAR, new String[] { PDEUIMessages.ManifestEditor_DetailExtensionPointSection_new });
-		getSection().setText(PDEUIMessages.ManifestEditor_DetailExtensionPointSection_title);
-		handleDefaultButton = false;
-		getTablePart().setEditable(false);
-	}
-
-	public void createClient(Section section, FormToolkit toolkit) {
-		Composite container = createClientContainer(section, 2, toolkit);
-		TablePart tablePart = getTablePart();
-		createViewerPartControl(container, SWT.MULTI, 2, toolkit);
-		pointTable = tablePart.getTableViewer();
-		pointTable.setContentProvider(new TableContentProvider());
-		pointTable.setLabelProvider(PDEPlugin.getDefault().getLabelProvider());
-		toolkit.paintBordersFor(container);
-		section.setClient(container);
-		pointTable.setInput(getPage());
-		selectFirstExtensionPoint();
-		IBaseModel model = getPage().getModel();
-		if (model instanceof IModelChangeProvider)
-			((IModelChangeProvider) model).addModelChangedListener(this);
-		tablePart.setButtonEnabled(0, model.isEditable());
-	}
-
-	private void selectFirstExtensionPoint() {
-		Table table = pointTable.getTable();
-		TableItem[] items = table.getItems();
-		if (items.length == 0)
-			return;
-		TableItem firstItem = items[0];
-		Object obj = firstItem.getData();
-		pointTable.setSelection(new StructuredSelection(obj));
-	}
-
-	void fireSelection() {
-		pointTable.setSelection(pointTable.getSelection());
-	}
-
-	public void dispose() {
-		IBaseModel model = getPage().getModel();
-		if (model instanceof IModelChangeProvider)
-			((IModelChangeProvider) model).removeModelChangedListener(this);
-		super.dispose();
-	}
-
-	public boolean doGlobalAction(String actionId) {
-		if (actionId.equals(ActionFactory.DELETE.getId())) {
-			handleDelete();
-			return true;
-		}
-		if (actionId.equals(ActionFactory.CUT.getId())) {
-			// delete here and let the editor transfer
-			// the selection to the clipboard
-			handleDelete();
-			return false;
-		}
-		if (actionId.equals(ActionFactory.PASTE.getId())) {
-			doPaste();
-			return true;
-		}
-		return false;
-	}
-
-	public void refresh() {
-		pointTable.refresh();
-		getManagedForm().fireSelectionChanged(this, pointTable.getSelection());
-		super.refresh();
-	}
-
-	public boolean setFormInput(Object object) {
-		if (object instanceof IPluginExtensionPoint) {
-			pointTable.setSelection(new StructuredSelection(object), true);
-			return true;
-		}
-		return false;
-	}
-
-	protected void selectionChanged(IStructuredSelection selection) {
-		getPage().getPDEEditor().setSelection(selection);
-		super.selectionChanged(selection);
-	}
-
-	public void modelChanged(IModelChangedEvent event) {
-		if (event.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			markStale();
-			return;
-		}
-		Object changeObject = event.getChangedObjects()[0];
-		if (changeObject instanceof IPluginExtensionPoint) {
-			if (event.getChangeType() == IModelChangedEvent.INSERT) {
-				pointTable.add(changeObject);
-				pointTable.setSelection(
-					new StructuredSelection(changeObject),
-					true);
-				pointTable.getTable().setFocus();
-			} else if (event.getChangeType() == IModelChangedEvent.REMOVE) {
-				pointTable.remove(changeObject);
-			} else {
-				pointTable.update(changeObject, null);
-			}
-		}
-	}
-
-	protected void fillContextMenu(IMenuManager manager) {
-		ISelection selection = pointTable.getSelection();
-
-		Action newAction = new Action(PDEUIMessages.ManifestEditor_DetailExtensionPointSection_newExtensionPoint) {
-			public void run() {
-				handleNew();
-			}
-		};
-		newAction.setEnabled(isEditable());
-		manager.add(newAction);
-		
-		if (selection.isEmpty()) {
-			getPage().getPDEEditor().getContributor().contextMenuAboutToShow(manager);
-			return;
-		}
-
-		Object object = ((IStructuredSelection) selection).getFirstElement();
-		final IPluginExtensionPoint point = (IPluginExtensionPoint) object;
-		if (point.getSchema() != null) {
-			final IEditorInput input = getPage().getEditor().getEditorInput();
-			if (input instanceof IFileEditorInput || input instanceof SystemFileEditorInput) {
-				Action openSchemaAction = new Action(PDEUIMessages.ManifestEditor_DetailExtensionPointSection_openSchema) {
-					public void run() {
-						handleOpenSchema(point);
-					}
-				};
-				manager.add(openSchemaAction);
-			}
-		}
-		manager.add(new Separator());
-		
-		Action deleteAction = new Action(PDEUIMessages.Actions_delete_label) {
-			public void run() {
-				handleDelete();
-			}
-		};
-		deleteAction.setEnabled(isEditable());
-		manager.add(deleteAction);
-		getPage().getPDEEditor().getContributor().contextMenuAboutToShow(manager);
-		manager.add(new Separator());
-		
-		IBaseModel model = getPage().getPDEEditor().getAggregateModel();
-		String pluginID = ((IPluginModelBase)model).getPluginBase().getId();
-		manager.add(new FindReferencesAction(point, pluginID));
-		Action action = new ShowDescriptionAction(pluginID + "." + point.getId()); //$NON-NLS-1$
-		action.setText(PDEUIMessages.ExtensionPointsSection_showDescription);
-		manager.add(action);
-	}
-
-	protected void buttonSelected(int index) {
-		if (index == 0)
-			handleNew();
-	}
-
-	private void handleDelete() {
-		Object[] selection = ((IStructuredSelection) pointTable
-				.getSelection()).toArray();
-		for (int i = 0; i < selection.length; i++) {
-			Object object = selection[i];
-			if (object != null && object instanceof IPluginExtensionPoint) {
-				IPluginExtensionPoint ep = (IPluginExtensionPoint) object;
-				IPluginBase plugin = ep.getPluginBase();
-				try {
-					plugin.remove(ep);
-					String schema = ep.getSchema();
-					IProject project = ep.getModel().getUnderlyingResource()
-							.getProject();
-					IFile schemaFile = project.getFile(schema);
-					if (schemaFile.exists())
-						if (MessageDialog.openQuestion(getSection().getShell(),
-								PDEUIMessages.ExtensionPointsSection_title,
-								PDEUIMessages.ExtensionPointsSection_message1 + " " //$NON-NLS-1$
-								+ schemaFile.getProjectRelativePath().toString() + "?")) //$NON-NLS-1$
-							schemaFile.delete(true, false,
-									new NullProgressMonitor());
-
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		}
-	}
-
-	private void handleNew() {
-		IFile file = ((IFileEditorInput) getPage().getPDEEditor()
-				.getEditorInput()).getFile();
-		final IProject project = file.getProject();
-		BusyIndicator.showWhile(pointTable.getTable().getDisplay(),
-				new Runnable() {
-					public void run() {
-						NewExtensionPointWizard wizard = new NewExtensionPointWizard(
-								project, (IPluginModelBase) getPage()
-										.getModel(), (ManifestEditor) getPage()
-										.getPDEEditor());
-						WizardDialog dialog = new WizardDialog(PDEPlugin
-								.getActiveWorkbenchShell(), wizard);
-						dialog.create();
-						SWTUtil.setDialogSize(dialog, 400, 450);
-						dialog.open();
-					}
-				});
-	}
-
-	private void handleOpenSchema(IPluginExtensionPoint point) {
-		String schema = point.getSchema();
-		IModel model = point.getModel();
-		IResource resource = model.getUnderlyingResource();
-		final IWorkbenchPage page = PDEPlugin.getActivePage();
-
-		final IEditorInput input;
-
-		if (resource != null) {
-			IProject project = resource.getProject();
-			IFile file = project.getFile(schema);
-			input = new FileEditorInput(file);
-		} else {
-			String location = ((IPluginModelBase) model).getInstallLocation();
-			File file = new File(location, schema);
-			if (!file.exists()) {
-				// try source location
-				SourceLocationManager manager = PDECore.getDefault()
-						.getSourceLocationManager();
-				file = manager.findSourceFile(point.getPluginBase(), new Path(
-						schema));
-			}
-			input = new SystemFileEditorInput(file);
-		}
-		BusyIndicator.showWhile(pointTable.getTable().getDisplay(),
-				new Runnable() {
-					public void run() {
-						try {
-							page.openEditor(input,
-									IPDEUIConstants.SCHEMA_EDITOR_ID);
-						} catch (PartInitException e) {
-							PDEPlugin.logException(e);
-						}
-					}
-				});
-	}
-
-	protected void doPaste(Object target, Object[] objects) {
-		/*
-		 * IPluginModelBase model = (IPluginModelBase) getPage().getModel();
-		 * IPluginBase plugin = model.getPluginBase(); try { for (int i = 0; i <
-		 * objects.length; i++) { Object obj = objects[i]; if (obj instanceof
-		 * IPluginExtensionPoint) { PluginExtensionPoint point =
-		 * (PluginExtensionPoint) obj; point.setModel(model);
-		 * point.setParent(plugin); plugin.add(point); } } } catch
-		 * (CoreException e) { PDEPlugin.logException(e); }
-		 */
-	}
-
-	protected boolean canPaste(Object target, Object[] objects) {
-		if (objects[0] instanceof IPluginExtensionPoint)
-			return true;
-		return false;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionsPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionsPage.java
deleted file mode 100644
index 80f4a7c..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionsPage.java
+++ /dev/null

@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-import org.eclipse.jface.action.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.ischema.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.*;
-import org.eclipse.ui.forms.editor.*;
-import org.eclipse.ui.forms.widgets.*;
-
-public class ExtensionsPage extends PDEFormPage {
-	public static final String PAGE_ID = "extensions"; //$NON-NLS-1$
-	private ExtensionsBlock block;
-	private ExtensionsSection section;
-	
-	public class ExtensionsBlock extends PDEMasterDetailsBlock implements IDetailsPageProvider {
-		public ExtensionsBlock() {
-			super(ExtensionsPage.this);
-		}
-		protected PDESection createMasterSection(IManagedForm managedForm,
-				Composite parent) {
-			section = new ExtensionsSection(getPage(), parent);
-			return section;
-		}
-		protected void registerPages(DetailsPart detailsPart) {
-			detailsPart.setPageLimit(10);
-			// register static page for the extensions
-			detailsPart.registerPage(IPluginExtension.class, new ExtensionDetails());
-			// register a dynamic provider for elements
-			detailsPart.setPageProvider(this);
-		}
-		public Object getPageKey(Object object) {
-			if (object instanceof IPluginExtension)
-				return IPluginExtension.class;
-			if (object instanceof IPluginElement) {
-				ISchemaElement element = ExtensionsSection.getSchemaElement((IPluginElement)object);
-				if (element!=null) return element;
-				// no element - construct one
-				IPluginElement pelement = (IPluginElement)object;
-				String ename = pelement.getName();
-				IPluginExtension extension = ExtensionsSection.getExtension((IPluginParent)pelement.getParent());
-				return extension.getPoint()+"/"+ename; //$NON-NLS-1$
-			}
-			return object.getClass();
-		}
-		public IDetailsPage getPage(Object object) {
-			if (object instanceof ISchemaElement)
-				return new ExtensionElementDetails((ISchemaElement)object);
-			if (object instanceof String)
-				return new ExtensionElementDetails(null);
-			return null;
-		}
-		protected void createToolBarActions(IManagedForm managedForm) {
-			final ScrolledForm form = managedForm.getForm();
-			Action collapseAction = new Action("col") { //$NON-NLS-1$
-				public void run() {
-					section.handleCollapseAll();
-				}
-			};
-			collapseAction.setToolTipText(PDEUIMessages.ExtensionsPage_collapseAll); 
-			collapseAction.setImageDescriptor(PDEPluginImages.DESC_COLLAPSE_ALL);
-			form.getToolBarManager().add(collapseAction);
-			super.createToolBarActions(managedForm);
-		}
-	}
-	/**
-	 * @param editor
-	 * @param id
-	 * @param title
-	 */
-	public ExtensionsPage(FormEditor editor) {
-		super(editor, PAGE_ID, PDEUIMessages.ExtensionsPage_tabName);  
-		block = new ExtensionsBlock();
-	}
-	protected void createFormContent(IManagedForm managedForm) {
-		super.createFormContent(managedForm);
-		ScrolledForm form = managedForm.getForm();
-		form.setText(PDEUIMessages.ExtensionsPage_title); 
-		block.createContent(managedForm);
-		BodyTextSection bodyTextSection = new BodyTextSection(this, form.getBody());
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL|GridData.VERTICAL_ALIGN_BEGINNING);
-		bodyTextSection.getSection().setLayoutData(gd);
-		bodyTextSection.getSection().marginWidth = 5;
-		managedForm.addPart(bodyTextSection);
-		//refire selection
-		section.fireSelection();
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.MANIFEST_PLUGIN_EXTENSIONS);		
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionsSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionsSection.java
deleted file mode 100644
index 366fb01..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ExtensionsSection.java
+++ /dev/null

@@ -1,781 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-import java.util.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.core.ischema.*;
-import org.eclipse.pde.internal.core.schema.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.elements.*;
-import org.eclipse.pde.internal.ui.parts.*;
-import org.eclipse.pde.internal.ui.search.*;
-import org.eclipse.pde.internal.ui.util.*;
-import org.eclipse.pde.internal.ui.wizards.extension.*;
-import org.eclipse.pde.ui.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.custom.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.actions.*;
-import org.eclipse.ui.forms.widgets.*;
-import org.eclipse.ui.part.*;
-
-public class ExtensionsSection extends TreeSection
-		implements
-			IModelChangedListener {
-	//private TableTreeViewer extensionTree;
-	private TreeViewer extensionTree;
-	private Image extensionImage;
-	private Image genericElementImage;
-
-	private SchemaRegistry schemaRegistry;
-	private ExternalModelManager pluginInfoRegistry;
-	private DrillDownAdapter drillDownAdapter;
-	private Action newExtensionAction;
-	private Action collapseAllAction;
-	private Hashtable editorWizards;
-	private static final String[] COMMON_LABEL_PROPERTIES = {"label", "name", //$NON-NLS-1$ //$NON-NLS-2$
-			"id"}; //$NON-NLS-1$
-	class ExtensionContentProvider extends DefaultContentProvider
-			implements
-				ITreeContentProvider {
-		public Object[] getChildren(Object parent) {
-			Object[] children = null;
-			if (parent instanceof IPluginBase)
-				children = ((IPluginBase) parent).getExtensions();
-			else if (parent instanceof IPluginExtension) {
-				children = ((IPluginExtension) parent).getChildren();
-			} else if (parent instanceof IPluginElement) {
-				children = ((IPluginElement) parent).getChildren();
-			}
-			if (children == null)
-				children = new Object[0];
-			return children;
-		}
-		public boolean hasChildren(Object parent) {
-			return getChildren(parent).length > 0;
-		}
-		public Object getParent(Object child) {
-			if (child instanceof IPluginExtension) {
-				return ((IPluginModelBase)getPage().getModel()).getPluginBase();
-			}
-			if (child instanceof IPluginObject)
-				return ((IPluginObject) child).getParent();
-			return null;
-		}
-		public Object[] getElements(Object parent) {
-			return getChildren(parent);
-		}
-	}
-	class ExtensionLabelProvider extends LabelProvider {
-		public String getText(Object obj) {
-			return resolveObjectName(obj);
-		}
-		public Image getImage(Object obj) {
-			return resolveObjectImage(obj);
-		}
-	}
-	public ExtensionsSection(PDEFormPage page, Composite parent) {
-		super(page, parent, 0, new String[]{
-				PDEUIMessages.ManifestEditor_DetailExtension_new, 
-				PDEUIMessages.ManifestEditor_DetailExtension_edit,
-				null,
-				PDEUIMessages.ManifestEditor_DetailExtension_up,
-				PDEUIMessages.ManifestEditor_DetailExtension_down});
-		getSection().setText(PDEUIMessages.ManifestEditor_DetailExtension_title);
-		pluginInfoRegistry = PDECore.getDefault().getExternalModelManager();
-		handleDefaultButton = false;
-	}
-	private static void addItemsForExtensionWithSchema(MenuManager menu,
-			IPluginExtension extension, IPluginParent parent) {
-		ISchema schema = getSchema(extension);
-		String tagName = (parent == extension ? "extension" : parent.getName()); //$NON-NLS-1$
-		ISchemaElement elementInfo = schema.findElement(tagName);
-		if (elementInfo == null)
-			return;
-		ISchemaElement[] candidates = schema.getCandidateChildren(elementInfo);
-		for (int i = 0; i < candidates.length; i++) {
-			ISchemaElement candidateInfo = candidates[i];
-			Action action = new NewElementAction(candidateInfo, parent);
-			menu.add(action);
-		}
-	}
-	private static ISchema getSchema(IPluginExtension extension) {
-		String point = extension.getPoint();
-		SchemaRegistry registry = PDECore.getDefault().getSchemaRegistry();
-		return registry.getSchema(point);
-	}
-	static ISchemaElement getSchemaElement(IPluginElement element) {
-		IPluginObject parent = element.getParent();
-		while (parent != null && !(parent instanceof IPluginExtension)) {
-			parent = parent.getParent();
-		}
-		if (parent != null) {
-			ISchema schema = getSchema((IPluginExtension) parent);
-			if (schema != null) {
-				return schema.findElement(element.getName());
-			}
-		}
-		return null;
-	}
-	public void createClient(Section section, FormToolkit toolkit) {
-		initializeImages();
-		Composite container = createClientContainer(section, 2, toolkit);
-		TreePart treePart = getTreePart();
-		createViewerPartControl(container, SWT.MULTI, 2, toolkit);
-		extensionTree = treePart.getTreeViewer();
-		extensionTree.setContentProvider(new ExtensionContentProvider());
-		extensionTree.setLabelProvider(new ExtensionLabelProvider());
-		drillDownAdapter = new DrillDownAdapter(extensionTree);
-		toolkit.paintBordersFor(container);
-		section.setClient(container);
-		initialize((IPluginModelBase) getPage().getModel());
-	}
-	protected void selectionChanged(IStructuredSelection selection) {
-		getPage().getPDEEditor().setSelection(selection);
-		updateUpDownButtons(selection.getFirstElement());
-		getTreePart().setButtonEnabled(1, isSelectionEditable(selection));
-	}
-	protected void handleDoubleClick(IStructuredSelection selection) {
-		/*
-		 * PropertiesAction action = new
-		 * PropertiesAction(getFormPage().getEditor()); action.run();
-		 */
-	}
-	protected void buttonSelected(int index) {
-		switch (index) {
-			case 0 :
-				handleNew();
-				break;
-			case 1 :
-				handleEdit();
-				break;
-			case 2:
-				// blank
-				break;
-			case 3 :
-				handleMove(true);
-				break;
-			case 4 :
-				handleMove(false);
-				break;
-		}
-	}
-	public void dispose() {
-		editorWizards = null;
-		IPluginModelBase model = (IPluginModelBase) getPage().getPDEEditor()
-				.getAggregateModel();
-		if (model!=null)
-			model.removeModelChangedListener(this);
-		super.dispose();
-	}
-	public boolean doGlobalAction(String actionId) {
-		if (actionId.equals(ActionFactory.DELETE.getId())) {
-			handleDelete();
-			return true;
-		}
-		if (actionId.equals(ActionFactory.CUT.getId())) {
-			// delete here and let the editor transfer
-			// the selection to the clipboard
-			handleDelete();
-			return false;
-		}
-		if (actionId.equals(ActionFactory.PASTE.getId())) {
-			doPaste();
-			return true;
-		}
-		return false;
-	}
-	public boolean setFormInput(Object object) {
-		if (object instanceof IPluginExtension
-				|| object instanceof IPluginElement) {
-			extensionTree.setSelection(new StructuredSelection(object), true);
-			return true;
-		}
-		return false;
-	}
-	protected void fillContextMenu(IMenuManager manager) {
-		ISelection selection = extensionTree.getSelection();
-		IStructuredSelection ssel = (IStructuredSelection) selection;
-		IMenuManager newMenu = null;
-		if (ssel.size() == 1) {
-			Object object = ssel.getFirstElement();
-			if (object instanceof IPluginParent) {
-				IPluginParent parent = (IPluginParent) object;
-				if (parent.getModel().getUnderlyingResource() != null) {
-					newMenu = fillContextMenu(getPage(), parent, manager);
-					manager.add(new Separator());
-				}
-			}
-		} else if (ssel.size() > 1) {
-			// multiple
-			Action delAction = new Action() {
-				public void run() {
-					handleDelete();
-				}
-			};
-			delAction.setText(PDEUIMessages.Actions_delete_label);
-			manager.add(delAction);
-			manager.add(new Separator());
-			delAction.setEnabled(isEditable());
-		}
-		if (newMenu == null) {
-			newMenu = new MenuManager(PDEUIMessages.Menus_new_label);
-			manager.add(newMenu);
-		}
-		if (!newMenu.isEmpty())
-			newMenu.add(new Separator());
-		newMenu.add(newExtensionAction);
-		manager.add(new Separator());
-		drillDownAdapter.addNavigationActions(manager);
-		manager.add(new Separator());
-		manager.add(collapseAllAction);
-		manager.add(new Separator());
-		getPage().getPDEEditor().getContributor().addClipboardActions(manager);
-		getPage().getPDEEditor().getContributor().contextMenuAboutToShow(
-				manager, false);
-		if (ssel.size() == 1) {
-			manager.add(new Separator());
-			Object object = ssel.getFirstElement();
-			if (object instanceof IPluginExtension) {
-				PluginSearchActionGroup actionGroup = new PluginSearchActionGroup();
-				actionGroup.setContext(new ActionContext(selection));
-				actionGroup.fillContextMenu(manager);
-				manager.add(new Separator());
-			}
-			//manager.add(new PropertiesAction(getFormPage().getEditor()));
-		}
-	}
-	static IMenuManager fillContextMenu(PDEFormPage page,
-			final IPluginParent parent, IMenuManager manager) {
-		return fillContextMenu(page, parent, manager, false);
-	}
-	static IMenuManager fillContextMenu(PDEFormPage page,
-			final IPluginParent parent, IMenuManager manager,
-			boolean addSiblingItems) {
-		return fillContextMenu(page, parent, manager, addSiblingItems, true);
-	}
-	static IMenuManager fillContextMenu(PDEFormPage page,
-			final IPluginParent parent, IMenuManager manager,
-			boolean addSiblingItems, boolean fullMenu) {
-		MenuManager menu = new MenuManager(PDEUIMessages.Menus_new_label);
-		IPluginExtension extension = getExtension(parent);
-		ISchema schema = getSchema(extension);
-		if (schema == null) {
-			menu.add(new NewElementAction(null, parent));
-		} else {
-			addItemsForExtensionWithSchema(menu, extension, parent);
-			if (addSiblingItems) {
-				IPluginObject parentsParent = parent.getParent();
-				if (!(parentsParent instanceof IPluginExtension)) {
-					IPluginParent pparent = (IPluginParent) parentsParent;
-					menu.add(new Separator());
-					addItemsForExtensionWithSchema(menu, extension, pparent);
-				}
-			}
-		}
-		manager.add(menu);
-		manager.add(new Separator());
-		if (fullMenu) {
-			Action deleteAction = new Action(PDEUIMessages.Actions_delete_label) {
-				public void run() {
-					try {
-						IPluginObject parentsParent = parent.getParent();
-						if (parent instanceof IPluginExtension) {
-							IPluginBase plugin = (IPluginBase) parentsParent;
-							plugin.remove((IPluginExtension) parent);
-						} else {
-							IPluginParent parentElement = (IPluginParent) parent
-									.getParent();
-							parentElement.remove(parent);
-						}
-					} catch (CoreException e) {
-					}
-				}
-			};
-			deleteAction.setEnabled(page.getModel().isEditable());
-			manager.add(deleteAction);
-		}
-		return menu;
-	}
-	static IPluginExtension getExtension(IPluginParent parent) {
-		while (parent != null && !(parent instanceof IPluginExtension)) {
-			parent = (IPluginParent) parent.getParent();
-		}
-		return (IPluginExtension) parent;
-	}
-	private void handleDelete() {
-		IStructuredSelection sel = (IStructuredSelection) extensionTree
-				.getSelection();
-		if (sel.isEmpty())
-			return;
-		for (Iterator iter = sel.iterator(); iter.hasNext();) {
-			IPluginObject object = (IPluginObject) iter.next();
-			try {
-				if (object instanceof IPluginElement) {
-					IPluginElement ee = (IPluginElement) object;
-					IPluginParent parent = (IPluginParent) ee.getParent();
-					parent.remove(ee);
-				} else if (object instanceof IPluginExtension) {
-					IPluginExtension extension = (IPluginExtension) object;
-					IPluginBase plugin = extension.getPluginBase();
-					plugin.remove(extension);
-				}
-			} catch (CoreException e) {
-				PDEPlugin.logException(e);
-			}
-		}
-	}
-	private void handleNew() {
-		final IProject project = getPage().getPDEEditor().getCommonProject();
-		BusyIndicator.showWhile(extensionTree.getTree().getDisplay(),
-				new Runnable() {
-					public void run() {
-						((ManifestEditor)getPage().getEditor()).ensurePluginContextPresence();
-						NewExtensionWizard wizard = new NewExtensionWizard(
-								project, (IPluginModelBase) getPage()
-										.getModel(), (ManifestEditor) getPage()
-										.getPDEEditor()) {
-							public boolean performFinish() {
-								return super.performFinish();
-							}
-						};
-						WizardDialog dialog = new WizardDialog(PDEPlugin
-								.getActiveWorkbenchShell(), wizard);
-						dialog.create();
-						SWTUtil.setDialogSize(dialog, 500, 500);
-						dialog.open();
-					}
-				});
-	}
-	private void handleEdit(IConfigurationElement element, IStructuredSelection selection) {
-		IProject project = getPage().getPDEEditor().getCommonProject();
-		IPluginModelBase model = (IPluginModelBase)getPage().getModel();
-		try {
-			final IExtensionEditorWizard wizard = (IExtensionEditorWizard)element.createExecutableExtension("class"); //$NON-NLS-1$
-			wizard.init(project, model, selection);
-			BusyIndicator.showWhile(extensionTree.getTree().getDisplay(),
-					new Runnable() {
-						public void run() {
-							WizardDialog dialog = new WizardDialog(PDEPlugin
-									.getActiveWorkbenchShell(), wizard);
-							dialog.create();
-							SWTUtil.setDialogSize(dialog, 500, 500);
-							dialog.open();
-						}
-					});
-		}
-		catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-	private void handleEdit() {
-		final IStructuredSelection selection = (IStructuredSelection)extensionTree.getSelection();
-		ArrayList editorWizards = getEditorWizards(selection);
-		if (editorWizards==null) return;
-		if (editorWizards.size()==1) {
-			// open the wizard directly			
-			handleEdit((IConfigurationElement)editorWizards.get(0), selection);
-		}
-		else {
-			IProject project = getPage().getPDEEditor().getCommonProject();
-			IPluginModelBase model = (IPluginModelBase)getPage().getModel();
-			final ExtensionEditorWizard wizard = new ExtensionEditorWizard(project, model, selection);
-			BusyIndicator.showWhile(extensionTree.getTree().getDisplay(),
-				new Runnable() {
-					public void run() {
-						WizardDialog dialog = new WizardDialog(PDEPlugin
-								.getActiveWorkbenchShell(), wizard);
-						dialog.create();
-						SWTUtil.setDialogSize(dialog, 500, 500);
-						dialog.open();
-					}
-			});
-		}
-	}
-	private ArrayList getEditorWizards(IStructuredSelection selection) {
-		if (selection.size()!=1) return null;
-		Object obj = selection.getFirstElement();
-		String pointId = null;
-		if (obj instanceof IPluginExtension) {
-			pointId = ((IPluginExtension)obj).getPoint();
-		}
-		else if (obj instanceof IPluginElement) {
-			IPluginObject parent = ((IPluginElement)obj).getParent();
-			while (parent!=null) {
-				if (parent instanceof IPluginExtension) {
-					pointId = ((IPluginExtension)parent).getPoint();
-					break;
-				}
-				parent = parent.getParent();
-			}
-		}
-		if (pointId==null) return null;
-		if (editorWizards==null)
-			loadExtensionWizards();
-		return (ArrayList)editorWizards.get(pointId);
-	}
-
-	private void loadExtensionWizards() {
-		editorWizards = new Hashtable();
-		IConfigurationElement [] elements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.pde.ui.newExtension"); //$NON-NLS-1$
-		for (int i=0; i<elements.length; i++) {
-			IConfigurationElement element = elements[i];
-			if (element.getName().equals("editorWizard")) { //$NON-NLS-1$
-				String pointId = element.getAttribute("point"); //$NON-NLS-1$
-				if (pointId==null) continue;
-				ArrayList list = (ArrayList)editorWizards.get(pointId);
-				if (list==null) {
-					list = new ArrayList();
-					editorWizards.put(pointId, list);
-				}
-				list.add(element);
-			}
-		}
-	}
-	private boolean isSelectionEditable(IStructuredSelection selection) {
-		if (!getPage().getModel().isEditable())
-			return false;
-		return getEditorWizards(selection)!=null;
-	}
-	void handleCollapseAll() {
-		getTreePart().getTreeViewer().collapseAll();
-	}
-	public void initialize(IPluginModelBase model) {
-		extensionTree.setInput(model.getPluginBase());
-		selectFirstExtension();
-		boolean editable = model.isEditable();
-		TreePart treePart = getTreePart();
-		treePart.setButtonEnabled(0, editable);
-		treePart.setButtonEnabled(1, false);
-		treePart.setButtonEnabled(3, false);
-		treePart.setButtonEnabled(4, false);
-		model.addModelChangedListener(this);
-		newExtensionAction = new Action() {
-			public void run() {
-				handleNew();
-			}
-		};
-		newExtensionAction.setText(PDEUIMessages.ManifestEditor_DetailExtension_newExtension);
-		newExtensionAction
-				.setImageDescriptor(PDEPluginImages.DESC_EXTENSION_OBJ);
-		newExtensionAction.setEnabled(editable);
-		collapseAllAction = new Action() {
-			public void run() {
-				handleCollapseAll();
-			}
-		};
-		collapseAllAction.setText(PDEUIMessages.ManifestEditor_DetailExtension_collapseAll);
-	}
-	private void selectFirstExtension() {
-		Tree tree = extensionTree.getTree();
-		TreeItem [] items = tree.getItems();
-		if (items.length==0) return;
-		TreeItem firstItem = items[0];
-		Object obj = firstItem.getData();
-		extensionTree.setSelection(new StructuredSelection(obj));
-	}
-	void fireSelection() {
-		extensionTree.setSelection(extensionTree.getSelection());
-	}
-	public void initializeImages() {
-		PDELabelProvider provider = PDEPlugin.getDefault().getLabelProvider();
-		extensionImage = provider.get(PDEPluginImages.DESC_EXTENSION_OBJ);
-		genericElementImage = provider
-				.get(PDEPluginImages.DESC_GENERIC_XML_OBJ);
-	}
-	public void refresh() {
-		IPluginModelBase model = (IPluginModelBase)getPage().getModel();
-		extensionTree.setInput(model.getPluginBase());
-		selectFirstExtension();
-		getManagedForm().fireSelectionChanged(ExtensionsSection.this,
-						extensionTree.getSelection());
-		super.refresh();
-	}
-	
-	public void modelChanged(IModelChangedEvent event) {
-		if (event.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			markStale();
-			return;
-		}
-		Object changeObject = event.getChangedObjects()[0];
-		if (changeObject instanceof IPluginBase
-				&& event.getChangeType() == IModelChangedEvent.CHANGE
-				&& event.getChangedProperty().equals(
-						IPluginBase.P_EXTENSION_ORDER)) {
-			IStructuredSelection sel = (IStructuredSelection) extensionTree
-					.getSelection();
-			IPluginExtension extension = (IPluginExtension) sel
-					.getFirstElement();
-			extensionTree.refresh();
-			extensionTree.setSelection(new StructuredSelection(extension));
-			return;
-		}
-		if (changeObject instanceof IPluginExtension
-				|| (changeObject instanceof IPluginElement && ((IPluginElement)changeObject).getParent() instanceof IPluginParent)) {
-			IPluginObject pobj = (IPluginObject) changeObject;
-			IPluginObject parent = changeObject instanceof IPluginExtension
-					? ((IPluginModelBase) getPage().getModel()).getPluginBase()
-					: pobj.getParent();
-			if (event.getChangeType() == IModelChangedEvent.INSERT) {
-				extensionTree.add(parent, pobj);
-				extensionTree.setSelection(
-						new StructuredSelection(changeObject), true);
-				extensionTree.getTree().setFocus();
-			} else if (event.getChangeType() == IModelChangedEvent.REMOVE) {
-				extensionTree.remove(pobj);
-			} else {
-				if (event.getChangedProperty().equals(
-						IPluginParent.P_SIBLING_ORDER)) {
-					IStructuredSelection sel = (IStructuredSelection) extensionTree
-							.getSelection();
-					IPluginObject child = (IPluginObject) sel.getFirstElement();
-					extensionTree.refresh(child.getParent());
-					extensionTree.setSelection(new StructuredSelection(child));
-				} else {
-					extensionTree.update(changeObject, null);
-				}
-			}
-		}
-	}
-
-	private Image resolveObjectImage(Object obj) {
-		if (obj instanceof IPluginExtension) {
-			return extensionImage;
-		}
-		Image elementImage = genericElementImage;
-		if (obj instanceof IPluginElement) {
-			IPluginElement element = (IPluginElement) obj;
-			Image customImage = getCustomImage(element);
-			if (customImage != null)
-				elementImage = customImage;
-			String bodyText = element.getText();
-			boolean hasBodyText = bodyText!=null&&bodyText.length()>0;
-			if (hasBodyText) {
-				elementImage = PDEPlugin.getDefault().getLabelProvider().get(
-						elementImage, PDELabelProvider.F_EDIT);
-			}
-		}
-		return elementImage;
-	}
-	
-	private static boolean isStorageModel(IPluginObject object) {
-		IPluginModelBase modelBase = object.getPluginModel();
-		return modelBase.getInstallLocation()==null;
-	}
-	
-	static Image getCustomImage(IPluginElement element) {
-		if (isStorageModel(element))return null;
-		ISchemaElement elementInfo = getSchemaElement(element);
-		if (elementInfo != null && elementInfo.getIconProperty() != null) {
-			String iconProperty = elementInfo.getIconProperty();
-			IPluginAttribute att = element.getAttribute(iconProperty);
-			String iconPath = null;
-			if (att != null && att.getValue() != null) {
-				iconPath = att.getValue();
-			}
-			if (iconPath != null) {
-				//OK, we have an icon path relative to the plug-in
-				return getImageFromPlugin(element, iconPath);
-			}
-		}
-		return null;
-	}
-	
-	private static Image getImageFromPlugin(IPluginElement element,
-			String iconPathName) {
-		// 39283 - ignore icon paths that
-		// point at plugin.properties
-		if (iconPathName.startsWith("%")) //$NON-NLS-1$
-			return null;
-
-		IPluginModelBase model = element.getPluginModel();
-		if (model == null)
-			return null;
-
-		return PDEPlugin.getDefault().getLabelProvider().getImageFromPlugin(model, iconPathName);
-	}
-	private String resolveObjectName(Object obj) {
-		return resolveObjectName(getSchemaRegistry(), pluginInfoRegistry, obj);
-	}
-	
-	private SchemaRegistry getSchemaRegistry() {
-		if (schemaRegistry == null)
-			schemaRegistry = PDECore.getDefault().getSchemaRegistry();
-		return schemaRegistry;
-	}
-	
-	public static String resolveObjectName(SchemaRegistry schemaRegistry,
-			ExternalModelManager pluginInfoRegistry, Object obj) {
-		boolean fullNames = PDEPlugin.isFullNameModeEnabled();
-		if (obj instanceof IPluginExtension) {
-			IPluginExtension extension = (IPluginExtension) obj;
-			if (!fullNames) {
-				return extension.getPoint();
-			}
-			if (extension.getName() != null)
-				return extension.getTranslatedName();
-			ISchema schema = schemaRegistry.getSchema(extension.getPoint());
-			// try extension point schema definition
-			if (schema != null) {
-				// exists
-				return schema.getName();
-			}
-			return extension.getPoint();		
-		} else if (obj instanceof IPluginElement) {
-			IPluginElement element = (IPluginElement) obj;
-			String baseName = element.getName();			
-			String fullName = null;
-			ISchemaElement elementInfo = getSchemaElement(element);
-			IPluginAttribute labelAtt = null;
-			if (elementInfo != null && elementInfo.getLabelProperty() != null) {
-				labelAtt = element.getAttribute(elementInfo.getLabelProperty());
-			}
-			if (labelAtt == null) {
-				// try some hard-coded attributes that
-				// are used frequently
-				for (int i = 0; i < COMMON_LABEL_PROPERTIES.length; i++) {
-					labelAtt = element.getAttribute(COMMON_LABEL_PROPERTIES[i]);
-					if (labelAtt != null)
-						break;
-				}
-				if (labelAtt == null) {
-					// Last try - if there is only one attribute,
-					// use that
-					if (element.getAttributeCount() == 1)
-						labelAtt = element.getAttributes()[0];
-				}
-			}
-			if (labelAtt != null && labelAtt.getValue() != null)
-				fullName = stripShortcuts(labelAtt.getValue());
-			fullName = element.getResourceString(fullName);
-			if (fullNames)
-				return fullName != null ? fullName : baseName;
-			return fullName != null
-					? (fullName + " (" + baseName + ")") //$NON-NLS-1$ //$NON-NLS-2$
-					: baseName;
-		}
-		return obj.toString();
-	}
-	public void setFocus() {
-		if (extensionTree != null)
-			extensionTree.getTree().setFocus();
-	}
-	public static String stripShortcuts(String input) {
-		StringBuffer output = new StringBuffer();
-		for (int i = 0; i < input.length(); i++) {
-			char c = input.charAt(i);
-			if (c == '&')
-				continue;
-			else if (c == '@')
-				break;
-			output.append(c);
-		}
-		return output.toString();
-	}
-	protected boolean canPaste(Object target, Object[] objects) {
-		if (objects[0] instanceof IPluginExtension)
-			return true;
-		if (objects[0] instanceof IPluginElement
-				&& target instanceof IPluginParent)
-			return true;
-		return false;
-	}
-	protected void doPaste(Object target, Object[] objects) {
-		/*IPluginModelBase model = (IPluginModelBase) getPage().getModel();
-		IPluginBase plugin = model.getPluginBase();
-		try {
-			for (int i = 0; i < objects.length; i++) {
-				Object obj = objects[i];
-				if (obj instanceof IPluginExtension) {
-					IPluginExtension extension = (IPluginExtension) obj;
-					plugin.add(extension);
-					((PluginParent) extension).reconnect();
-				} else if (obj instanceof IPluginElement
-						&& target instanceof IPluginParent) {
-					IPluginElement element = (IPluginElement) obj;
-					((IPluginParent) target).add(element);
-					if (element instanceof PluginParent)
-						((PluginParent) element).reconnect();
-				}
-			}
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}*/
-	}
-	private void handleMove(boolean up) {
-		IStructuredSelection sel = (IStructuredSelection) extensionTree
-				.getSelection();
-		IPluginObject object = (IPluginObject) sel.getFirstElement();
-		if (object instanceof IPluginElement) {
-			IPluginParent parent = (IPluginParent) object.getParent();
-			IPluginObject[] children = parent.getChildren();
-			int index = parent.getIndexOf(object);
-			int newIndex = up ? index - 1 : index + 1;
-			IPluginObject child2 = children[newIndex];
-			try {
-				parent.swap(object, child2);
-			} catch (CoreException e) {
-				PDEPlugin.logException(e);
-			}
-		} else if (object instanceof IPluginExtension) {
-			IPluginExtension extension = (IPluginExtension) object;
-			IPluginBase plugin = extension.getPluginBase();
-			IPluginExtension[] extensions = plugin.getExtensions();
-			int index = plugin.getIndexOf(extension);
-			int newIndex = up ? index - 1 : index + 1;
-			IPluginExtension e2 = extensions[newIndex];
-			try {
-				plugin.swap(extension, e2);
-			} catch (CoreException e) {
-				PDEPlugin.logException(e);
-			}
-		}
-	}
-	private void updateUpDownButtons(Object item) {
-		if (getPage().getModel().isEditable() == false)
-			return;
-		boolean upEnabled = false;
-		boolean downEnabled = false;
-		if (item != null) {
-			if (item instanceof IPluginElement) {
-				IPluginElement element = (IPluginElement) item;
-				IPluginParent parent = (IPluginParent) element.getParent();
-				// check up
-				int index = parent.getIndexOf(element);
-				if (index > 0)
-					upEnabled = true;
-				if (index < parent.getChildCount() - 1)
-					downEnabled = true;
-			} else if (item instanceof IPluginExtension) {
-				IPluginExtension extension = (IPluginExtension) item;
-				IExtensions extensions = (IExtensions) extension.getParent();
-				int index = extensions.getIndexOf(extension);
-				int size = extensions.getExtensions().length;
-				if (index > 0)
-					upEnabled = true;
-				if (index < size - 1)
-					downEnabled = true;
-			}
-		}
-		getTreePart().setButtonEnabled(3, upEnabled);
-		getTreePart().setButtonEnabled(4, downEnabled);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/FragmentGeneralInfoSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/FragmentGeneralInfoSection.java
deleted file mode 100644
index c34c293..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/FragmentGeneralInfoSection.java
+++ /dev/null

@@ -1,357 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.osgi.util.ManifestElement;
-import org.eclipse.pde.core.plugin.IFragment;
-import org.eclipse.pde.core.plugin.IPlugin;
-import org.eclipse.pde.core.plugin.IPluginModel;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.ibundle.IBundle;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.parts.ComboPart;
-import org.eclipse.pde.internal.ui.parts.FormEntry;
-import org.eclipse.pde.internal.ui.util.SWTUtil;
-import org.eclipse.pde.internal.ui.wizards.PluginSelectionDialog;
-import org.eclipse.pde.internal.ui.wizards.plugin.NewPluginProjectWizard;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.forms.FormColors;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.Constants;
-
-public class FragmentGeneralInfoSection extends GeneralInfoSection {
-
-	private FormEntry fPluginIdEntry;
-	private FormEntry fPluginMinVersionEntry;
-	private FormEntry fPluginMaxVersionEntry;
-	private ComboPart fPluginMinVersionBound;
-	private ComboPart fPluginMaxVersionBound;
-	private ComboPart fMatchCombo;
-
-	public FragmentGeneralInfoSection(PDEFormPage page, Composite parent) {
-		super(page, parent);
-	}
-	
-	protected String getSectionDescription() {
-		return PDEUIMessages.ManifestEditor_PluginSpecSection_fdesc; 
-	}
-	
-	protected void createSpecificControls(Composite parent, FormToolkit toolkit, IActionBars actionBars) {
-		createPluginIdEntry(parent, toolkit, actionBars);
-		createPluginVersionEntry(parent, toolkit, actionBars);
-		if (!isBundle())
-			createMatchCombo(parent, toolkit, actionBars);
-	}
-	
-	private void createPluginIdEntry(Composite parent, FormToolkit toolkit, IActionBars actionBars) {
-		fPluginIdEntry = new FormEntry(
-				parent,
-				toolkit,
-				PDEUIMessages.GeneralInfoSection_pluginId,  
-				PDEUIMessages.GeneralInfoSection_browse, // 
-				isEditable());
-		fPluginIdEntry.setFormEntryListener(new FormEntryAdapter(this, actionBars) {
-			public void textValueChanged(FormEntry entry) {
-				try {
-					((IFragment) getPluginBase()).setPluginId(fPluginIdEntry.getValue());
-				} catch (CoreException e1) {
-					PDEPlugin.logException(e1);
-				}
-			}
-			public void linkActivated(HyperlinkEvent e) {
-				String plugin = fPluginIdEntry.getValue();				
-				if (PDECore.getDefault().getModelManager().findPluginModel(
-						plugin) == null) {
-					createFragmentPlugin();
-				}
-				ManifestEditor.openPluginEditor(fPluginIdEntry.getValue());
-			}
-			public void browseButtonSelected(FormEntry entry) {
-				handleOpenDialog();
-			}
-			private void createFragmentPlugin() {
-				NewPluginProjectWizard wizard = new NewPluginProjectWizard("Equinox"); //$NON-NLS-1$
-				WizardDialog dialog = new WizardDialog(PDEPlugin
-						.getActiveWorkbenchShell(), wizard);
-				dialog.create();
-				SWTUtil.setDialogSize(dialog, 400, 500);
-				if (dialog.open() == WizardDialog.OK) {
-					String plugin = wizard.getPluginId();
-					try {
-						((IFragment) getPluginBase()).setPluginId(plugin);
-						fPluginIdEntry.setValue(plugin, false);
-					} catch (CoreException ce) {
-						PDEPlugin.logException(ce);
-					}
-				}
-			}
-		});
-		fPluginIdEntry.setEditable(isEditable());		
-	}
-
-	protected void handleOpenDialog() {
-		PluginSelectionDialog dialog = new PluginSelectionDialog(getSection().getShell(), false, false);
-		dialog.create();
-		if (dialog.open() == PluginSelectionDialog.OK) {
-			IPluginModel model = (IPluginModel) dialog.getFirstResult();
-			IPlugin plugin = model.getPlugin();
-			fPluginIdEntry.setValue(plugin.getId());
-			fPluginMinVersionEntry.setValue(plugin.getVersion());
-		}
-	}
-
-	private void createPluginVersionEntry(Composite client,
-			FormToolkit toolkit, IActionBars actionBars) {
-		if (isBundle()) {
-			createBundlePluginVersionEntry(client, toolkit, actionBars);
-		} else {
-			createNonBundlePluginVersionEntry(client, toolkit, actionBars);
-		}
-		
-	}
-	
-	private void createBundlePluginVersionEntry(Composite client,
-			FormToolkit toolkit, IActionBars actionBars) {
-
-		String[] items = new String[] {
-				PDEUIMessages.DependencyPropertiesDialog_comboInclusive,
-				PDEUIMessages.DependencyPropertiesDialog_comboExclusive };
-		fPluginMinVersionEntry = new FormEntry(client, toolkit,
-				PDEUIMessages.GeneralInfoSection_hostMinVersionRange, 0, 1); 
-		fPluginMinVersionEntry.setFormEntryListener(new FormEntryAdapter(this, actionBars) {
-			public void textValueChanged(FormEntry entry) {
-				try {
-					((IFragment) getPluginBase()).setPluginVersion(getVersion());
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-			public void textDirty(FormEntry entry) {
-				setMaxFieldsEnabled();
-				super.textDirty(entry);
-			}
-		});
-		fPluginMinVersionEntry.setEditable(isEditable());
-		fPluginMinVersionBound = new ComboPart();
-		fPluginMinVersionBound.createControl(client, toolkit, SWT.READ_ONLY);
-		fPluginMinVersionBound.getControl().setLayoutData(new TableWrapData(TableWrapData.FILL));
-		fPluginMinVersionBound.setItems(items);
-		fPluginMinVersionBound.getControl().setEnabled(isEditable());
-		fPluginMinVersionBound.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				try {
-					((IFragment) getPluginBase()).setPluginVersion(getVersion());
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		});
-		
-		fPluginMaxVersionEntry = new FormEntry(client, toolkit,
-				PDEUIMessages.GeneralInfoSection_hostMaxVersionRange, 0, 1); 
-		fPluginMaxVersionEntry.setFormEntryListener(new FormEntryAdapter(this, actionBars) {
-			public void textValueChanged(FormEntry entry) {
-				try {
-					((IFragment) getPluginBase()).setPluginVersion(getVersion());
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		});
-		fPluginMaxVersionEntry.setEditable(isEditable());
-		fPluginMaxVersionBound = new ComboPart();
-		fPluginMaxVersionBound.createControl(client, toolkit, SWT.READ_ONLY);
-		fPluginMaxVersionBound.getControl().setLayoutData(new TableWrapData(TableWrapData.FILL));
-		fPluginMaxVersionBound.setItems(items);
-		fPluginMaxVersionBound.getControl().setEnabled(isEditable());
-		fPluginMaxVersionBound.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				try {
-					((IFragment) getPluginBase()).setPluginVersion(getVersion());
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}			
-		});
-	}
-
-	private void createNonBundlePluginVersionEntry(Composite client,
-			FormToolkit toolkit, IActionBars actionBars) {
-		fPluginMinVersionEntry = new FormEntry(
-				client,
-				toolkit,
-				PDEUIMessages.GeneralInfoSection_pluginVersion, null, false); 
-		fPluginMinVersionEntry.setFormEntryListener(new FormEntryAdapter(this,
-				actionBars) {
-			public void textValueChanged(FormEntry entry) {
-				try {
-					((IFragment) getPluginBase()).setPluginVersion(entry.getValue());
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		});
-		fPluginMinVersionEntry.setEditable(isEditable());
-	}
-	
-	private void createMatchCombo(Composite client, FormToolkit toolkit,
-			IActionBars actionBars) {
-		Label matchLabel = toolkit.createLabel(client, PDEUIMessages.ManifestEditor_PluginSpecSection_versionMatch);
-		matchLabel.setForeground(toolkit.getColors().getColor(FormColors.TITLE));
-		TableWrapData td = new TableWrapData();
-		td.valign = TableWrapData.MIDDLE;
-		matchLabel.setLayoutData(td);
-		
-		fMatchCombo = new ComboPart();
-		fMatchCombo.createControl(client, toolkit, SWT.READ_ONLY);
-		td = new TableWrapData(TableWrapData.FILL);
-		td.colspan = 2;
-		td.valign = TableWrapData.MIDDLE;
-		fMatchCombo.getControl().setLayoutData(td);
-		
-		String[] items = new String[]{"", //$NON-NLS-1$
-				PDEUIMessages.ManifestEditor_MatchSection_equivalent,
-				PDEUIMessages.ManifestEditor_MatchSection_compatible,
-				PDEUIMessages.ManifestEditor_MatchSection_perfect,
-				PDEUIMessages.ManifestEditor_MatchSection_greater};
-		fMatchCombo.setItems(items);
-		fMatchCombo.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				int match = fMatchCombo.getSelectionIndex();
-				try {
-					((IFragment) getPluginBase()).setRule(match);
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		});
-		fMatchCombo.getControl().setEnabled(isEditable());
-	}
-	
-	public void commit(boolean onSave) {
-		fPluginIdEntry.commit();
-		fPluginMinVersionEntry.commit();
-		fPluginMaxVersionEntry.commit();
-		super.commit(onSave);
-	}
-	
-	public void cancelEdit() {
-		fPluginIdEntry.cancelEdit();
-		fPluginMinVersionEntry.cancelEdit();
-		fPluginMaxVersionEntry.cancelEdit();
-		super.cancelEdit();
-	}
-	
-	public void refresh() {
-		IPluginModelBase model = (IPluginModelBase) getPage().getModel();
-		IFragment fragment = (IFragment) model.getPluginBase();
-		fPluginIdEntry.setValue(fragment.getPluginId(), true);
-		if (isBundle()) {
-			refreshVersion();
-		} else {
-			fPluginMinVersionEntry.setValue(fragment.getPluginVersion(), true);
-		}
-		if (fMatchCombo != null)
-			fMatchCombo.select(fragment.getRule());
-		super.refresh();
-	}
-	
-	protected String getAttribute(String header, String attribute) {
-		IBundle bundle = getBundle();
-		if (bundle == null)
-			return null;
-		String value = bundle.getHeader(header);
-		if (value == null)
-			return null;
-		try {
-			ManifestElement[] elements = ManifestElement.parseHeader(header, value);
-			if (elements.length > 0)
-				return elements[0].getAttribute(attribute);
-		} catch (BundleException e) {
-		}
-		return null;
-	}
-
-	private void setMaxFieldsEnabled() {
-		boolean enabled = fPluginMinVersionEntry.getText().getText().trim().length() != 0;
-		fPluginMaxVersionEntry.getText().setEnabled(enabled);
-		fPluginMaxVersionBound.getControl().setEnabled(enabled && isEditable());
-	}
-	
-	private String getVersion() {
-		if (isBundle()) {
-			if (!fPluginMinVersionEntry.getValue().equals(fPluginMaxVersionEntry.getValue()) &&
-					fPluginMaxVersionEntry.getText().getEnabled()) {
-				if (fPluginMaxVersionEntry.getValue().length() == 0)
-					return fPluginMinVersionEntry.getValue();
-				String version;
-				if (fPluginMinVersionBound.getSelectionIndex() == 0)
-					version = "["; //$NON-NLS-1$
-				else
-					version = "("; //$NON-NLS-1$
-				version += fPluginMinVersionEntry.getValue() + "," + fPluginMaxVersionEntry.getValue(); //$NON-NLS-1$
-				if (fPluginMaxVersionBound.getSelectionIndex() == 0)
-					version += "]"; //$NON-NLS-1$
-				else
-					version += ")"; //$NON-NLS-1$
-				return version;
-			}
-		}
-		return fPluginMinVersionEntry.getValue();
-	}
-	
-	private void refreshVersion() {	
-		String version = getAttribute(Constants.FRAGMENT_HOST, Constants.BUNDLE_VERSION_ATTRIBUTE);
-		if (version == null) {
-			setVersionFields("", true, "", false); //$NON-NLS-1$ //$NON-NLS-2$
-			setMaxFieldsEnabled();
-			return;
-		}
-		version = version.trim();
-		int comInd = version.indexOf(","); //$NON-NLS-1$
-		int lastPos = version.length() - 1;
-		char first = version.charAt(0);
-		char last = version.charAt(lastPos);
-		if (comInd == -1) {
-			setVersionFields(version, true, "", false); //$NON-NLS-1$
-		} else if ((first == '[' || first == '(') && 
-				(last == ']' || last == ')')) {
-			version = version.substring(1, lastPos);
-			setVersionFields(
-					version.substring(0, comInd - 1),
-					first == '[',
-					version.substring(comInd),
-					last == ']');
-		}
-		setMaxFieldsEnabled();
-	}
-	
-	private void setVersionFields(String minVersion, boolean minInclusive, String maxVersion, boolean maxInclusive) {
-		fPluginMinVersionEntry.setValue(minVersion, true);
-		fPluginMinVersionBound.select(minInclusive ? 0 : 1);
-		fPluginMaxVersionEntry.setValue(maxVersion, true);
-		fPluginMaxVersionBound.select(maxInclusive ? 0 : 1);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/GeneralInfoSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/GeneralInfoSection.java
deleted file mode 100644
index 50df425..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/GeneralInfoSection.java
+++ /dev/null

@@ -1,247 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.pde.core.IBaseModel;
-import org.eclipse.pde.core.IModelChangeProvider;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.core.plugin.IPluginBase;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.ibundle.*;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.PDESection;
-import org.eclipse.pde.internal.ui.editor.context.*;
-import org.eclipse.pde.internal.ui.parts.FormEntry;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
-
-public abstract class GeneralInfoSection extends PDESection {
-	private static String PLATFORM_FILTER = "Eclipse-PlatformFilter"; //$NON-NLS-1$
-
-	private FormEntry fIdEntry;
-	private FormEntry fVersionEntry;
-	private FormEntry fNameEntry;
-	private FormEntry fProviderEntry;
-	private FormEntry fPlatformFilterEntry;
-
-	public GeneralInfoSection(PDEFormPage page, Composite parent) {
-		super(page, parent, Section.DESCRIPTION);
-		createClient(getSection(), page.getEditor().getToolkit());
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.neweditor.PDESection#createClient(org.eclipse.ui.forms.widgets.Section,
-	 *      org.eclipse.ui.forms.widgets.FormToolkit)
-	 */
-	protected void createClient(Section section, FormToolkit toolkit) {
-		section.setText(PDEUIMessages.ManifestEditor_PluginSpecSection_title); 
-		section.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
-		section.setDescription(getSectionDescription()); 
-		
-		Composite client = toolkit.createComposite(section);
-		TableWrapLayout layout = new TableWrapLayout();
-		layout.leftMargin = layout.rightMargin = toolkit.getBorderStyle() != SWT.NULL ? 0 : 2;
-		layout.numColumns = 3;
-		client.setLayout(layout);
-		section.setClient(client);
-		
-		IActionBars actionBars = getPage().getPDEEditor().getEditorSite().getActionBars();
-		createIDEntry(client, toolkit, actionBars);
-		createVersionEntry(client, toolkit, actionBars);
-		createNameEntry(client, toolkit, actionBars);
-		createProviderEntry(client, toolkit, actionBars);		
-		if (isBundle() && ((ManifestEditor)getPage().getEditor()).isEquinox())
-			createPlatformFilterEntry(client, toolkit, actionBars);
-		createSpecificControls(client, toolkit, actionBars);
-		toolkit.paintBordersFor(client);
-		
-		IBaseModel model = getPage().getModel();
-		if (model instanceof IModelChangeProvider)
-			((IModelChangeProvider) model).addModelChangedListener(this);
-	}
-	
-	protected abstract String getSectionDescription();
-	
-	protected abstract void createSpecificControls(Composite parent, FormToolkit toolkit, IActionBars actionBars);
-	
-	protected  IPluginBase getPluginBase() {
-		IBaseModel model = getPage().getPDEEditor().getAggregateModel();
-		return ((IPluginModelBase) model).getPluginBase();
-	}
-	
-	protected boolean isBundle() {
-		return getBundleContext() != null;
-	}
-	
-	private BundleInputContext getBundleContext() {
-		InputContextManager manager = getPage().getPDEEditor().getContextManager();
-		return (BundleInputContext) manager.findContext(BundleInputContext.CONTEXT_ID);
-	}
-	
-	protected IBundle getBundle() {
-		BundleInputContext context = getBundleContext();
-		if (context != null) {
-			IBundleModel model = (IBundleModel)context.getModel();
-			return model.getBundle();
-		}
-		return null;
-	}
-	
-	private void createIDEntry(Composite client, FormToolkit toolkit, IActionBars actionBars) {
-		fIdEntry = new FormEntry(client, toolkit, PDEUIMessages.GeneralInfoSection_id, null, false); 
-		fIdEntry.setFormEntryListener(new FormEntryAdapter(this, actionBars) {
-			public void textValueChanged(FormEntry entry) {
-				try {
-					getPluginBase().setId(entry.getValue());
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		});
-		fIdEntry.setEditable(isEditable());
-	}
-	
-	private void createVersionEntry(Composite client, FormToolkit toolkit, IActionBars actionBars) {
-		fVersionEntry = new FormEntry(client, toolkit, PDEUIMessages.GeneralInfoSection_version, null, false); 
-		fVersionEntry.setFormEntryListener(new FormEntryAdapter(this,actionBars) {
-			public void textValueChanged(FormEntry entry) {
-				try {
-					getPluginBase().setVersion(entry.getValue());
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		});
-		fVersionEntry.setEditable(isEditable());
-	}
-	
-	private void createNameEntry(Composite client, FormToolkit toolkit,IActionBars actionBars) {
-		fNameEntry = new FormEntry(client, toolkit, PDEUIMessages.GeneralInfoSection_name, null, false); 
-		fNameEntry.setFormEntryListener(new FormEntryAdapter(this, actionBars) {
-			public void textValueChanged(FormEntry entry) {
-				try {
-					getPluginBase().setName(entry.getValue());
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		});
-		fNameEntry.setEditable(isEditable());
-	}
-	
-	private void createProviderEntry(Composite client, FormToolkit toolkit, IActionBars actionBars) {
-		fProviderEntry = new FormEntry(client, toolkit, PDEUIMessages.GeneralInfoSection_provider, null, false);
-		fProviderEntry.setFormEntryListener(new FormEntryAdapter(this,actionBars) {
-			public void textValueChanged(FormEntry entry) {
-				try {
-					getPluginBase().setProviderName(entry.getValue());
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		});
-		fProviderEntry.setEditable(isEditable());
-	}
-	
-	private void createPlatformFilterEntry(Composite client, FormToolkit toolkit, IActionBars actionBars) {
-		fPlatformFilterEntry = new FormEntry(client, toolkit, PDEUIMessages.GeneralInfoSection_platformFilter, null, false);
-		fPlatformFilterEntry.setFormEntryListener(new FormEntryAdapter(this,actionBars) {
-			public void textValueChanged(FormEntry entry) {
-				getBundle().setHeader(PLATFORM_FILTER, fPlatformFilterEntry.getValue());
-			}
-		});
-		fPlatformFilterEntry.setEditable(isEditable());
-	}
-
-	
-	public void commit(boolean onSave) {
-		fIdEntry.commit();
-		fVersionEntry.commit();
-		fNameEntry.commit();
-		fProviderEntry.commit();
-		if (fPlatformFilterEntry != null)
-			fPlatformFilterEntry.commit();
-		super.commit(onSave);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.editor.PDESection#modelChanged(org.eclipse.pde.core.IModelChangedEvent)
-	 */
-	public void modelChanged(IModelChangedEvent e) {
-		if (e.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			markStale();
-			return;
-		}
-		refresh();
-		if (e.getChangeType() == IModelChangedEvent.CHANGE) {
-			Object obj = e.getChangedObjects()[0];
-			if (obj instanceof IPluginBase) {
-				String property = e.getChangedProperty();
-				if (property != null && property.equals(getPage().getPDEEditor().getTitleProperty()))
-					getPage().getPDEEditor().updateTitle();
-			}
-		}
-	}
-
-	public void refresh() {
-		IPluginModelBase model = (IPluginModelBase) getPage().getPDEEditor()
-				.getContextManager().getAggregateModel();
-		IPluginBase pluginBase = model.getPluginBase();
-		fIdEntry.setValue(pluginBase.getId(), true);
-		fNameEntry.setValue(pluginBase.getName(), true);
-		fVersionEntry.setValue(pluginBase.getVersion(), true);
-		fProviderEntry.setValue(pluginBase.getProviderName(), true);
-		if (fPlatformFilterEntry != null) {
-			IBundle bundle = getBundle();
-			if (bundle != null)
-				fPlatformFilterEntry.setValue(bundle.getHeader(PLATFORM_FILTER), true);
-		}
-		getPage().getPDEEditor().updateTitle();
-		super.refresh();
-	}
-	
-	public void cancelEdit() {
-		fIdEntry.cancelEdit();
-		fNameEntry.cancelEdit();
-		fVersionEntry.cancelEdit();
-		fProviderEntry.cancelEdit();
-		if (fPlatformFilterEntry != null) 
-			fPlatformFilterEntry.cancelEdit();
-		super.cancelEdit();
-	}
-	
-	public void dispose() {
-		IBaseModel model = getPage().getModel();
-		if (model instanceof IModelChangeProvider)
-			((IModelChangeProvider) model).removeModelChangedListener(this);
-		super.dispose();
-	}
-	
-	public boolean canPaste(Clipboard clipboard) {
-		Display d = getSection().getDisplay();
-		return (d.getFocusControl() instanceof Text);
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ImportPackageSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ImportPackageSection.java
deleted file mode 100644
index 512a6ab..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ImportPackageSection.java
+++ /dev/null

@@ -1,445 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.editor.plugin;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.jdt.ui.ISharedImages;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-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.osgi.service.resolver.BundleDescription;
-import org.eclipse.osgi.service.resolver.BundleSpecification;
-import org.eclipse.osgi.service.resolver.ExportPackageDescription;
-import org.eclipse.osgi.service.resolver.State;
-import org.eclipse.pde.core.IModel;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.core.IModelChangedListener;
-import org.eclipse.pde.core.plugin.IPluginImport;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.ICoreConstants;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.TargetPlatform;
-import org.eclipse.pde.internal.core.bundle.BundlePluginBase;
-import org.eclipse.pde.internal.core.ibundle.IBundle;
-import org.eclipse.pde.internal.core.ibundle.IBundleModel;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.TableSection;
-import org.eclipse.pde.internal.ui.editor.context.InputContextManager;
-import org.eclipse.pde.internal.ui.elements.DefaultTableProvider;
-import org.eclipse.pde.internal.ui.model.bundle.Bundle;
-import org.eclipse.pde.internal.ui.model.bundle.ImportPackageHeader;
-import org.eclipse.pde.internal.ui.model.bundle.ImportPackageObject;
-import org.eclipse.pde.internal.ui.model.bundle.PackageObject;
-import org.eclipse.pde.internal.ui.parts.TablePart;
-import org.eclipse.pde.internal.ui.search.dependencies.UnusedDependenciesAction;
-import org.eclipse.pde.internal.ui.util.SWTUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.dialogs.ElementListSelectionDialog;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-import org.osgi.framework.Constants;
-import org.osgi.framework.Version;
-
-
-public class ImportPackageSection extends TableSection implements IModelChangedListener {
-
-    private static final int ADD_INDEX = 0;
-    private static final int REMOVE_INDEX = 1;
-    private static final int PROPERTIES_INDEX = 2;
-    
-    private ImportPackageHeader fHeader;
-    
-	class ImportPackageContentProvider extends DefaultTableProvider {
-        public Object[] getElements(Object parent) {
-            if (fHeader == null) {
-                Bundle bundle = (Bundle)getBundle();
-                fHeader = (ImportPackageHeader)bundle.getManifestHeader(Constants.IMPORT_PACKAGE);
-            }
-            return fHeader == null ? new Object[0] : fHeader.getPackages();
-        }
-	}
-
-	class ImportPackageDialogLabelProvider extends LabelProvider {
-		public Image getImage(Object element) {
-			return JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_PACKAGE);
-		}
-
-		public String getText(Object element) {
-			ExportPackageDescription p = (ExportPackageDescription) element;
-            StringBuffer buffer = new StringBuffer(p.getName());
-            String version = p.getVersion().toString();
-            if (!version.equals(Version.emptyVersion.toString())) {
-                buffer.append(" ("); //$NON-NLS-1$
-                buffer.append(version);
-                buffer.append(")"); //$NON-NLS-1$
-            }
-			return buffer.toString();
-		}
-	}
-
-    private TableViewer fPackageViewer;
-
-    private Action fAddAction;
-    private Action fRemoveAction;
-    private Action fPropertiesAction;
-
-	public ImportPackageSection(PDEFormPage page, Composite parent) {
-		super(
-				page,
-				parent,
-				Section.DESCRIPTION,
-				new String[] {PDEUIMessages.ImportPackageSection_add, PDEUIMessages.ImportPackageSection_remove, PDEUIMessages.ImportPackageSection_properties}); 
-	}
-    
-    private boolean isFragment() {
-        IPluginModelBase model = (IPluginModelBase)getPage().getPDEEditor().getAggregateModel();
-        return model.isFragmentModel();
-    }
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.editor.PDESection#createClient(org.eclipse.ui.forms.widgets.Section,
-	 *      org.eclipse.ui.forms.widgets.FormToolkit)
-	 */
-	protected void createClient(Section section, FormToolkit toolkit) {
-        section.setText(PDEUIMessages.ImportPackageSection_required);
-        if (isFragment())
-			section.setDescription(PDEUIMessages.ImportPackageSection_descFragment);
-		else
-			section.setDescription(PDEUIMessages.ImportPackageSection_desc);
-
-        Composite container = createClientContainer(section, 2, toolkit);
-		createViewerPartControl(container, SWT.MULTI, 2, toolkit);
-		TablePart tablePart = getTablePart();
-		fPackageViewer = tablePart.getTableViewer();
-		fPackageViewer
-				.setContentProvider(new ImportPackageContentProvider());
-		fPackageViewer.setLabelProvider(PDEPlugin.getDefault().getLabelProvider());
-		fPackageViewer.setSorter(new ViewerSorter() {
-            public int compare(Viewer viewer, Object e1, Object e2) {
-                String s1 = e1.toString();
-                String s2 = e2.toString();
-                if (s1.indexOf(" ") != -1) //$NON-NLS-1$
-                    s1 = s1.substring(0, s1.indexOf(" ")); //$NON-NLS-1$
-                if (s2.indexOf(" ") != -1) //$NON-NLS-1$
-                    s2 = s2.substring(0, s2.indexOf(" ")); //$NON-NLS-1$
-                return super.compare(viewer, s1, s2);
-            }
-        });
-		toolkit.paintBordersFor(container);
-		section.setClient(container);
-		section.setLayoutData(new GridData(GridData.FILL_BOTH));
-        makeActions();
-        
-        IBundleModel model = getBundleModel();
-        fPackageViewer.setInput(model);
-        model.addModelChangedListener(this);
-        updateButtons();
-	}
-    
-    public boolean doGlobalAction(String actionId) {
-        if (actionId.equals(ActionFactory.DELETE.getId())) {
-            handleRemove();
-            return true;
-        }
-        if (actionId.equals(ActionFactory.CUT.getId())) {
-            // delete here and let the editor transfer
-            // the selection to the clipboard
-            handleRemove();
-            return false;
-        }
-        if (actionId.equals(ActionFactory.PASTE.getId())) {
-            doPaste();
-            return true;
-        }
-        return false;
-    }
-    
-    public void dispose() {
-        IBundleModel model = getBundleModel();
-        if (model != null)
-            model.removeModelChangedListener(this);
-        super.dispose();
-    }
-    
-    protected void doPaste() {
-    }
-
-	protected void selectionChanged(IStructuredSelection sel) {
-        getPage().getPDEEditor().setSelection(sel);
-        updateButtons();
-	}
-
-	private void updateButtons() {
-        int size = ((IStructuredSelection)fPackageViewer.getSelection()).size();
-        TablePart tablePart = getTablePart();
-        tablePart.setButtonEnabled(ADD_INDEX, isEditable());
-        tablePart.setButtonEnabled(REMOVE_INDEX, isEditable() && size > 0);
-        tablePart.setButtonEnabled(PROPERTIES_INDEX, size == 1);  
-    }
-    
-    protected void handleDoubleClick(IStructuredSelection selection) {
-        handleOpenProperties();
-    }
-
-    protected void buttonSelected(int index) {
-        switch (index) {
-        case ADD_INDEX:
-            handleAdd();
-            break;
-        case REMOVE_INDEX:
-            handleRemove();
-            break;
-        case PROPERTIES_INDEX:
-            handleOpenProperties();
-        }
-	}
-
-	private void handleOpenProperties() {
-        Object object = ((IStructuredSelection)fPackageViewer.getSelection()).getFirstElement();
-        ImportPackageObject importObject = (ImportPackageObject)object;
-
-        DependencyPropertiesDialog dialog = new DependencyPropertiesDialog(isEditable(),importObject);
-        dialog.create();
-        SWTUtil.setDialogSize(dialog, 400, -1);
-        dialog.setTitle(importObject.getName());
-        if (dialog.open() == DependencyPropertiesDialog.OK && isEditable()) {
-            importObject.setOptional(dialog.isOptional());
-            importObject.setVersion(dialog.getVersion());
-         }
-    }
-
-	private void handleRemove() {
-        Object[] removed = ((IStructuredSelection) fPackageViewer.getSelection()).toArray();
-        for (int i = 0; i < removed.length; i++) {
-            fHeader.removePackage((PackageObject) removed[i]);
-        }
-	}
-
-	private void handleAdd() {
-       ElementListSelectionDialog dialog = new ElementListSelectionDialog(
-                PDEPlugin.getActiveWorkbenchShell(), 
-                new ImportPackageDialogLabelProvider());
-        dialog.setElements(getAvailablePackages());
-        dialog.setMultipleSelection(true);
-        dialog.setMessage(PDEUIMessages.ImportPackageSection_exported);
-        dialog.setTitle(PDEUIMessages.ImportPackageSection_selection);
-        dialog.create();
-        SWTUtil.setDialogSize(dialog, 400, 500);
-		if (dialog.open() == ElementListSelectionDialog.OK) {
-			Object[] selected = dialog.getResult();
-            if (fHeader != null) {
-    			for (int i = 0; i < selected.length; i++) {
-    				ExportPackageDescription candidate = (ExportPackageDescription) selected[i];
-                    fHeader.addPackage(new ImportPackageObject(fHeader, candidate, getVersionAttribute()));
-                }
-            } else {
-                getBundle().setHeader(Constants.IMPORT_PACKAGE, getValue(selected));               
-            }
-		}
-	}
-
-    private String getValue(Object[] objects) {
-        StringBuffer buffer = new StringBuffer();
-        for (int i = 0; i < objects.length; i++) {
-            ExportPackageDescription desc = (ExportPackageDescription)objects[i];
-            if (buffer.length() > 0)
-                buffer.append("," + getLineDelimiter() + " "); //$NON-NLS-1$ //$NON-NLS-2$
-            buffer.append(desc.getName());
-            String version = desc.getVersion().toString();
-            if (!version.equals(Version.emptyVersion.toString())) {
-                buffer.append(";"); //$NON-NLS-1$
-                buffer.append(getVersionAttribute());
-                buffer.append("=\""); //$NON-NLS-1$
-                buffer.append(version);
-                buffer.append("\""); //$NON-NLS-1$
-            }
-        }
-        return buffer.toString();
-    }
-    
-	private ExportPackageDescription[] getAvailablePackages() {
-		ArrayList result = new ArrayList();
-        Set set = getForbiddenIds();
-        
-        boolean allowJava = "true".equals(getBundle().getHeader(ICoreConstants.ECLIPSE_JREBUNDLE)); //$NON-NLS-1$
-        ExportPackageDescription[] packages = TargetPlatform.getState().getExportedPackages();
-        for (int i = 0; i < packages.length; i++) {
-        	if (".".equals(packages[i].getName())) //$NON-NLS-1$
-        		continue;
-            String id = packages[i].getExporter().getSymbolicName();
-            if (PDECore.getDefault().findPlugin(id) == null)
-                continue;
-			if (set.contains(packages[i].getExporter().getSymbolicName()))
-                continue;
-			String name = packages[i].getName();
-			if (("java".equals(name) || name.startsWith("java.")) && !allowJava) //$NON-NLS-1$ //$NON-NLS-2$
-				continue;
-			if (fHeader == null || !fHeader.hasPackage(packages[i].getName()))
-				result.add(packages[i]);			
-		}
-		return (ExportPackageDescription[])result.toArray(new ExportPackageDescription[result.size()]);
-	}
-
-	public void modelChanged(IModelChangedEvent event) {
-        if (event.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-            fHeader = null;
-            markStale();
-            return;
-        }   
-        
-        if (Constants.IMPORT_PACKAGE.equals(event.getChangedProperty())) {
-            refresh();
-            return;
-        }
-        
-        Object[] objects = event.getChangedObjects();
-        for (int i = 0; i < objects.length; i++) {
-            if (objects[i] instanceof ImportPackageObject) {
-                ImportPackageObject object = (ImportPackageObject)objects[i];
-                switch (event.getChangeType()) {
-                    case IModelChangedEvent.INSERT:
-                        fPackageViewer.add(object);
-                        fPackageViewer.setSelection(new StructuredSelection(object));
-                        fPackageViewer.getTable().setFocus();
-                        break;
-                    case IModelChangedEvent.REMOVE:
-                        Table table = fPackageViewer.getTable();
-                        int index = table.getSelectionIndex();
-                        fPackageViewer.remove(object);
-                        table.setSelection(index < table.getItemCount() ? index : table.getItemCount() -1);
-                        break;
-                    default:
-                        fPackageViewer.refresh(object);
-                }
-            }
-        }
-	}
-
-	public void refresh() {
-		fPackageViewer.refresh();
-		super.refresh();
-	}
-    
-    private void makeActions() {
-        fAddAction = new Action(PDEUIMessages.RequiresSection_add) { 
-            public void run() {
-                handleAdd();
-            }
-        };
-        fAddAction.setEnabled(isEditable());
-        fRemoveAction = new Action(PDEUIMessages.RequiresSection_delete) { 
-            public void run() {
-                handleRemove();
-            }
-        };
-        fRemoveAction.setEnabled(isEditable());
-        
-        fPropertiesAction = new Action(PDEUIMessages.ImportPackageSection_propertyAction) { 
-            public void run() {
-                handleOpenProperties();
-            }
-        };
-    }
-
-	protected void fillContextMenu(IMenuManager manager) {
-        manager.add(fAddAction);
-        manager.add(new Separator());
-        manager.add(fRemoveAction);
-		getPage().getPDEEditor().getContributor().contextMenuAboutToShow(manager);
-		manager.add(new Separator());
-		if (((IModel)getPage().getModel()).getUnderlyingResource()!=null) 
-			manager.add(new UnusedDependenciesAction((IPluginModelBase) getPage().getModel(), false));
-        if (!fPackageViewer.getSelection().isEmpty()) {
-            manager.add(new Separator());
-            manager.add(fPropertiesAction);
-        }
-	}
-
-    private BundleInputContext getBundleContext() {
-        InputContextManager manager = getPage().getPDEEditor().getContextManager();
-        return (BundleInputContext) manager.findContext(BundleInputContext.CONTEXT_ID);
-    }
-    
-    private IBundleModel getBundleModel() {
-        BundleInputContext context = getBundleContext();
-        return (context != null) ? (IBundleModel)context.getModel() : null;
-        
-    }
-    private String getLineDelimiter() {
-		BundleInputContext inputContext = getBundleContext();
-		if (inputContext != null) {
-			return inputContext.getLineDelimiter();
-		}
-		return System.getProperty("line.separator"); //$NON-NLS-1$
-	}
-    
-    private IBundle getBundle() {
-        IBundleModel model = getBundleModel();
-         return (model != null) ? model.getBundle() : null;
-    }
-    
-    private String getVersionAttribute() {
-        int manifestVersion = BundlePluginBase.getBundleManifestVersion(getBundle());
-        return (manifestVersion < 2) ? ICoreConstants.PACKAGE_SPECIFICATION_VERSION : Constants.VERSION_ATTRIBUTE;
-    }
-    
-    private Set getForbiddenIds() {
-        HashSet set = new HashSet();
-        IPluginModelBase model = (IPluginModelBase)getPage().getPDEEditor().getAggregateModel();
-        String id = model.getPluginBase().getId();
-        if (id != null)
-            set.add(id);
-        IPluginImport[] imports = model.getPluginBase().getImports();
-        State state = TargetPlatform.getState();
-        for (int i = 0; i < imports.length; i++) {
-            addDependency(state, imports[i].getId(), set);
-        }
-        return set;
-    }
-    
-    private void addDependency(State state, String bundleID, Set set) {
-        if (bundleID == null || !set.add(bundleID))
-            return;
-            
-        BundleDescription desc = state.getBundle(bundleID, null);
-        if (desc == null)
-            return;
-        
-        BundleSpecification[] specs = desc.getRequiredBundles();
-        for (int j = 0; j < specs.length; j++) {
-            if (specs[j].isResolved() && specs[j].isExported()) {
-                addDependency(state, specs[j].getName(), set);
-            }
-        }        
-    }
-    
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JarSelectionValidator.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JarSelectionValidator.java
deleted file mode 100644
index a997f18..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JarSelectionValidator.java
+++ /dev/null

@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.util.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.ui.dialogs.*;
-	/**
-	 * Implementation of a <code>ISelectionValidator</code> to validate the
-	 * type of an element.
-	 * Empty selections are not accepted.
-	 */
-public class JarSelectionValidator implements ISelectionStatusValidator {
-
-		private Class[] fAcceptedTypes;
-		private boolean fAllowMultipleSelection;
-
-	
-		/**
-		 * @param acceptedTypes The types accepted by the validator
-		 * @param allowMultipleSelection If set to <code>true</code>, the validator
-		 * allows multiple selection.
-		 */
-		public JarSelectionValidator(Class[] acceptedTypes, boolean allowMultipleSelection) {
-			Assert.isNotNull(acceptedTypes);
-			fAcceptedTypes= acceptedTypes;
-			fAllowMultipleSelection= allowMultipleSelection;
-		}
-	
-
-		/*
-		 * @see org.eclipse.ui.dialogs.ISelectionValidator#isValid(java.lang.Object)
-		 */
-		public IStatus validate(Object[] elements) {
-			if (isValidSelection(elements)) {
-				return new Status(
-					IStatus.OK,
-					PDEPlugin.getPluginId(),
-					IStatus.OK,
-					"", //$NON-NLS-1$
-					null);
-			}
-			return new Status(
-				IStatus.ERROR,
-				PDEPlugin.getPluginId(),
-				IStatus.ERROR,
-				"", //$NON-NLS-1$
-				null);
-		}	
-
-		private boolean isValidSelection(Object[] selection) {
-			if (selection.length == 0) {
-				return false;
-			}
-		
-			if (!fAllowMultipleSelection && selection.length != 1) {
-				return false;
-			}
-		
-			for (int i= 0; i < selection.length; i++) {
-				Object o= selection[i];	
-				if (!isValid(o)) {
-					return false;
-				}
-			}
-			return true;
-		}
-		
-		public boolean isValid(Object element) {
-			for (int i= 0; i < fAcceptedTypes.length; i++) {
-				if (fAcceptedTypes[i].isInstance(element)) {
-					return true;
-				}
-			}
-			return false;		
-		}
-	}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeValue.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeValue.java
deleted file mode 100644
index a7c8609..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeValue.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.ischema.*;
-
-public class JavaAttributeValue extends ResourceAttributeValue {
-	private ISchemaAttribute attInfo;
-	private IPluginModelBase model;
-
-public JavaAttributeValue(IProject project, IPluginModelBase model, ISchemaAttribute attInfo, String className) {
-	super(project, className);
-	this.attInfo = attInfo;
-	this.model = model;
-}
-public ISchemaAttribute getAttributeInfo() {
-	return attInfo;
-}
-public IPluginModelBase getModel() {
-	return model;
-}
-public String getClassName() {
-	return getStringValue();
-}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeWizard.java
deleted file mode 100644
index 707ab99..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeWizard.java
+++ /dev/null

@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-import java.lang.reflect.*;
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.jobs.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.ui.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.operation.*;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.ischema.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.actions.*;
-import org.eclipse.ui.ide.*;
-import org.eclipse.ui.wizards.newresource.*;
-public class JavaAttributeWizard extends Wizard {
-	private String className, classArgs;
-	private IProject project;
-	private ISchemaAttribute attInfo;
-	private IPluginModelBase model;
-	private JavaAttributeWizardPage mainPage;
-	private static String STORE_SECTION = "JavaAttributeWizard"; //$NON-NLS-1$
-	public JavaAttributeWizard(JavaAttributeValue value) {
-		this(value.getProject(), value.getModel(), value.getAttributeInfo(),
-				value.getClassName());
-	}
-	public JavaAttributeWizard(IProject project, IPluginModelBase model,
-			ISchemaAttribute attInfo, String className) {
-		this.className = className;
-		this.model = model;
-		this.project = project;
-		this.attInfo = attInfo;
-		setDefaultPageImageDescriptor(PDEPluginImages.DESC_NEWPPRJ_WIZ);
-		IDialogSettings masterSettings = PDEPlugin.getDefault()
-				.getDialogSettings();
-		setDialogSettings(getSettingsSection(masterSettings));
-		setWindowTitle(PDEUIMessages.JavaAttributeWizard_wtitle); 
-		setNeedsProgressMonitor(true);
-	}
-	private IDialogSettings getSettingsSection(IDialogSettings master) {
-		IDialogSettings setting = master.getSection(STORE_SECTION);
-		if (setting == null) {
-			setting = master.addNewSection(STORE_SECTION);
-		}
-		return setting;
-	}
-	public void addPages() {
-		mainPage = new JavaAttributeWizardPage(project, model, attInfo,
-				className);
-		addPage(mainPage);
-		mainPage.init();
-	}
-	public boolean performFinish() {
-		if (mainPage.getPackageText() != null
-				&& mainPage.getPackageText().length() > 0)
-			className = mainPage.getPackageText() + "." //$NON-NLS-1$
-					+ mainPage.getTypeName();
-		else
-			className = mainPage.getTypeName();
-		classArgs = mainPage.getClassArgs();
-		IRunnableWithProgress op = new WorkspaceModifyOperation(){
-			protected void execute(IProgressMonitor monitor)
-			throws CoreException, InvocationTargetException,
-			InterruptedException {
-				mainPage.createType(monitor);
-				IResource resource = mainPage.getModifiedResource();
-				if (resource != null) {
-					selectAndReveal(resource);
-					if (project.hasNature(JavaCore.NATURE_ID)) {
-						IJavaProject jProject = JavaCore.create(project);
-						IJavaElement jElement = jProject.findElement(resource
-								.getProjectRelativePath().removeFirstSegments(1));
-						if (jElement != null)
-							JavaUI.openInEditor(jElement);
-					} else if (resource instanceof IFile) {
-						IWorkbenchPage page = PDEPlugin.getActivePage();
-						IDE.openEditor(page, (IFile) resource, true);
-					}
-				}
-			}
-			
-		};
-		try{
-		getContainer().run(false, true, op);
-		} catch (InvocationTargetException e){
-			PDEPlugin.logException(e);
-		} catch (InterruptedException e){
-			PDEPlugin.logException(e);
-		}
-		return true;
-	}
-	protected void selectAndReveal(IResource newResource) {
-		BasicNewResourceWizard.selectAndReveal(newResource, PDEPlugin
-				.getActiveWorkbenchWindow());
-	}
-	protected ISchedulingRule getSchedulingRule() {
-		return mainPage.getModifiedResource();
-	}
-	public String getClassName() {
-		return className;
-	}
-	public String getClassNameWithArgs() {
-		if (classArgs != null && classArgs.length() > 0)
-			return className + ":" + classArgs; //$NON-NLS-1$
-		return getClassName();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeWizardPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeWizardPage.java
deleted file mode 100644
index 3eddbd0..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/JavaAttributeWizardPage.java
+++ /dev/null

@@ -1,243 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-import java.util.*;
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.ui.wizards.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.ICoreConstants;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.ischema.*;
-import org.eclipse.pde.internal.ui.*;
-
-public class JavaAttributeWizardPage extends NewClassWizardPage {
-	private String className;
-	private IProject project;
-	private ISchemaAttribute attInfo;
-	private IPluginModelBase model;
-	private InitialClassProperties initialValues;
-	private IJavaProject javaProject;
-	private IStatus fClassNameStatus, fPackageNameStatus;
-	
-	class InitialClassProperties {
-		// populate new wizard page
-		IType superClassType;
-		String superClassName;
-		IType interfaceType;
-		String interfaceName;
-		String className;
-		String classArgs;
-		String packageName;
-		IPackageFragmentRoot packageFragmentRoot;
-		IPackageFragment packageFragment;
-		public InitialClassProperties() {
-			this.superClassType = null;
-			this.superClassName = ""; //$NON-NLS-1$
-			this.interfaceName = null;
-			this.interfaceType = null;
-			this.className = null;
-			this.classArgs = null;
-			this.packageName = null;
-			this.packageFragment = null;
-			this.packageFragmentRoot = null;
-		}
-	}
-	public JavaAttributeWizardPage(IProject project, IPluginModelBase model,
-			ISchemaAttribute attInfo, String className) {
-		super();
-		this.className = className;
-		this.model = model;
-		this.project = project;
-		this.attInfo = attInfo;
-		try {
-			if (project.hasNature(JavaCore.NATURE_ID))
-				this.javaProject = JavaCore.create(project);
-			else
-				this.javaProject = null;
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-		initialValues = new InitialClassProperties();
-		initialValues.className = className;
-	}
-
-	public Object getValue() {
-		return new JavaAttributeValue(project, model, attInfo, className);
-	}
-	public void init() {
-		initializeExpectedValues();
-		initializeWizardPage();
-	}
-	protected void initializeWizardPage() {
-		setPackageFragmentRoot(initialValues.packageFragmentRoot, true);
-		setPackageFragment(initialValues.packageFragment, true);
-		setEnclosingType(null, true);
-		setEnclosingTypeSelection(false, true);
-		setTypeName(initialValues.className, true);
-		setSuperClass(initialValues.superClassName, true);
-		if (initialValues.interfaceName != null) {
-			ArrayList interfaces = new ArrayList();
-			interfaces.add(initialValues.interfaceName);
-			setSuperInterfaces(interfaces, true);
-		}
-		boolean hasSuperClass = initialValues.superClassName != null
-				&& initialValues.superClassName.length() > 0;
-		boolean hasInterface = initialValues.interfaceName != null
-				&& initialValues.interfaceName.length() > 0;
-		setMethodStubSelection(false, hasSuperClass, hasInterface
-				|| hasSuperClass, true);
-	}
-	private IType findTypeForName(String typeName) throws JavaModelException {
-		if (typeName == null || typeName.length() == 0)
-			return null;
-		IType type = null;
-		String fileName = typeName.replace('.', '/') + ".java"; //$NON-NLS-1$
-		IJavaElement element = javaProject.findElement(new Path(fileName));
-		if (element == null)
-			return null;
-		if (element instanceof IClassFile) {
-			type = ((IClassFile) element).getType();
-		} else if (element instanceof ICompilationUnit) {
-			IType[] types = ((ICompilationUnit) element).getTypes();
-			type = types[0];
-		}
-		return type;
-	}
-	private void initializeExpectedValues() {
-		
-		
-		//			source folder name, package name, class name
-		int loc = className.indexOf(":"); //$NON-NLS-1$
-		if (loc != -1) {
-			if (loc < className.length()) {
-				initialValues.classArgs = className.substring(loc + 1,
-						className.length());
-				className = className.substring(0, loc);
-			}
-			if (loc > 0)
-				initialValues.className = className.substring(0, loc);
-			else if (loc == 0)
-				initialValues.className = ""; //$NON-NLS-1$
-		}
-		fClassNameStatus = JavaConventions
-		.validateJavaTypeName(initialValues.className);
-		
-		loc = className.lastIndexOf('.');
-		if (loc != -1) {
-			initialValues.packageName = className.substring(0, loc);
-			initialValues.className = className.substring(loc + 1);
-			fPackageNameStatus = JavaConventions.validatePackageName(initialValues.packageName);
-			fClassNameStatus = JavaConventions.validateJavaTypeName(initialValues.className);
-		}
-		if (javaProject == null)
-			return;
-		try {
-			if (initialValues.packageFragmentRoot == null) {
-				IPackageFragmentRoot srcEntryDft = null;
-				IPackageFragmentRoot[] roots = javaProject
-				.getPackageFragmentRoots();
-				for (int i = 0; i < roots.length; i++) {
-					if (roots[i].getKind() == IPackageFragmentRoot.K_SOURCE) {
-						srcEntryDft = roots[i];
-						break;
-					}
-				}
-				if (srcEntryDft != null)
-					initialValues.packageFragmentRoot = srcEntryDft;
-				else {
-					initialValues.packageFragmentRoot = javaProject.getPackageFragmentRoot(javaProject.getResource());
-				}
-				if (initialValues.packageFragment == null
-						&& initialValues.packageFragmentRoot != null
-						&& initialValues.packageName != null
-						&& initialValues.packageName.length() > 0) {
-					IFolder packageFolder = project
-					.getFolder(initialValues.packageName);
-					initialValues.packageFragment = initialValues.packageFragmentRoot
-					.getPackageFragment(packageFolder
-							.getProjectRelativePath().toOSString());
-				}
-			}
-			//			superclass and interface
-			if (attInfo == null) {
-				IEclipsePreferences prefs = new ProjectScope(project).getNode(PDECore.PLUGIN_ID);
-				if (prefs != null && !prefs.getBoolean(ICoreConstants.EXTENSIONS_PROPERTY, true)) {
-					initialValues.interfaceName = "org.osgi.framework.BundleActivator"; //$NON-NLS-1$
-					initialValues.interfaceType = findTypeForName(initialValues.interfaceName);
-					return;
-				}
-				initialValues.superClassName = "org.eclipse.core.runtime.Plugin"; //$NON-NLS-1$
-				IPluginImport[] imports = model.getPluginBase().getImports();
-				for (int i = 0; i < imports.length; i++) {
-					if (imports[i].getId().equals("org.eclipse.ui")) { //$NON-NLS-1$
-						initialValues.superClassName = "org.eclipse.ui.plugin.AbstractUIPlugin"; //$NON-NLS-1$
-						break;
-					}
-				}
-				initialValues.superClassType = findTypeForName(initialValues.superClassName);
-				return;
-			}
-			String schemaBasedOn = attInfo.getBasedOn();
-			if (schemaBasedOn == null || schemaBasedOn.length() == 0) {
-				initialValues.superClassName = "java.lang.Object"; //$NON-NLS-1$
-				initialValues.superClassType = findTypeForName(initialValues.superClassName);
-				return;
-			}
-			int del = schemaBasedOn.indexOf(':');
-			if (del != -1) {
-				initialValues.superClassName = schemaBasedOn.substring(0, del);
-				initialValues.superClassType = findTypeForName(initialValues.superClassName);
-				initialValues.interfaceName = schemaBasedOn.substring(del + 1);
-				initialValues.interfaceType = findTypeForName(initialValues.interfaceName);
-			} else {
-				int schemaLoc = schemaBasedOn.lastIndexOf("."); //$NON-NLS-1$
-				if (schemaLoc != -1 && schemaLoc < schemaBasedOn.length()) {
-					IType type = findTypeForName(schemaBasedOn);
-					if (type!=null && type.isInterface()){
-						initialValues.interfaceName = schemaBasedOn;
-						initialValues.interfaceType = type;
-					} else if (type!=null && type.isClass()) {
-						initialValues.superClassName = schemaBasedOn;
-						initialValues.superClassType = type;
-					}
-				}
-			}
-
-		} catch (JavaModelException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jdt.ui.wizards.NewClassWizardPage#setVisible(boolean)
-	 */
-	public void setVisible(boolean visible) {
-		super.setVisible(visible);
-		// policy: wizards are not allowed to come up with an error message;
-		// in this wizard, some fields may need initial validation and thus,
-		// potentially start with an error message.
-		if (fClassNameStatus !=null && !fClassNameStatus.isOK())
-		updateStatus(fClassNameStatus);
-		if (fPackageNameStatus != null && !fPackageNameStatus.isOK())
-		updateStatus(fPackageNameStatus);
-	}
-	
-	public String getClassArgs(){
-		if (initialValues.classArgs == null)
-			return ""; //$NON-NLS-1$
-		return initialValues.classArgs;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/LibrarySection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/LibrarySection.java
deleted file mode 100644
index 28b41d9..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/LibrarySection.java
+++ /dev/null

@@ -1,422 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-
-import java.util.*;
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.editor.build.*;
-import org.eclipse.pde.internal.ui.editor.context.InputContextManager;
-import org.eclipse.pde.internal.ui.elements.*;
-import org.eclipse.pde.internal.ui.parts.*;
-import org.eclipse.pde.internal.ui.util.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.actions.*;
-import org.eclipse.ui.dialogs.*;
-import org.eclipse.ui.forms.widgets.*;
-import org.eclipse.ui.model.*;
-import org.eclipse.ui.views.navigator.*;
-
-public class LibrarySection extends TableSection implements IModelChangedListener {
-
-    private static final int NEW_INDEX = 0;
-    private static final int ADD_INDEX = 1;
-    private static final int REMOVE_INDEX = 2;
-    private static final int UP_INDEX = 3;
-    private static final int DOWN_INDEX = 4;
-    
-    private Action fRenameAction;
-    private Action fRemoveAction;
-    private Action fNewAction;
-	    
-    private TableViewer fLibraryTable;
-    
-    class LibraryFilter extends JARFileFilter {
-		public LibraryFilter(HashSet set) {
-			super(set);
-		}
-
-		public boolean select(Viewer viewer, Object parent, Object element) {
-			if (element instanceof IFolder)
-				return isPathValid(((IFolder)element).getProjectRelativePath());
-			if (element instanceof IFile)
-				return isFileValid(((IFile)element).getProjectRelativePath());
-			return false;
-		}
-	}
-	
-	class LibrarySelectionValidator extends JarSelectionValidator {
-		
-		public LibrarySelectionValidator(Class[] acceptedTypes, boolean allowMultipleSelection) {
-			super(acceptedTypes, allowMultipleSelection);
-		}
-
-		public boolean isValid(Object element) {
-			return (element instanceof IFolder) ? true : super.isValid(element);
-		}
-	}
-
-	class TableContentProvider extends DefaultContentProvider
-		implements IStructuredContentProvider {
-		public Object[] getElements(Object parent) {
-			IPluginModelBase model = (IPluginModelBase)getPage().getModel();
-			return model.getPluginBase().getLibraries();
-		}
-	}
-
-	public LibrarySection(PDEFormPage page, Composite parent) {
-		super(
-			page,
-			parent,
-			Section.DESCRIPTION,
-			new String[] {
-				PDEUIMessages.NewManifestEditor_LibrarySection_new,
-				PDEUIMessages.NewManifestEditor_LibrarySection_add,
-                PDEUIMessages.NewManifestEditor_LibrarySection_remove,
-				PDEUIMessages.ManifestEditor_LibrarySection_up,
-				PDEUIMessages.ManifestEditor_LibrarySection_down});
-	}
-    
-    private String getSectionDescription() {
-        IPluginModelBase model = (IPluginModelBase)getPage().getPDEEditor().getAggregateModel();
-        if (isBundle()) {
-           return (model.isFragmentModel())
-               ? PDEUIMessages.ClasspathSection_fragment
-               : PDEUIMessages.ClasspathSection_plugin;
-        }      
-        return (model.isFragmentModel())
-                    ? PDEUIMessages.ManifestEditor_LibrarySection_fdesc
-                    : PDEUIMessages.ManifestEditor_LibrarySection_desc;       
-    }
-    
-    protected boolean isBundle() {
-        return getBundleContext() != null;
-    }
-    
-    private BundleInputContext getBundleContext() {
-        InputContextManager manager = getPage().getPDEEditor().getContextManager();
-        return (BundleInputContext) manager.findContext(BundleInputContext.CONTEXT_ID);
-    }
-    
-	public void createClient(Section section, FormToolkit toolkit) {
-        section.setText(PDEUIMessages.ManifestEditor_LibrarySection_title);
-        section.setDescription(getSectionDescription());
-        
-		Composite container = createClientContainer(section, 2, toolkit);
-		EditableTablePart tablePart = getTablePart();
-		tablePart.setEditable(isEditable());
-
-		createViewerPartControl(container, SWT.FULL_SELECTION, 2, toolkit);
-		fLibraryTable = tablePart.getTableViewer();
-		fLibraryTable.setContentProvider(new TableContentProvider());
-		fLibraryTable.setLabelProvider(PDEPlugin.getDefault().getLabelProvider());
-		toolkit.paintBordersFor(container);
-        
-        makeActions();
-        updateButtons();
-        section.setLayoutData(new GridData(GridData.FILL_BOTH));
-		section.setClient(container);
-
-        IPluginModelBase model = (IPluginModelBase) getPage().getModel();
-        fLibraryTable.setInput(model.getPluginBase());
-        model.addModelChangedListener(this);
-	}
-
-	private void updateButtons() {
-        Table table = fLibraryTable.getTable();
-        boolean hasSelection = table.getSelection().length > 0;
-        int count = table.getItemCount();
-        boolean canMoveUp = count > 1 && table.getSelectionIndex() > 0;
-        boolean canMoveDown = count > 1 && hasSelection && table.getSelectionIndex() < count - 1;
-        
-        TablePart tablePart = getTablePart();
-        tablePart.setButtonEnabled(ADD_INDEX, isEditable());
-        tablePart.setButtonEnabled(NEW_INDEX, isEditable());
-        tablePart.setButtonEnabled(REMOVE_INDEX, isEditable() && hasSelection);
-        tablePart.setButtonEnabled(UP_INDEX, isEditable() && canMoveUp);
-        tablePart.setButtonEnabled(DOWN_INDEX, isEditable() && canMoveDown);
-    }
-
-    private void makeActions() {
-        fNewAction = new Action(PDEUIMessages.ManifestEditor_LibrarySection_newLibrary) {
-            public void run() {
-                handleNew();
-            }
-        };
-        fNewAction.setEnabled(isEditable());
-        
-        fRenameAction = new Action(PDEUIMessages.EditableTablePart_renameAction) {
-            public void run() {
-                getRenameAction().run();
-            }
-        };
-        fRenameAction.setEnabled(isEditable());
-        
-        fRemoveAction = new Action(PDEUIMessages.NewManifestEditor_LibrarySection_remove) {
-            public void run() {
-                handleRemove();
-            }
-        };
-        fRemoveAction.setEnabled(isEditable());
-    }
-
-    protected void selectionChanged(IStructuredSelection selection) {
-		getPage().getPDEEditor().setSelection(selection);
-		if (getPage().getModel().isEditable())
-			updateButtons();
-	}
-
-	protected void buttonSelected(int index) {
-		switch (index) {
-			case NEW_INDEX :
-				handleNew();
-				break;
-			case ADD_INDEX:
-				handleAdd();
-				break;
-            case REMOVE_INDEX:
-                handleRemove();
-                break;
-			case UP_INDEX :
-				handleUp();
-				break;
-			case DOWN_INDEX :
-				handleDown();
-				break;
-		}
-	}
-
-	public void dispose() {
-		IPluginModelBase model = (IPluginModelBase) getPage().getModel();
-		if (model != null)
-			model.removeModelChangedListener(this);
-		super.dispose();
-	}
-
-	public boolean doGlobalAction(String actionId) {
-		if (actionId.equals(ActionFactory.DELETE.getId())) {
-			handleRemove();
-			return true;
-		}
-		if (actionId.equals(ActionFactory.CUT.getId())) {
-			// delete here and let the editor transfer
-			// the selection to the clipboard
-			handleRemove();
-			return false;
-		}
-		if (actionId.equals(ActionFactory.PASTE.getId())) {
-			doPaste();
-			return true;
-		}
-		return false;
-	}
-    
-	public boolean setFormInput(Object object) {
-		if (object instanceof IPluginLibrary) {
-			fLibraryTable.setSelection(new StructuredSelection(object), true);
-			return true;
-		}
-		return false;
-	}
-
-	protected void fillContextMenu(IMenuManager manager) {
-		manager.add(fNewAction);
-		if (!fLibraryTable.getSelection().isEmpty()) {
-			manager.add(new Separator());
-			manager.add(fRenameAction);			
-			manager.add(fRemoveAction);
-		}
-		getPage().getPDEEditor().getContributor().contextMenuAboutToShow(manager);
-	}
-    
-	private void handleRemove() {
-		Object object = ((IStructuredSelection) fLibraryTable.getSelection()).getFirstElement();
-		if (object != null && object instanceof IPluginLibrary) {
-			IPluginLibrary ep = (IPluginLibrary) object;
-			IPluginBase plugin = ep.getPluginBase();
-			try {
-				plugin.remove(ep);
-			} catch (CoreException e) {
-				PDEPlugin.logException(e);
-			}
-		}
-	}
-	private void handleDown() {
-		Table table = getTablePart().getTableViewer().getTable();
-		int index = table.getSelectionIndex();
-		if (index != table.getItemCount() - 1)
-            swap(index, index + 1);		
-	}
-	
-	private void handleUp() {
-		int index = getTablePart().getTableViewer().getTable().getSelectionIndex();
-		if (index >= 1)
-            swap(index, index - 1);
-	}
-	
-	public void swap(int index1, int index2) {
-		Table table = getTablePart().getTableViewer().getTable();
-		IPluginLibrary l1 = (IPluginLibrary)table.getItem(index1).getData();
-		IPluginLibrary l2 = (IPluginLibrary)table.getItem(index2).getData();
-
-		try {
-			IPluginModelBase model = (IPluginModelBase) getPage().getModel();
-			IPluginBase pluginBase = model.getPluginBase();
-			pluginBase.swap(l1, l2);
-			refresh();
-			updateButtons();
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}		
-	}
-	
-	private void handleNew(){
-		IPluginModelBase model = (IPluginModelBase) getPage().getModel();
-		NewRuntimeLibraryDialog dialog = new NewRuntimeLibraryDialog(getPage().getSite().getShell(), 
-				model.getPluginBase().getLibraries());
-		dialog.create();
-		dialog.getShell().setText(PDEUIMessages.ManifestEditor_LibrarySection_newLibraryEntry);
-		SWTUtil.setDialogSize(dialog, 250, 175);
-
-		if (dialog.open() == Dialog.OK){
-			String libName = dialog.getLibraryName();
-			if (libName==null || libName.length()==0)
-				return;
-			try {
-				IPluginLibrary library = model.getPluginFactory().createLibrary();
-				library.setName(libName);
-				library.setExported(true);
-				model.getPluginBase().add(library);
-			} catch (CoreException e) {
-				PDEPlugin.logException(e);
-			}
-		}
-	}
-	private void handleAdd() {
-		ElementTreeSelectionDialog dialog =
-			new ElementTreeSelectionDialog(
-					getPage().getSite().getShell(),
-					new WorkbenchLabelProvider(),
-				new WorkbenchContentProvider());
-				
-		Class[] acceptedClasses = new Class[] { IFile.class };
-		dialog.setValidator(new LibrarySelectionValidator(acceptedClasses, true));
-		dialog.setTitle(PDEUIMessages.BuildEditor_ClasspathSection_jarsTitle); 
-		dialog.setMessage(PDEUIMessages.ClasspathSection_jarsMessage); 
-		IPluginLibrary[] libraries = ((IPluginModelBase)getPage().getModel()).getPluginBase().getLibraries();
-		HashSet set = new HashSet();
-		for (int i = 0; i < libraries.length; i++) {
-			set.add(new Path(ClasspathUtilCore.expandLibraryName(libraries[i].getName())));
-		}
-		dialog.addFilter(new LibraryFilter(set));
-		dialog.setInput(((IModel)getPage().getModel()).getUnderlyingResource().getProject());
-		dialog.setSorter(new ResourceSorter(ResourceSorter.NAME));
-
-		if (dialog.open() == ElementTreeSelectionDialog.OK) {
-			Object[] elements = dialog.getResult();
-			IPluginModelBase model = (IPluginModelBase) getPage().getModel();
-			for (int i = 0; i < elements.length; i++) {
-				IResource elem = (IResource) elements[i];
-				IPath path = elem.getProjectRelativePath();
-				if (elem instanceof IFolder)
-					path = path.addTrailingSeparator();
-				IPluginLibrary library = model.getPluginFactory().createLibrary();
-				try {
-					library.setName(path.toString());
-					library.setExported(true);
-					model.getPluginBase().add(library);
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}							
-			}
-		}	
-	}
-
-	public void refresh() {
-		if (fLibraryTable.getControl().isDisposed())
-			return;
-		fLibraryTable.setSelection(null);
-		fLibraryTable.refresh();
-		super.refresh();
-	}
-	public void modelChanged(IModelChangedEvent event) {
-		if (event.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			markStale();
-			return;
-		}
-		Object changeObject = event.getChangedObjects()[0];
-		if (changeObject instanceof IPluginLibrary) {
-			if (event.getChangeType() == IModelChangedEvent.INSERT) {
-				fLibraryTable.add(changeObject);
-                fLibraryTable.setSelection(new StructuredSelection(changeObject));
-                fLibraryTable.getTable().setFocus();
-			} else if (event.getChangeType() == IModelChangedEvent.REMOVE) {
-                Table table = fLibraryTable.getTable();
-                int index = table.getSelectionIndex();
-                fLibraryTable.remove(changeObject);
-                table.setSelection(index < table.getItemCount() ? index : table.getItemCount() -1);
-			} else {
-                fLibraryTable.update(changeObject, null);
-			}
-		} else if (changeObject.equals(fLibraryTable.getInput())) {
-			markStale();
-		} else if (changeObject instanceof IPluginElement && ((IPluginElement)changeObject).getParent() instanceof IPluginLibrary) {
-			fLibraryTable.update(((IPluginElement)changeObject).getParent(), null);
-		}
-	}
-    
-	public void setFocus() {
-		fLibraryTable.getTable().setFocus();
-	}
-    
-	protected void doPaste(Object target, Object[] objects) {
-		/*IPluginModelBase model = (IPluginModelBase) getPage().getModel();
-		IPluginBase plugin = model.getPluginBase();
-		try {
-			for (int i = 0; i < objects.length; i++) {
-				Object obj = objects[i];
-				if (obj instanceof IPluginLibrary) {
-					PluginLibrary library = (PluginLibrary) obj;
-					library.setModel(model);
-					library.setParent(plugin);
-					plugin.add(library);
-				}
-			}
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}*/
-	}
-    
-	protected boolean canPaste(Object target, Object[] objects) {
-		return (objects[0] instanceof IPluginLibrary);
-	}
-    
-    protected void entryModified(Object entry, String value) {
-        try {
-            IPluginLibrary library = (IPluginLibrary)entry;
-            library.setName(value);
-        } catch (CoreException e) {
-            PDEPlugin.logException(e);
-        }
-    }
-	
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/LibraryVisibilitySection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/LibraryVisibilitySection.java
deleted file mode 100644
index a00245b..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/LibraryVisibilitySection.java
+++ /dev/null

@@ -1,273 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-import java.util.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.ui.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.elements.*;
-import org.eclipse.pde.internal.ui.parts.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.actions.*;
-import org.eclipse.ui.forms.*;
-import org.eclipse.ui.forms.widgets.*;
-
-public class LibraryVisibilitySection extends TableSection
-		implements IPartSelectionListener {
-    
-    private static int ADD_INDEX = 0;
-    private static int REMOVE_INDEX = 1;
-    
-	private Button fFullExportButton;
-	private Button fSelectedExportButton;
-	private IPluginLibrary fCurrentLibrary;
-	private Composite fPackageExportContainer;
-	private TableViewer fPackageExportViewer;
-    private Action fAddAction;
-    private Action fRemoveAction;
-	
-	class TableContentProvider extends DefaultContentProvider
-			implements IStructuredContentProvider {
-		public Object[] getElements(Object parent) {
-            if (parent instanceof IPluginLibrary) {
-				String[] filters = ((IPluginLibrary) parent).getContentFilters();
-				return filters == null ? new Object[0] : filters;
-			}
-			return new Object[0];
-		}
-	}
-	class TableLabelProvider extends LabelProvider
-			implements ITableLabelProvider {
-        
-		public String getColumnText(Object obj, int index) {
-			return obj.toString();
-		}
-		public Image getColumnImage(Object obj, int index) {
-			return JavaUI.getSharedImages().getImage(
-					ISharedImages.IMG_OBJS_PACKAGE);
-		}
-	}
-    
-	public LibraryVisibilitySection(PDEFormPage formPage, Composite parent) {
-		super(formPage, parent, Section.DESCRIPTION, new String[]{
-				PDEUIMessages.ManifestEditor_ExportSection_add,
-				PDEUIMessages.ManifestEditor_ExportSection_remove});
-		getSection().setText(PDEUIMessages.ManifestEditor_ExportSection_title);
-		getSection().setDescription(PDEUIMessages.ManifestEditor_ExportSection_desc);
-		handleDefaultButton = false;
-	}
-    
-	public void createClient(Section section, FormToolkit toolkit) {
-		Composite container = toolkit.createComposite(section);
-		container.setLayout(new GridLayout());
-        
-		String label = PDEUIMessages.ManifestEditor_ExportSection_fullExport;
-		fFullExportButton = toolkit.createButton(container, label, SWT.RADIO);
-		fFullExportButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fFullExportButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				try {
-					if (fCurrentLibrary != null)
-						fCurrentLibrary.setExported(fFullExportButton.getSelection());
-					getTablePart().setButtonEnabled(0, !fFullExportButton.getSelection());
-					getTablePart().setButtonEnabled(1, false);
-				} catch (CoreException e1) {
-				}
-			}
-		});
-        
-		label = PDEUIMessages.ManifestEditor_ExportSection_selectedExport;
-		fSelectedExportButton = toolkit.createButton(container, label, SWT.RADIO);
-		fSelectedExportButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-        createPackageViewer(container, toolkit);       
-		update(null);
-        makeActions();
-        
-        IPluginModelBase model = (IPluginModelBase) getPage().getModel();
-        model.addModelChangedListener(this);
-        
-        section.setLayoutData(new GridData(GridData.FILL_BOTH));
-		section.setClient(container);
-	}
-    
-	private void makeActions() {
-        fAddAction = new Action(PDEUIMessages.ManifestEditor_ExportSection_add) {
-            public void run() {
-                handleAdd();
-            }
-        };
-        fAddAction.setEnabled(isEditable());
-        
-        fRemoveAction = new Action(PDEUIMessages.ManifestEditor_ExportSection_remove) {
-            public void run() {
-                handleRemove();
-            }
-        }; 
-        fRemoveAction.setEnabled(isEditable());
-    }
-
-    private void createPackageViewer(Composite parent, FormToolkit toolkit) {
-        fPackageExportContainer = toolkit.createComposite(parent);
-        fPackageExportContainer.setLayoutData(new GridData(GridData.FILL_BOTH));
-        GridLayout layout = new GridLayout();
-        layout.marginWidth = 0;
-        layout.marginHeight = 0;
-        layout.numColumns = 2;
-        fPackageExportContainer.setLayout(layout);
-        fPackageExportContainer.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-        EditableTablePart tablePart = getTablePart();
-		tablePart.setEditable(getPage().getModel().isEditable());
-		createViewerPartControl(fPackageExportContainer, SWT.FULL_SELECTION, 2, toolkit);
-		fPackageExportViewer = tablePart.getTableViewer();
-		fPackageExportViewer.setContentProvider(new TableContentProvider());
-		fPackageExportViewer.setLabelProvider(new TableLabelProvider());
-		fPackageExportViewer.setSorter(new ViewerSorter());
-		toolkit.paintBordersFor(parent);
-	}
-    
-	protected void selectionChanged(IStructuredSelection selection) {
-		Object item = selection.getFirstElement();
-		getTablePart().setButtonEnabled(1, item != null);
-	}
-    
-	protected void buttonSelected(int index) {
-		if (index == ADD_INDEX)
-			handleAdd();
-		else if (index == REMOVE_INDEX)
-			handleRemove();
-	}
-    
-	public boolean doGlobalAction(String actionId) {
-		if (actionId.equals(ActionFactory.DELETE.getId())) {
-			handleRemove();
-			return true;
-		}
-		return false;
-	}
-    
-	public void dispose() {
-		IPluginModelBase model = (IPluginModelBase) getPage().getModel();
-		if (model!=null)
-			model.removeModelChangedListener(this);
-		super.dispose();
-	}
-    
-	protected void fillContextMenu(IMenuManager manager) {
-        if (fSelectedExportButton.isEnabled() && fSelectedExportButton.getSelection()) {
-            manager.add(fAddAction);
-            manager.add(new Separator());
-        }
-        if (!fPackageExportViewer.getSelection().isEmpty()) {
-            manager.add(fRemoveAction);
-        }
-		getPage().getPDEEditor().getContributor().contextMenuAboutToShow(manager);
-	}
-    
-	private void handleAdd() {
-		IPluginModelBase model = (IPluginModelBase) getPage().getModel();
-		IProject project = model.getUnderlyingResource().getProject();
-		try {
-			if (project.hasNature(JavaCore.NATURE_ID)) {
-				String[] names;
-                names = fCurrentLibrary.getContentFilters();
-				Vector existing = new Vector();
-				if (names != null) {
-					for (int i = 0; i < names.length; i++) {
-						existing.add(names[i]);
-					}
-				}
-				ILabelProvider labelProvider = new JavaElementLabelProvider();
-				PackageSelectionDialog dialog = new PackageSelectionDialog(
-						fPackageExportViewer.getTable().getShell(),
-						labelProvider, JavaCore.create(project), existing, true);
-				if (dialog.open() == PackageSelectionDialog.OK) {
-					Object[] elements = dialog.getResult();
-					for (int i = 0; i < elements.length; i++) {
-						IPackageFragment fragment = (IPackageFragment) elements[i];
-						fCurrentLibrary.addContentFilter(fragment.getElementName());
-					}
-				}
-				labelProvider.dispose();
-			}
-		} catch (CoreException e) {
-		}
-	}
-    
-	private void handleRemove() {
-		IStructuredSelection ssel = (IStructuredSelection) fPackageExportViewer.getSelection();
-		Object[] items = ssel.toArray();
-		try {
-			for (int i = 0; i < items.length; i++) {
-				fCurrentLibrary.removeContentFilter(items[i].toString());
-			}
-		} catch (CoreException e) {
-		}
-	}
-    
-	public void modelChanged(IModelChangedEvent e) {
-		if (e.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			if (fCurrentLibrary!=null)
-				update(null);
-			markStale();
-			return;
-		}
-		refresh();
-	}
-
-	public void refresh() {
-		update(fCurrentLibrary);		
-		super.refresh();
-	}
-
-	public void selectionChanged(IFormPart source, ISelection selection) {
-		if (selection == null || selection.isEmpty())
-			update(null);
-		IStructuredSelection ssel = (IStructuredSelection) selection;
-		if (ssel.getFirstElement() instanceof IPluginLibrary)
-			update((IPluginLibrary) ssel.getFirstElement());
-	}
-    
-	private void update(IPluginLibrary library) {
-		fCurrentLibrary = library;
-		if (library == null) {
-			fFullExportButton.setEnabled(false);
-			fFullExportButton.setSelection(false);
-			fSelectedExportButton.setEnabled(false);
-			fSelectedExportButton.setSelection(false);
-			fPackageExportViewer.setInput(new Object[0]);
-			getTablePart().setButtonEnabled(ADD_INDEX, false);
-			getTablePart().setButtonEnabled(REMOVE_INDEX, false);
-		} else {
-    		fFullExportButton.setEnabled(isEditable());
-    		fSelectedExportButton.setEnabled(isEditable());
-    		fFullExportButton.setSelection(library.isFullyExported());
-    		fSelectedExportButton.setSelection(!library.isFullyExported());
-    		fPackageExportViewer.setInput(library);
-    		getTablePart().setButtonEnabled(REMOVE_INDEX, false);
-    		getTablePart().setButtonEnabled(ADD_INDEX, isEditable() && fSelectedExportButton.getSelection());
-        }
-    }
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/LoopDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/LoopDialog.java
deleted file mode 100644
index 69e8811..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/LoopDialog.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.internal.builders.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.elements.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-public class LoopDialog extends Dialog {
-	private DependencyLoop[] fLoops;
-	private TreeViewer fLoopViewer;
-	private Image fLoopImage;
-	
-	class ContentProvider extends DefaultContentProvider implements ITreeContentProvider {
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
-		 */
-		public Object[] getChildren(Object parentElement) {
-			if (parentElement instanceof DependencyLoop)
-				return ((DependencyLoop)parentElement).getMembers();
-			return new Object[0];
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
-		 */
-		public Object getParent(Object element) {
-			return null;
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
-		 */
-		public boolean hasChildren(Object element) {
-			return element instanceof DependencyLoop;
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-		 */
-		public Object[] getElements(Object inputElement) {
-			return fLoops;
-		}
-		
-	}
-	
-	class LoopLabelProvider extends LabelProvider {
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object)
-		 */
-		public Image getImage(Object element) {
-			if (element instanceof DependencyLoop)
-				return fLoopImage;
-			return PDEPlugin.getDefault().getLabelProvider().getImage(element);
-		}
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)
-		 */
-		public String getText(Object element) {
-			return PDEPlugin.getDefault().getLabelProvider().getText(element);
-		}
-	}
-	
-	
-	public LoopDialog(
-		Shell parentShell, DependencyLoop[] loops) {
-		super(parentShell);
-		fLoops = loops;
-		PDELabelProvider provider = PDEPlugin.getDefault().getLabelProvider();
-		fLoopImage = provider.get(PDEPluginImages.DESC_LOOP_OBJ);		
-	}
-	
-	protected void createButtonsForButtonBar(Composite parent) {
-		createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-	}
-
-	protected Control createDialogArea(Composite parent) {
-		Composite container = (Composite) super.createDialogArea(parent);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginWidth = layout.marginHeight = 9;
-		container.setLayout(layout);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.widthHint = 300;
-		gd.heightHint = 300;
-		container.setLayoutData(gd);
-
-		fLoopViewer = new TreeViewer(container);
-		fLoopViewer.setContentProvider(new ContentProvider());
-		fLoopViewer.setLabelProvider(new LoopLabelProvider());
-		Tree tree = fLoopViewer.getTree();
-		gd = new GridData(GridData.FILL_BOTH);
-		tree.setLayoutData(gd);
-		fLoopViewer.setInput(PDEPlugin.getDefault());
-		fLoopViewer.expandAll();
-		getShell().setText(PDEUIMessages.LoopDialog_title); 
-		return container;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ManifestEditor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ManifestEditor.java
deleted file mode 100644
index 5f68ced..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ManifestEditor.java
+++ /dev/null

@@ -1,592 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-import java.io.File;
-import java.io.IOException;
-import java.util.Locale;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.resources.ProjectScope;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.pde.core.build.IBuild;
-import org.eclipse.pde.core.build.IBuildEntry;
-import org.eclipse.pde.core.build.IBuildModel;
-import org.eclipse.pde.core.plugin.IFragmentModel;
-import org.eclipse.pde.core.plugin.IPluginBase;
-import org.eclipse.pde.core.plugin.IPluginExtension;
-import org.eclipse.pde.core.plugin.IPluginExtensionPoint;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.core.plugin.IPluginObject;
-import org.eclipse.pde.core.plugin.ISharedPluginModel;
-import org.eclipse.pde.internal.core.ICoreConstants;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.build.IBuildObject;
-import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelProvider;
-import org.eclipse.pde.internal.core.plugin.WorkspaceFragmentModel;
-import org.eclipse.pde.internal.core.plugin.WorkspacePluginModel;
-import org.eclipse.pde.internal.core.plugin.WorkspacePluginModelBase;
-import org.eclipse.pde.internal.core.util.CoreUtility;
-import org.eclipse.pde.internal.ui.IPDEUIConstants;
-import org.eclipse.pde.internal.ui.IPreferenceConstants;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.editor.ISortableContentOutlinePage;
-import org.eclipse.pde.internal.ui.editor.JarEntryEditorInput;
-import org.eclipse.pde.internal.ui.editor.JarEntryFile;
-import org.eclipse.pde.internal.ui.editor.MultiSourceEditor;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.pde.internal.ui.editor.PDESourcePage;
-import org.eclipse.pde.internal.ui.editor.SystemFileEditorInput;
-import org.eclipse.pde.internal.ui.editor.build.BuildInputContext;
-import org.eclipse.pde.internal.ui.editor.build.BuildPage;
-import org.eclipse.pde.internal.ui.editor.build.BuildSourcePage;
-import org.eclipse.pde.internal.ui.editor.context.InputContext;
-import org.eclipse.pde.internal.ui.editor.context.InputContextManager;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IShowEditorInput;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-import org.osgi.service.prefs.BackingStoreException;
-
-public class ManifestEditor extends MultiSourceEditor implements IShowEditorInput {
-    
-    private static int BUILD_INDEX = 5;
-	private static boolean SHOW_SOURCE;
-    private boolean fEquinox = true;
-    private boolean fShowExtensions = true;
-    private IEclipsePreferences fPrefs;
-    
-	public static IEditorPart openPluginEditor(String id) {
-		return openPluginEditor(PDECore.getDefault().getModelManager().findModel(id));
-	}
-	
-	public static IEditorPart openPluginEditor(IPluginModelBase model) {
-		return openPluginEditor(model, false);
-	}
-	
-	public static IEditorPart openPluginEditor(IPluginModelBase model, boolean source) {
-		return open(model.getPluginBase(), source);
-	}
-	
-	public static IEditorPart open(Object object, boolean source) {
-		SHOW_SOURCE = source;
-		if (object instanceof IPluginObject) {
-			ISharedPluginModel model = ((IPluginObject)object).getModel();
-			if (model instanceof IBundlePluginModelProvider) 
-				model = ((IBundlePluginModelProvider)model).getBundlePluginModel();
-			if (model instanceof IPluginModelBase) {
-				String filename = ((IPluginModelBase)model).isFragmentModel() ? "fragment.xml" : "plugin.xml"; //$NON-NLS-1$ //$NON-NLS-2$
-				if (!(object instanceof IPluginExtension) && !(object instanceof IPluginExtensionPoint)) {
-					File file = new File(model.getInstallLocation());
-					if (file.isFile()) {
-						if (CoreUtility.jarContainsResource(file, "META-INF/MANIFEST.MF", false)) { //$NON-NLS-1$
-							filename = "META-INF/MANIFEST.MF"; //$NON-NLS-1$
-						} 
-					} else if (new File(file, "META-INF/MANIFEST.MF").exists()) { //$NON-NLS-1$
-						filename = "META-INF/MANIFEST.MF"; //$NON-NLS-1$
-					}
-				}
-				IResource resource = model.getUnderlyingResource();
-				if (resource == null) 
-					return openExternalPlugin(new File(model.getInstallLocation()), filename);
-				return openWorkspacePlugin(resource.getProject().getFile(filename));
-			}
-		}
-		return null;
-	}
-		
-	
-	private static IEditorPart openWorkspacePlugin(IFile pluginFile) {
-		return openEditor(new FileEditorInput(pluginFile));
-	}
-	
-	private static IEditorPart openExternalPlugin(File location, String filename) {
-		IEditorInput input = null;
-		if (location.isFile()) {
-			try {
-				ZipFile zipFile = new ZipFile(location);
-				if (zipFile.getEntry(filename) != null) 
-					input = new JarEntryEditorInput(new JarEntryFile(zipFile, filename));
-			} catch (IOException e) {
-			}			
-		} else {
-			File file = new File(location, filename);
-			if (file.exists())
-				input = new SystemFileEditorInput(file);
-		}
-		return openEditor(input);
-	}
-	
-	public static IEditorPart openEditor(IEditorInput input) {
-		if (input != null) {
-			try {
-				return PDEPlugin.getActivePage().openEditor(
-						input,
-						IPDEUIConstants.MANIFEST_EDITOR_ID);
-			} catch (PartInitException e) {
-				PDEPlugin.logException(e);
-			}
-		}
-		return null;		
-	}
-
-	protected void createResourceContexts(InputContextManager manager,
-			IFileEditorInput input) {
-		IFile file = input.getFile();
-		IProject project = file.getProject();
-		IFile manifestFile = null;
-		IFile buildFile = null;
-		IFile pluginFile = null;
-		boolean fragment = false;
-		String name = file.getName().toLowerCase(Locale.ENGLISH);
-		if (name.equals("manifest.mf")) { //$NON-NLS-1$
-			manifestFile = file;
-			buildFile = project.getFile("build.properties"); //$NON-NLS-1$
-			pluginFile = createPluginFile(project);
-		} else if (name.equals("build.properties")) { //$NON-NLS-1$
-			buildFile = file;
-			pluginFile = createPluginFile(project);
-			manifestFile = project.getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$
-		} else if (name.equals("plugin.xml") || name.equals("fragment.xml")) { //$NON-NLS-1$ //$NON-NLS-2$
-			pluginFile = file;
-			fragment = name.equals("fragment.xml"); //$NON-NLS-1$
-			buildFile = project.getFile("build.properties"); //$NON-NLS-1$
-			manifestFile = project.getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$
-		}
-		if (manifestFile.exists()) {
-			IEditorInput in = new FileEditorInput(manifestFile);
-			manager.putContext(in, new BundleInputContext(this, in,
-					file == manifestFile));
-		}
-		if (pluginFile.exists()) {
-			FileEditorInput in = new FileEditorInput(pluginFile);
-			manager.putContext(in, new PluginInputContext(this, in,
-					file == pluginFile, fragment));
-		}
-		if (buildFile.exists()) {
-			FileEditorInput in = new FileEditorInput(buildFile);
-			manager.putContext(in, new BuildInputContext(this, in,
-					file == buildFile));
-		}
-		manager.monitorFile(manifestFile);
-		manager.monitorFile(project.getFile("plugin.xml")); //$NON-NLS-1$
-		manager.monitorFile(project.getFile("fragment.xml")); //$NON-NLS-1$
-		manager.monitorFile(buildFile);
-		
-		fPrefs = new ProjectScope(project).getNode(PDECore.PLUGIN_ID);
-		if (fPrefs != null) {
-			fShowExtensions = fPrefs.getBoolean(ICoreConstants.EXTENSIONS_PROPERTY, true);
-			fEquinox = fPrefs.getBoolean(ICoreConstants.EQUINOX_PROPERTY, true);
-		}
-	}
-	
-	protected InputContextManager createInputContextManager() {
-		PluginInputContextManager manager =  new PluginInputContextManager(this);
-		manager.setUndoManager(new PluginUndoManager(this));
-		return manager;
-	}
-	
-	public void monitoredFileAdded(IFile file) {
-		String name = file.getName();
-		if (name.equalsIgnoreCase("MANIFEST.MF")) { //$NON-NLS-1$
-			if (!inputContextManager.hasContext(BundleInputContext.CONTEXT_ID)) {
-				IEditorInput in = new FileEditorInput(file);
-				inputContextManager.putContext(in, new BundleInputContext(this, in, false));
-			}
-		}
-		else if (name.equalsIgnoreCase("plugin.xml")) { //$NON-NLS-1$
-			if (!inputContextManager.hasContext(PluginInputContext.CONTEXT_ID)) {
-				IEditorInput in = new FileEditorInput(file);
-				inputContextManager.putContext(in, new PluginInputContext(this, in, false, false));
-			}
-		}
-		else if (name.equalsIgnoreCase("fragment.xml")) { //$NON-NLS-1$
-			if (!inputContextManager.hasContext(PluginInputContext.CONTEXT_ID)) {			
-				IEditorInput in = new FileEditorInput(file);
-				inputContextManager.putContext(in, new PluginInputContext(this, in, false, true));
-			}
-		}
-		else if (name.equalsIgnoreCase("build.properties")) { //$NON-NLS-1$
-			if (!inputContextManager.hasContext(BuildInputContext.CONTEXT_ID)) {			
-				IEditorInput in = new FileEditorInput(file);
-				inputContextManager.putContext(in, new BuildInputContext(this, in, false));
-			}
-		}
-	}
-	
-	public void ensurePluginContextPresence() {
-		if (inputContextManager.hasContext(PluginInputContext.CONTEXT_ID))
-			return;
-		IProject project = inputContextManager.getCommonProject();
-		String name = (inputContextManager.getAggregateModel() instanceof IFragmentModel)
-						? "fragment.xml" : "plugin.xml"; //$NON-NLS-1$ //$NON-NLS-2$
-		IFile file = project.getFile(name); 
-		WorkspacePluginModelBase model;
-		if (name.equals("fragment.xml"))  //$NON-NLS-1$
-			model = new WorkspaceFragmentModel(file, false);
-		else
-			model = new WorkspacePluginModel(file, false);
-		
-		IPluginBase pluginBase = model.getPluginBase(true);
-		try {
-			pluginBase.setSchemaVersion("3.0"); //$NON-NLS-1$
-		}
-		catch (CoreException e) {
-		}
-		model.save();
-		IEditorInput in = new FileEditorInput(file);
-		inputContextManager.putContext(in, new PluginInputContext(this, in, false, false));
-
-		updateBuildProperties(name);
-	}
-	
-    private void updateBuildProperties(String filename) {
-        try {
-         InputContext context = inputContextManager.findContext(BuildInputContext.CONTEXT_ID);
-         if (context != null) {
-                IBuildModel buildModel = (IBuildModel)context.getModel();
-                IBuild build = buildModel.getBuild();
-                IBuildEntry entry = build.getEntry("bin.includes"); //$NON-NLS-1$
-                if (entry == null) {
-                    entry = buildModel.getFactory().createEntry("bin.includes"); //$NON-NLS-1$
-                    build.add(entry);
-                } 
-                if (!entry.contains(filename))
-                    entry.addToken(filename); 
-            }
-         } catch (CoreException e) {
-         }
-     }
-
-	public boolean monitoredFileRemoved(IFile file) {
-		//TODO may need to check with the user if there
-		//are unsaved changes in the model for the
-		//file that just got removed under us.
-		return true;
-	}
-	public void contextAdded(InputContext context) {
-		addSourcePage(context.getId());
-		try {
-			if (context.getId().equals(BuildInputContext.CONTEXT_ID))
-				addPage(BUILD_INDEX, new BuildPage(this));
-            else {
-				updateFirstThreePages();
-            }
-		}
-		catch (PartInitException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-	public void contextRemoved(InputContext context) {		
-		close(true);
-	}
-	
-	private void updateFirstThreePages() {
-		try {
-			int index = getActivePage();
-			removePage(0);
-			removePage(0);
-			removePage(0);
-			addPage(0, new RuntimePage(this));
-			addPage(0, new DependenciesPage(this));
-			addPage(0, new OverviewPage(this));
-			setActivePage(index);
-		} catch (PartInitException e) {
-			PDEPlugin.logException(e);
-		}		
-	}
-
-	protected void createSystemFileContexts(InputContextManager manager,
-			SystemFileEditorInput input) {
-		File file = (File) input.getAdapter(File.class);
-		File manifestFile = null;
-		File buildFile = null;
-		File pluginFile = null;
-		String name = file.getName().toLowerCase(Locale.ENGLISH);
-		if (name.equals("manifest.mf")) { //$NON-NLS-1$
-			manifestFile = file;
-			File dir = file.getParentFile().getParentFile();
-			buildFile = new File(dir, "build.properties"); //$NON-NLS-1$
-			pluginFile = createPluginFile(dir);
-		} else if (name.equals("build.properties")) { //$NON-NLS-1$
-			buildFile = file;
-			File dir = file.getParentFile();
-			pluginFile = createPluginFile(dir);
-			manifestFile = new File(dir, "META-INF/MANIFEST.MF"); //$NON-NLS-1$
-		} else if (name.equals("plugin.xml") || name.equals("fragment.xml")) { //$NON-NLS-1$ //$NON-NLS-2$
-			pluginFile = file;
-			File dir = file.getParentFile();
-			buildFile = new File(dir, "build.properties"); //$NON-NLS-1$
-			manifestFile = new File(dir, "META-INF/MANIFEST.MF"); //$NON-NLS-1$
-		}
-		if (manifestFile.exists()) {
-			IEditorInput in = new SystemFileEditorInput(manifestFile);
-			manager.putContext(in, new BundleInputContext(this, in,
-					file == manifestFile));
-		}
-		if (pluginFile.exists()) {
-			SystemFileEditorInput in = new SystemFileEditorInput(pluginFile);
-			manager.putContext(in, new PluginInputContext(this, in,
-					file == pluginFile, name.equals("fragment.xml"))); //$NON-NLS-1$
-		}
-		if (buildFile.exists()) {
-			SystemFileEditorInput in = new SystemFileEditorInput(buildFile);
-			manager.putContext(in, new BuildInputContext(this, in,
-					file == buildFile));
-		}
-	}
-	private File createPluginFile(File dir) {
-		File pluginFile = new File(dir, "plugin.xml"); //$NON-NLS-1$
-		if (!pluginFile.exists())
-			pluginFile = new File(dir, "fragment.xml"); //$NON-NLS-1$
-		return pluginFile;
-	}
-	
-	private IFile createPluginFile(IProject project) {
-		IFile pluginFile = project.getFile("plugin.xml"); //$NON-NLS-1$
-		if (!pluginFile.exists())
-			pluginFile = project.getFile("fragment.xml"); //$NON-NLS-1$
-		return pluginFile;
-	}
-	
-	protected void createStorageContexts(InputContextManager manager,
-			IStorageEditorInput input) {
-		if (input instanceof JarEntryEditorInput) {
-			createJarEntryContexts(manager, (JarEntryEditorInput)input);
-			return;
-		}
-		
-		String name = input.getName().toLowerCase(Locale.ENGLISH);
-		if (name.startsWith("manifest.mf")) { //$NON-NLS-1$
-			manager
-					.putContext(input,
-							new BundleInputContext(this, input, true));
-		} else if (name.startsWith("build.properties")) { //$NON-NLS-1$
-			manager.putContext(input, new BuildInputContext(this, input, true));
-		} else if (name.startsWith("plugin.xml")) { //$NON-NLS-1$
-			manager.putContext(input, new PluginInputContext(this, input, true,
-					false));
-		} else if (name.startsWith("fragment.xml")) { //$NON-NLS-1$
-			manager.putContext(input, new PluginInputContext(this, input, true,
-					true));
-		}
-	}
-	
-	protected void createJarEntryContexts(InputContextManager manager,
-			JarEntryEditorInput input) {
-		IStorage storage = input.getStorage();
-		ZipFile zip = (ZipFile)storage.getAdapter(ZipFile.class);
-		try {
-			if (zip == null)
-				return;
-			
-			if (zip.getEntry("META-INF/MANIFEST.MF") != null) { //$NON-NLS-1$
-				input = new JarEntryEditorInput(new JarEntryFile(zip, "META-INF/MANIFEST.MF")); //$NON-NLS-1$
-				manager.putContext(input, new BundleInputContext(this, input, storage.getName().equals("MANIFEST.MF"))); //$NON-NLS-1$
-			}
-			
-			if (zip.getEntry("plugin.xml") != null) { //$NON-NLS-1$
-				input = new JarEntryEditorInput(new JarEntryFile(zip, "plugin.xml")); //$NON-NLS-1$
-				manager.putContext(input, new PluginInputContext(this, input, storage.getName().equals("plugin.xml"), false)); //$NON-NLS-1$
-			} else if (zip.getEntry("fragment.xml") != null) { //$NON-NLS-1$
-				input = new JarEntryEditorInput(new JarEntryFile(zip, "fragment.xml")); //$NON-NLS-1$
-				manager.putContext(input, new PluginInputContext(this, input, storage.getName().equals("fragment.xml"), true)); //$NON-NLS-1$
-			}
-			
-			if (zip.getEntry("build.properties") != null) { //$NON-NLS-1$
-				input = new JarEntryEditorInput(new JarEntryFile(zip, "build.properties")); //$NON-NLS-1$
-				manager.putContext(input, new BuildInputContext(this, input, storage.getName().equals("build.properties"))); //$NON-NLS-1$
-			}
-		} finally {
-			try {
-				if (zip != null)
-					zip.close();
-			} catch (IOException e) {
-			}
-		}
-	}
-	
-	public boolean canCopy(ISelection selection) {
-		return true;
-	}	
-
-	protected void addPages() {
-		try {
-			addPage(new OverviewPage(this));
-			addPage(new DependenciesPage(this));
-			addPage(new RuntimePage(this));
-			if (showExtensionTabs()) {
-				addExtensionTabs();
-			}
-			if (inputContextManager.hasContext(BuildInputContext.CONTEXT_ID))
-				addPage(new BuildPage(this));
-		} catch (PartInitException e) {
-			PDEPlugin.logException(e);
-		}
-		addSourcePage(BundleInputContext.CONTEXT_ID);
-		addSourcePage(PluginInputContext.CONTEXT_ID);
-		addSourcePage(BuildInputContext.CONTEXT_ID);
-	}
-
-
-	protected String computeInitialPageId() {
-		if (SHOW_SOURCE) {
-			SHOW_SOURCE = false;
-			InputContext primary = inputContextManager.getPrimaryContext();
-			if (primary != null)
-				return primary.getId();
-		}
-		
-		String firstPageId = super.computeInitialPageId();
-		if (firstPageId == null) {
-			InputContext primary = inputContextManager.getPrimaryContext();
-			if (primary == null)
-				return null;
-			if (BuildInputContext.CONTEXT_ID.equals(primary.getId()))
-				firstPageId = BuildPage.PAGE_ID;
-			else if (PluginInputContext.CONTEXT_ID.equals(primary.getId())) {
-				if (inputContextManager.hasContext(BundleInputContext.CONTEXT_ID))
-					firstPageId = ExtensionsPage.PAGE_ID;
-				else
-					firstPageId = OverviewPage.PAGE_ID;
-			}
-			if (firstPageId == null)
-				firstPageId = OverviewPage.PAGE_ID;
-		}
-		return firstPageId;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.MultiSourceEditor#createXMLSourcePage(org.eclipse.pde.internal.ui.neweditor.PDEFormEditor, java.lang.String, java.lang.String)
-	 */
-	protected PDESourcePage createSourcePage(PDEFormEditor editor, String title, String name, String contextId) {
-		if (contextId.equals(PluginInputContext.CONTEXT_ID))
-			return new ManifestSourcePage(editor, title, name);
-		if (contextId.equals(BuildInputContext.CONTEXT_ID))
-			return new BuildSourcePage(editor, title, name);
-		if (contextId.equals(BundleInputContext.CONTEXT_ID))
-			return new BundleSourcePage(editor, title, name);
-		return super.createSourcePage(editor, title, name, contextId);
-	}
-	
-	protected ISortableContentOutlinePage createContentOutline() {
-		return new ManifestOutlinePage(this);
-	}
-	
-	public Object getAdapter(Class key) {
-		//No property sheet needed - block super
-		if (key.equals(IPropertySheetPage.class)) {
-			return null;
-		}
-		return super.getAdapter(key);
-	}
-
-
-	public String getTitle() {
-		IPluginModelBase model = (IPluginModelBase)getAggregateModel();
-		if (model==null || !model.isValid())
-			return super.getTitle();
-		String text = getTitleText(model.getPluginBase());
-		if (text == null)
-			return super.getTitle();
-		return model.getResourceString(text);
-	}
-	
-	public String getTitleProperty() {
-		IPreferenceStore store = PDEPlugin.getDefault().getPreferenceStore();
-		String pref = store.getString(IPreferenceConstants.PROP_SHOW_OBJECTS);
-		if (pref!=null && pref.equals(IPreferenceConstants.VALUE_USE_NAMES))
-			return IPluginBase.P_NAME;
-		return IPluginBase.P_ID;
-	}
-	
-	private String getTitleText(IPluginBase pluginBase) {
-		IPreferenceStore store = PDEPlugin.getDefault().getPreferenceStore();
-		String pref = store.getString(IPreferenceConstants.PROP_SHOW_OBJECTS);
-		if (pref!=null && pref.equals(IPreferenceConstants.VALUE_USE_NAMES))
-			return pluginBase.getName();
-		return pluginBase.getId();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#getInputContext(java.lang.Object)
-	 */
-	protected InputContext getInputContext(Object object) {
-		InputContext context = null;
-		if (object instanceof IBuildObject) {
-			context = inputContextManager.findContext(BuildInputContext.CONTEXT_ID);
-		} else if (object instanceof IPluginExtensionPoint || object instanceof IPluginExtension) {
-			context = inputContextManager.findContext(PluginInputContext.CONTEXT_ID);
-		} else {
-			context = inputContextManager.findContext(BundleInputContext.CONTEXT_ID);
-			if (context == null)
-				context = inputContextManager.findContext(PluginInputContext.CONTEXT_ID);
-		}		
-		return context;
-	}
-	
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IShowEditorInput#showEditorInput(org.eclipse.ui.IEditorInput)
-     */
-    public void showEditorInput(IEditorInput editorInput) {
-     	String name = editorInput.getName();
-		String id = getActivePageInstance().getId();
-		if (name.equals("build.properties")) { //$NON-NLS-1$
-    		if (!BuildInputContext.CONTEXT_ID.equals(id))
-    			setActivePage(SHOW_SOURCE ? BuildInputContext.CONTEXT_ID : BuildPage.PAGE_ID);
-    	} else if (name.equals("plugin.xml") || name.equals("fragment.xml")) { //$NON-NLS-1$ //$NON-NLS-2$
-    		if (!PluginInputContext.CONTEXT_ID.equals(id)) {
-    			if (SHOW_SOURCE) {
-    				setActivePage(PluginInputContext.CONTEXT_ID);
-    			} else if (inputContextManager.hasContext(BundleInputContext.CONTEXT_ID)) {
-    				setActivePage(ExtensionsPage.PAGE_ID);
-    			} else {
-    				setActivePage(OverviewPage.PAGE_ID);
-    			}
-    		}
-    	} else if (!BundleInputContext.CONTEXT_ID.equals(id)) {
-			setActivePage(SHOW_SOURCE ? BundleInputContext.CONTEXT_ID : OverviewPage.PAGE_ID);
-    	}
-    }
-    
-    public boolean showExtensionTabs() {
-    	if (inputContextManager.hasContext(PluginInputContext.CONTEXT_ID))
-    		return true;
-    	return fShowExtensions && getAggregateModel().isEditable();
-     }
-
-    public boolean isEquinox() {
-    	return fEquinox;
-    }
-    
-    protected void addExtensionTabs() throws PartInitException {
-    	addPage(3, new ExtensionPointsPage(this));
-    	addPage(3, new ExtensionsPage(this));
-    }
-    
-    protected void setShowExtensions(boolean show) throws BackingStoreException {
-    	if (fPrefs != null) {
-	    	fPrefs.putBoolean(ICoreConstants.EXTENSIONS_PROPERTY, show);
-	    	fPrefs.flush();
-    	}
-    	fShowExtensions = show;
-    }
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ManifestEditorContributor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ManifestEditorContributor.java
deleted file mode 100644
index c51bc12..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ManifestEditorContributor.java
+++ /dev/null

@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-
-import org.eclipse.pde.internal.ui.editor.*;
-
-public class ManifestEditorContributor extends PDEFormEditorContributor {
-	/**
-	 * 
-	 */
-	public ManifestEditorContributor() {
-		super("&Plugin"); //$NON-NLS-1$
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ManifestEditorMatchingStrategy.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ManifestEditorMatchingStrategy.java
deleted file mode 100644
index f635973..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ManifestEditorMatchingStrategy.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.editor.plugin;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.pde.internal.ui.editor.JarEntryEditorInput;
-import org.eclipse.pde.internal.ui.editor.SystemFileEditorInput;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorMatchingStrategy;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.ide.ResourceUtil;
-
-
-public class ManifestEditorMatchingStrategy implements IEditorMatchingStrategy {
-
-    public boolean matches(IEditorReference editorRef, IEditorInput input) {    	
-        IFile inputFile = ResourceUtil.getFile(input);
-        if (inputFile != null && input instanceof IFileEditorInput) {
-            String path = inputFile.getProjectRelativePath().toString();
-            if (path.equals("plugin.xml") || path.equals("fragment.xml")  //$NON-NLS-1$ //$NON-NLS-2$
-            		|| path.equals("META-INF/MANIFEST.MF") || path.equals("build.properties")) { //$NON-NLS-1$ //$NON-NLS-2$ 
-                try {
-                    IFile editorFile = ResourceUtil.getFile(editorRef.getEditorInput());
-                    return editorFile != null && inputFile.getProject().equals(editorFile.getProject());
-                } catch (PartInitException e) {
-                    return false;
-                }
-            }
-        } else if (input instanceof SystemFileEditorInput || input instanceof JarEntryEditorInput) {
-        	try {
-    			IEditorInput existing = editorRef.getEditorInput();
-    			return input.equals(existing);
-    		} catch (PartInitException e1) {
-    		}      	
-        }
-        return false;
-    }
-
-
-}
-

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ManifestOutlinePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ManifestOutlinePage.java
deleted file mode 100644
index 7b2e0ce..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ManifestOutlinePage.java
+++ /dev/null

@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-import org.eclipse.pde.core.build.*;
-import org.eclipse.pde.core.build.IBuildModel;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.editor.build.*;
-import org.eclipse.pde.internal.ui.editor.build.BuildInputContext;
-import org.eclipse.pde.internal.ui.editor.context.InputContext;
-import org.eclipse.pde.internal.ui.model.bundle.ExportPackageObject;
-import org.eclipse.pde.internal.ui.model.bundle.ImportPackageObject;
-import org.eclipse.pde.internal.ui.model.bundle.PackageFriend;
-
-public class ManifestOutlinePage extends FormOutlinePage {
-	/**
-	 * @param editor
-	 */
-	public ManifestOutlinePage(PDEFormEditor editor) {
-		super(editor);
-	}
-	protected Object[] getChildren(Object parent) {
-		if (parent instanceof PDEFormPage) {
-			PDEFormPage page = (PDEFormPage) parent;
-			IPluginModelBase model = (IPluginModelBase) page.getModel();
-			IBuildModel buildModel = getBuildModel();
-			if (model.isValid()) {
-				IPluginBase pluginBase = model.getPluginBase();
-				if (page.getId().equals(DependenciesPage.PAGE_ID))
-					return pluginBase.getImports();
-				if (page.getId().equals(RuntimePage.PAGE_ID))
-					return pluginBase.getLibraries();
-				if (page.getId().equals(ExtensionsPage.PAGE_ID))
-					return pluginBase.getExtensions();
-				if (page.getId().equals(ExtensionPointsPage.PAGE_ID))
-					return pluginBase.getExtensionPoints();
-			}
-			if (buildModel!=null && buildModel.isValid()) {
-				if (page.getId().equals(BuildPage.PAGE_ID))
-					return buildModel.getBuild().getBuildEntries();
-			}
-		}
-		return new Object[0];
-	}
-	protected String getParentPageId(Object item) {
-		String pageId = null;
-		if (item instanceof IPluginImport || item instanceof ImportPackageObject)
-			pageId = DependenciesPage.PAGE_ID;
-		else if (item instanceof IPluginLibrary 
-                || item instanceof ExportPackageObject
-                || item instanceof PackageFriend)
-			pageId = RuntimePage.PAGE_ID;
-		else if (item instanceof IPluginExtension)
-			pageId = ExtensionsPage.PAGE_ID;
-		else if (item instanceof IPluginExtensionPoint)
-			pageId = ExtensionPointsPage.PAGE_ID;
-		else if (item instanceof IBuildEntry)
-			pageId = BuildPage.PAGE_ID;
-		if (pageId != null)
-			return pageId;
-		return super.getParentPageId(item);
-	}
-	private IBuildModel getBuildModel() {
-		InputContext context = editor.getContextManager().findContext(BuildInputContext.CONTEXT_ID);
-		if (context!=null)
-			return (IBuildModel)context.getModel();
-		return null;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ManifestSourcePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ManifestSourcePage.java
deleted file mode 100644
index 3161132..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ManifestSourcePage.java
+++ /dev/null

@@ -1,230 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-
-import java.util.*;
-import org.eclipse.jface.text.*;
-import org.eclipse.jface.text.source.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.elements.*;
-import org.eclipse.pde.internal.ui.model.*;
-import org.eclipse.pde.internal.ui.model.plugin.*;
-import org.eclipse.swt.graphics.*;
-
-public class ManifestSourcePage extends XMLSourcePage {
-	
-	private Object fLibraries = new Object();
-	private Object fImports = new Object();
-	private Object fExtensionPoints = new Object();
-	private Object fExtensions = new Object();
-	
-	class OutlineLabelProvider extends LabelProvider {		
-		private PDELabelProvider fProvider;
-		
-		public OutlineLabelProvider() {
-			fProvider = PDEPlugin.getDefault().getLabelProvider();
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.LabelProvider#dispose()
-		 */
-		
-		public String getText(Object obj) {
-			if (obj == fLibraries)
-				return PDEUIMessages.ManifestSourcePage_libraries; 
-			if (obj == fImports)
-				return PDEUIMessages.ManifestSourcePage_dependencies; 
-			if (obj == fExtensionPoints)
-				return PDEUIMessages.ManifestSourcePage_extensionPoints; 
-			if (obj == fExtensions)
-				return PDEUIMessages.ManifestSourcePage_extensions; 
-			return fProvider.getText(obj);
-		}
-
-		public Image getImage(Object obj) {
-			if (obj == fLibraries)
-				return fProvider.get(PDEPluginImages.DESC_RUNTIME_OBJ);
-			if (obj == fImports)
-				return fProvider.get(PDEPluginImages.DESC_REQ_PLUGINS_OBJ);
-			if (obj == fExtensionPoints)
-				return fProvider.get(PDEPluginImages.DESC_EXT_POINTS_OBJ);
-			if (obj == fExtensions)
-				return fProvider.get(PDEPluginImages.DESC_EXTENSIONS_OBJ);
-			
-			Image image = fProvider.getImage(obj);
-			int flags = ((IDocumentNode)obj).isErrorNode() ? PDELabelProvider.F_ERROR : 0;
-			return (flags == 0) ? image : fProvider.get(image, flags);
-		}
-	}
-	
-	class ContentProvider extends DefaultContentProvider implements ITreeContentProvider {
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
-		 */
-		public Object[] getChildren(Object parent) {
-			PluginModelBase model = (PluginModelBase)getInputContext().getModel();
-
-			ArrayList result = new ArrayList();			
-			if (parent instanceof IPluginBase) {
-				IPluginBase pluginBase = (IPluginBase)parent;
-				if (pluginBase.getLibraries().length > 0)
-					result.add(fLibraries);
-				if (pluginBase.getImports().length > 0)
-					result.add(fImports);
-				if (pluginBase.getExtensionPoints().length > 0)
-					result.add(fExtensionPoints);
-				if (pluginBase.getExtensions().length > 0)
-					result.add(fExtensions);
-				return result.toArray();
-			} 
-			if (parent == fLibraries)
-				return model.getPluginBase().getLibraries();
-			
-			if (parent == fImports)
-				return model.getPluginBase().getImports();
-			
-			if (parent == fExtensionPoints)
-				return model.getPluginBase().getExtensionPoints();
-			
-			if (parent == fExtensions)
-				return model.getPluginBase().getExtensions();
-			
-			return new Object[0];
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
-		 */
-		public Object getParent(Object element) {
-			if (element instanceof IDocumentNode)
-				return ((IDocumentNode)element).getParentNode();
-			return null;
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
-		 */
-		public boolean hasChildren(Object element) {
-			if (element instanceof IPluginBase) {
-				return ((IDocumentNode) element).getChildNodes().length > 0;
-			}
-			return element == fLibraries || element == fImports
-			|| element == fExtensionPoints || element == fExtensions;
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-		 */
-		public Object[] getElements(Object inputElement) {
-			if (inputElement instanceof IPluginModelBase) {
-				return new Object[] {((IPluginModelBase)inputElement).getPluginBase()};
-			}
-			return new Object[0];
-		}
-	}
-		
-	class OutlineSorter extends ViewerSorter{
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ViewerSorter#category(java.lang.Object)
-		 */
-		public int category(Object element) {
-			if (element == fLibraries)
-				return 0;
-			if (element == fImports)
-				return 1;
-			if (element == fExtensionPoints)
-				return 2;
-			if (element == fExtensions)
-				return 3;
-			return 4;
-		}
-	}
-	
-	public ManifestSourcePage(PDEFormEditor editor, String id, String title) {
-		super(editor, id, title);
-		
-	}
-
-	protected ILabelProvider createOutlineLabelProvider() {
-		return new OutlineLabelProvider();
-	}
-	protected ITreeContentProvider createOutlineContentProvider() {
-		return new ContentProvider();
-	}
-
-	protected void outlineSelectionChanged(SelectionChangedEvent event) {
-		ISelection selection= event.getSelection();
-		if (selection instanceof IStructuredSelection) {
-			IStructuredSelection structuredSelection= (IStructuredSelection) selection;
-			Object first= structuredSelection.getFirstElement();
-			if (first instanceof IDocumentNode && !(first instanceof IPluginBase)) {
-				setHighlightRange((IDocumentNode)first, true);
-				setSelectedRange((IDocumentNode)first);				
-			} else {
-				resetHighlightRange();
-			}
-		}
-	}
-	
-	public void setSelectedRange(IDocumentNode node) {
-		ISourceViewer sourceViewer = getSourceViewer();
-		if (sourceViewer == null)
-			return;
-
-		IDocument document = sourceViewer.getDocument();
-		if (document == null)
-			return;
-
-		int offset = node.getOffset();
-		sourceViewer.setSelectedRange(offset + 1, node.getXMLTagName().length());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESourcePage#createOutlineSorter()
-	 */
-	protected ViewerSorter createOutlineSorter() {
-		return new OutlineSorter();
-	}
-	
-	protected IDocumentRange getRangeElement(ITextSelection selection) {
-		if (selection.isEmpty())
-			return null;
-		IPluginModelBase model = (IPluginModelBase) getInputContext().getModel();
-		int offset = selection.getOffset();
-		IDocumentRange node = findNode(model.getPluginBase().getLibraries(),
-				offset);
-		if (node == null)
-			node = findNode(model.getPluginBase().getImports(), offset);
-		if (node == null)
-			node = findNode(model.getPluginBase().getExtensionPoints(), offset);
-		if (node == null)
-			node = findNode(model.getPluginBase().getExtensions(), offset);
-		if (node == null) {
-			node = findNode(new IPluginObject[] { model.getPluginBase() }, offset);
-		}
-		return node;
-	}
-
-	private IDocumentNode findNode(IPluginObject[] nodes, int offset) {
-		for (int i = 0; i < nodes.length; i++) {
-			IDocumentNode node = (IDocumentNode) nodes[i];
-			if (offset >= node.getOffset()
-					&& offset < node.getOffset() + node.getLength()) {
-				return node;
-			}
-		}
-		return null;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/MatchSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/MatchSection.java
deleted file mode 100644
index 11a90c2..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/MatchSection.java
+++ /dev/null

@@ -1,281 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.plugin.ImportObject;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.parts.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.forms.*;
-import org.eclipse.ui.forms.widgets.*;
-
-public class MatchSection extends PDESection implements IPartSelectionListener {
-	
-	private Button fReexportButton;
-	private Button fOptionalButton;
-	
-	private FormEntry fVersionText;
-
-	private ComboPart fMatchCombo;
-	protected IPluginReference fCurrentImport;
-	
-	private boolean fBlockChanges = false;
-	private boolean fAddReexport = true;
-
-	public MatchSection(PDEFormPage formPage, Composite parent, boolean addReexport) {
-		super(formPage, parent, Section.DESCRIPTION);
-		fAddReexport = addReexport;
-		createClient(getSection(), formPage.getEditor().getToolkit());
-	}
-	
-	public void commit(boolean onSave) {
-		if (isDirty() == false)
-			return;
-		if (fCurrentImport != null && fVersionText.getText().isEnabled()) {
-			fVersionText.commit();
-			String value = fVersionText.getValue();
-			int match = IMatchRules.NONE;
-			if (value != null && value.length() > 0) {
-				applyVersion(value);
-				match = getMatch();
-			}
-			applyMatch(match);
-		}
-		super.commit(onSave);
-	}
-	
-	public void cancelEdit() {
-		fVersionText.cancelEdit();
-		super.cancelEdit();
-	}
-	
-	public void createClient(Section section, FormToolkit toolkit) {
-		Composite container = toolkit.createComposite(section);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.verticalSpacing = 9;
-		layout.marginWidth = layout.marginHeight = 2;
-		container.setLayout(layout);
-		if (fAddReexport) {
-			createOptionalButton(toolkit, container);
-			createReexportButton(toolkit, container);
-		}
-		
-		fVersionText = new FormEntry(container, toolkit, PDEUIMessages.ManifestEditor_MatchSection_version, null, false);
-		fVersionText.setFormEntryListener(new FormEntryAdapter(this, getPage().getEditor().getEditorSite().getActionBars()) {
-			public void textValueChanged(FormEntry text) {
-				applyVersion(text.getValue());
-			}
-			public void textDirty(FormEntry text) {
-				if (fBlockChanges)
-					return;
-				markDirty();
-				fBlockChanges = true;
-				resetMatchCombo(fCurrentImport);
-				fBlockChanges = false;
-			}
-		});
-		
-		Label matchLabel = toolkit.createLabel(container, PDEUIMessages.ManifestEditor_PluginSpecSection_versionMatch);
-		matchLabel.setForeground(toolkit.getColors().getColor(FormColors.TITLE));
-
-		fMatchCombo = new ComboPart();
-		fMatchCombo.createControl(container, toolkit, SWT.READ_ONLY);
-		fMatchCombo.add(""); //$NON-NLS-1$
-		fMatchCombo.add(PDEUIMessages.ManifestEditor_MatchSection_equivalent);
-		fMatchCombo.add(PDEUIMessages.ManifestEditor_MatchSection_compatible);
-		fMatchCombo.add(PDEUIMessages.ManifestEditor_MatchSection_perfect);
-		fMatchCombo.add(PDEUIMessages.ManifestEditor_MatchSection_greater);
-		fMatchCombo.getControl().setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fMatchCombo.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (!fBlockChanges) {
-					applyMatch(fMatchCombo.getSelectionIndex());
-				}
-			}
-		});
-		toolkit.paintBordersFor(container);
-		initialize();
-		update((IPluginReference) null);
-		
-		section.setClient(container);		
-		section.setText(PDEUIMessages.MatchSection_title); 
-		section.setDescription(PDEUIMessages.MatchSection_desc); 
-		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL|GridData.VERTICAL_ALIGN_BEGINNING));
-	}
-	
-	private void createReexportButton(FormToolkit toolkit, Composite container) {
-		fReexportButton = toolkit.createButton(container, PDEUIMessages.ManifestEditor_MatchSection_reexport, SWT.CHECK);
-		fReexportButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (!fBlockChanges && fCurrentImport instanceof IPluginImport) {
-					try {
-						IPluginImport iimport = (IPluginImport) fCurrentImport;
-						iimport.setReexported(fReexportButton.getSelection());
-					} catch (CoreException ex) {
-						PDEPlugin.logException(ex);
-					}
-				}
-			}
-		});
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		fReexportButton.setLayoutData(gd);
-	}
-	
-	private void createOptionalButton(FormToolkit toolkit, Composite container) {
-		fOptionalButton = toolkit.createButton(container, PDEUIMessages.ManifestEditor_MatchSection_optional, SWT.CHECK);
-		fOptionalButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (fBlockChanges)
-					return;
-				if (!fBlockChanges && fCurrentImport instanceof IPluginImport) {
-					try {
-						IPluginImport iimport = (IPluginImport) fCurrentImport;
-						iimport.setOptional(fOptionalButton.getSelection());
-					} catch (CoreException ex) {
-						PDEPlugin.logException(ex);
-					}
-				}
-			}
-		});
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		fOptionalButton.setLayoutData(gd);
-	}
-	
-	private void applyVersion(String version) {
-		try {
-			if (fCurrentImport != null) {
-				fCurrentImport.setVersion(version);
-			} 
-		} catch (CoreException ex) {
-			PDEPlugin.logException(ex);
-		}
-	}
-	
-	private void applyMatch(int match) {
-		try {
-			if (fCurrentImport != null) {
-				fCurrentImport.setMatch(match);
-			}
-		} catch (CoreException ex) {
-			PDEPlugin.logException(ex);
-		}
-	}
-	
-	private int getMatch() {
-		return fMatchCombo.getSelectionIndex();
-	}
-	
-	public boolean canPaste(Clipboard clipboard) {
-		Display d = getSection().getDisplay();
-		return (d.getFocusControl() instanceof Text);
-	}
-	
-	public void dispose() {
-		IModel model = (IModel) getPage().getModel();
-		if (model instanceof IModelChangeProvider)
-			((IModelChangeProvider) model).removeModelChangedListener(this);
-		super.dispose();
-	}
-	
-	private void initialize() {
-		IBaseModel model = getPage().getModel();
-		if (model instanceof IModelChangeProvider)
-			((IModelChangeProvider) model).addModelChangedListener(this);
-	}
-	
-	public void modelChanged(IModelChangedEvent e) {
-		if (e.getChangeType() == IModelChangedEvent.REMOVE) {
-			Object obj = e.getChangedObjects()[0];
-			if (obj.equals(fCurrentImport)) {
-				update((IPluginReference) null);
-			}
-		} else if (e.getChangeType() == IModelChangedEvent.CHANGE) {
-			Object object = e.getChangedObjects()[0];
-			if (object.equals(fCurrentImport)) {
-				update(fCurrentImport);
-			}
-		}
-	}
-	
-	public void selectionChanged(IFormPart part, ISelection selection) {
-		IStructuredSelection ssel = (IStructuredSelection)selection;
-		if (ssel.size()==1) {
-			Object changeObject = ((IStructuredSelection) selection).getFirstElement();
-			IPluginReference input = null;			
-			if (changeObject instanceof ImportObject)
-				input = ((ImportObject) changeObject).getImport();
-			else if (changeObject instanceof IPluginReference)
-				input = (IPluginReference) changeObject;
-			update(input);
-		} else {
-			update(null);
-		}
-	}
-	
-	private void resetMatchCombo(IPluginReference iimport) {
-		fMatchCombo.getControl().setEnabled(isEditable() && fVersionText.getText().getText().length() > 0);
-		setMatchCombo(iimport);
-	}
-	
-	private void setMatchCombo(IPluginReference iimport) {
-		fMatchCombo.select(iimport != null ? iimport.getMatch() : IMatchRules.NONE);
-	}
-	
-	protected void update(IPluginReference iimport) {
-		fBlockChanges = true;
-		if (iimport == null) {
-			if (fAddReexport) {
-				fOptionalButton.setSelection(false);
-				fOptionalButton.setEnabled(false);
-				fReexportButton.setSelection(false);
-				fReexportButton.setEnabled(false);
-			}
-			fVersionText.setValue(null, true);
-			fVersionText.setEditable(false);
-			fMatchCombo.getControl().setEnabled(false);
-			fMatchCombo.setText(""); //$NON-NLS-1$
-			fCurrentImport = null;
-			fBlockChanges = false;
-			return;
-		}
-		
-		if (fCurrentImport != null && !iimport.equals(fCurrentImport)
-				&& isEditable()) {
-			commit(false);
-		}
-		
-		fCurrentImport = iimport;
-		if (fCurrentImport instanceof IPluginImport) {
-			IPluginImport pimport = (IPluginImport) fCurrentImport;
-			fOptionalButton.setEnabled(isEditable());
-			fOptionalButton.setSelection(pimport.isOptional());
-			fReexportButton.setEnabled(isEditable());
-			fReexportButton.setSelection(pimport.isReexported());
-		}
-		fVersionText.setEditable(isEditable());
-		fVersionText.setValue(fCurrentImport.getVersion());
-		resetMatchCombo(fCurrentImport);
-		fBlockChanges = false;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/NewElementAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/NewElementAction.java
deleted file mode 100644
index 8b69604..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/NewElementAction.java
+++ /dev/null

@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-
-import java.util.Hashtable;
-import java.util.Locale;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.JavaConventions;
-import org.eclipse.jface.action.Action;
-import org.eclipse.pde.core.plugin.IPluginElement;
-import org.eclipse.pde.core.plugin.IPluginParent;
-import org.eclipse.pde.internal.core.ischema.ISchemaAttribute;
-import org.eclipse.pde.internal.core.ischema.ISchemaElement;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-
-public class NewElementAction extends Action {
-	public static final String UNKNOWN_ELEMENT_TAG = PDEUIMessages.NewElementAction_generic; 
-
-	private ISchemaElement elementInfo;
-
-	private Hashtable counters;
-
-	private IPluginParent parent;
-
-	private IProject project;
-
-	public NewElementAction(ISchemaElement elementInfo, IPluginParent parent) {
-		this.counters = PDEPlugin.getDefault().getDefaultNameCounters();
-		this.elementInfo = elementInfo;
-		// this.project = project;
-		this.parent = parent;
-		setText(getElementName());
-		setImageDescriptor(PDEPluginImages.DESC_GENERIC_XML_OBJ);
-		IResource resource = parent.getModel().getUnderlyingResource();
-		if (resource != null)
-			project = resource.getProject();
-		setEnabled(parent.getModel().isEditable());
-	}
-
-	public String createDefaultClassName(ISchemaAttribute attInfo, int counter) {
-		String tag = attInfo.getParent().getName();
-		String expectedType = attInfo.getBasedOn();
-		String className = ""; //$NON-NLS-1$
-		if (expectedType == null) {
-			StringBuffer buf = new StringBuffer(tag);
-			buf.setCharAt(0, Character.toUpperCase(tag.charAt(0)));
-			className = buf.toString();
-		} else {
-			// package will be the same as the plugin ID
-			// class name will be generated based on the required interface
-			className = expectedType;
-			int dotLoc = className.lastIndexOf('.');
-			if (dotLoc != -1)
-				className = className.substring(dotLoc + 1);
-			if (className.length() > 2 && className.charAt(0) == 'I'
-					&& Character.isUpperCase(className.charAt(1)))
-				className = className.substring(1);
-		}
-		String packageName = createDefaultPackageName(project.getName(), className);
-		className += counter;
-		return packageName + "." + className; //$NON-NLS-1$
-	}
-
-	public String createDefaultName(ISchemaAttribute attInfo, int counter) {
-		if (attInfo.getType().getName().equals("boolean")) //$NON-NLS-1$
-			return "true"; //$NON-NLS-1$
-
-		String tag = attInfo.getParent().getName();
-		return project.getName() + "." + tag + counter; //$NON-NLS-1$
-	}
-
-	private String getCounterKey(ISchemaElement elementInfo) {
-		return elementInfo.getSchema().getQualifiedPointId()
-				+ "." + elementInfo.getName(); //$NON-NLS-1$
-	}
-
-	private String getElementName() {
-		return elementInfo != null ? elementInfo.getName() : UNKNOWN_ELEMENT_TAG;
-	}
-
-	private void initializeAttribute(IPluginElement element, ISchemaAttribute attInfo,
-			int counter) throws CoreException {
-		String value = null;
-		if (attInfo.getKind() == ISchemaAttribute.JAVA)
-			value = createDefaultClassName(attInfo, counter);
-		else if (attInfo.getUse() == ISchemaAttribute.DEFAULT
-				&& attInfo.getValue() != null)
-			value = attInfo.getValue().toString();
-		else if (attInfo.getType().getRestriction() != null)
-			value = attInfo.getType().getRestriction().getChildren()[0].toString();
-		else
-			value = createDefaultName(attInfo, counter);
-
-		element.setAttribute(attInfo.getName(), value);
-	}
-
-	private void initializeAttributes(IPluginElement element) throws CoreException {
-		ISchemaElement elementInfo = (ISchemaElement) element.getElementInfo();
-		if (elementInfo == null)
-			return;
-		String counterKey = getCounterKey(elementInfo);
-		Integer counter = (Integer) counters.get(counterKey);
-		if (counter == null) {
-			counter = new Integer(1);
-		} else
-			counter = new Integer(counter.intValue() + 1);
-		counters.put(counterKey, counter);
-		ISchemaAttribute[] attributes = elementInfo.getAttributes();
-		for (int i = 0; i < attributes.length; i++) {
-			ISchemaAttribute attInfo = attributes[i];
-			if (attInfo.getUse() == ISchemaAttribute.REQUIRED
-					|| attInfo.getUse() == ISchemaAttribute.DEFAULT)
-				initializeAttribute(element, attInfo, counter.intValue());
-		}
-	}
-
-	public void run() {
-		IPluginElement newElement = parent.getModel().getFactory().createElement(parent);
-		try {
-			newElement.setName(getElementName());
-			initializeAttributes(newElement);
-			parent.add(newElement);
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	public String createDefaultPackageName(String id, String className) {
-		StringBuffer buffer = new StringBuffer();
-		IStatus status;
-		for (int i = 0; i < id.length(); i++) {
-			char ch = id.charAt(i);
-			if (buffer.length() == 0) {
-				if (Character.isJavaIdentifierStart(ch))
-					buffer.append(Character.toLowerCase(ch));
-			} else {
-				if (Character.isJavaIdentifierPart(ch))
-					buffer.append(ch);
-				else if (ch == '.') {
-					status = JavaConventions.validatePackageName(buffer.toString());
-					if (status.getSeverity() == IStatus.ERROR)
-						buffer.append(className.toLowerCase(Locale.ENGLISH));
-					buffer.append(ch);
-				}
-			}
-		}
-
-		status = JavaConventions.validatePackageName(buffer.toString());
-		if (status.getSeverity() == IStatus.ERROR)
-			buffer.append(className.toLowerCase(Locale.ENGLISH));
-
-		return buffer.toString();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/NewRuntimeLibraryDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/NewRuntimeLibraryDialog.java
deleted file mode 100644
index 0d8c3e0..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/NewRuntimeLibraryDialog.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-
-import java.util.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.dialogs.*;
-
-public class NewRuntimeLibraryDialog extends SelectionStatusDialog {
-	private Text libraryText;
-	private IPluginLibrary[] libraries;
-	private DuplicateStatusValidator validator;
-	private String libraryName;
-	private HashSet librarySet;
-	
-	class DuplicateStatusValidator {
-		public IStatus validate (String text){
-			if(libraries==null || libraries.length==0)
-			return new Status(
-				IStatus.OK,
-				PDEPlugin.getPluginId(),
-				IStatus.OK,
-				"", //$NON-NLS-1$
-				null);
-
-			if (librarySet.contains(new Path(ClasspathUtilCore.expandLibraryName(text))))
-				return new Status(
-					IStatus.ERROR,
-					PDEPlugin.getPluginId(),
-					IStatus.ERROR,
-					PDEUIMessages.ManifestEditor_RuntimeLibraryDialog_validationError, 
-					null);
-			return new Status(
-				IStatus.OK,
-				PDEPlugin.getPluginId(),
-				IStatus.OK,
-				"", //$NON-NLS-1$
-				null);
-
-		}
-	}
-	public NewRuntimeLibraryDialog(Shell parent, IPluginLibrary[] libraries) {
-		super(parent);
-		this.libraries = libraries;
-		this.validator = new DuplicateStatusValidator();
-		librarySet = new HashSet();
-		for (int i = 0; i < libraries.length; i++) {
-			librarySet.add(new Path(ClasspathUtilCore.expandLibraryName(libraries[i].getName())));
-		}
-		setStatusLineAboveButtons(true);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.dialogs.SelectionStatusDialog#computeResult()
-	 */
-	protected void computeResult() {
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = layout.marginWidth = 8;
-		layout.numColumns = 1;
-		
-		layout.makeColumnsEqualWidth = false;
-		container.setLayout(layout);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		container.setLayoutData(gd);
-		Label libraryLabel = new Label(container, SWT.NULL);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		libraryLabel.setLayoutData(gd);
-		libraryLabel
-				.setText(PDEUIMessages.ManifestEditor_RuntimeLibraryDialog_label); 
-		
-		libraryText = new Text(container, SWT.SINGLE|SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		libraryText.setLayoutData(gd);
-		libraryText
-				.setText(PDEUIMessages.ManifestEditor_RuntimeLibraryDialog_default); 
-		libraryText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				updateStatus(validator.validate(libraryText.getText()));
-			}
-		});
-		applyDialogFont(container);
-		return container;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.window.Window#open()
-	 */
-	public int open() {
-		libraryText.setText("library.jar"); //$NON-NLS-1$
-		libraryText.setSelection(0, libraryText.getText().length() - 4);
-		return super.open();
-	}
-	public String getLibraryName(){
-		return libraryName;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.dialogs.SelectionStatusDialog#okPressed()
-	 */
-	protected void okPressed() {
-		libraryName = libraryText.getText();
-		super.okPressed();
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/OverviewPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/OverviewPage.java
deleted file mode 100644
index 3d8595d..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/OverviewPage.java
+++ /dev/null

@@ -1,402 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.pde.core.build.IBuild;
-import org.eclipse.pde.core.build.IBuildEntry;
-import org.eclipse.pde.core.build.IBuildModel;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDELabelProvider;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.PDESection;
-import org.eclipse.pde.internal.ui.editor.build.BuildInputContext;
-import org.eclipse.pde.internal.ui.editor.build.BuildPage;
-import org.eclipse.pde.internal.ui.editor.context.InputContext;
-import org.eclipse.pde.internal.ui.launcher.EquinoxLaunchShortcut;
-import org.eclipse.pde.internal.ui.launcher.RuntimeWorkbenchShortcut;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.SWTException;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.events.HyperlinkAdapter;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.FormText;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ImageHyperlink;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.progress.IProgressService;
-import org.osgi.service.prefs.BackingStoreException;
-
-
-public class OverviewPage extends PDEFormPage implements IHyperlinkListener {
-	public static final String PAGE_ID = "overview"; //$NON-NLS-1$
-	private RuntimeWorkbenchShortcut fLaunchShortcut;
-	private EquinoxLaunchShortcut fEquinoxShortcut;
-	private PluginExportAction fExportAction;
-
-	public OverviewPage(FormEditor editor) {
-		super(editor, PAGE_ID, PDEUIMessages.OverviewPage_tabName);  
-	}
-	
-	protected String getHelpResource() {
-		return "/org.eclipse.pde.doc.user/guide/pde_manifest_overview.htm"; //$NON-NLS-1$
-	}
-	
-	protected void createFormContent(IManagedForm managedForm) {
-		super.createFormContent(managedForm);
-		ScrolledForm form = managedForm.getForm();
-		FormToolkit toolkit = managedForm.getToolkit();
-		form.setText(PDEUIMessages.ManifestEditor_OverviewPage_title); 
-		fillBody(managedForm, toolkit);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.MANIFEST_PLUGIN_OVERVIEW);		
-		managedForm.refresh();
-	}
-	
-	private void fillBody(IManagedForm managedForm, FormToolkit toolkit) {
-		Composite body = managedForm.getForm().getBody();
-		TableWrapLayout layout = new TableWrapLayout();
-		layout.bottomMargin = 10;
-		layout.topMargin = 5;
-		layout.leftMargin = 10;
-		layout.rightMargin = 10;
-		layout.numColumns = 2;
-		layout.horizontalSpacing = 10;
-		body.setLayout(layout);
-
-		Composite left = toolkit.createComposite(body);
-		layout = new TableWrapLayout();
-		layout.verticalSpacing = 20;
-		left.setLayout(layout);
-		left.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
-		GeneralInfoSection general = null;
-		if (isFragment())
-			general = new FragmentGeneralInfoSection(this, left);
-		else
-			general = new PluginGeneralInfoSection(this, left);
-		managedForm.addPart(general);		
-		if (isBundle())
-			managedForm.addPart(new RequiredExecutionEnvironmentSection(this, left));
-		if (isEditable())
-    		createTestingSection(managedForm, left, toolkit);
-		
-		Composite right = toolkit.createComposite(body);			
-		layout = new TableWrapLayout();
-		layout.verticalSpacing = 20;
-		right.setLayout(layout);
-		right.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
-		createContentSection(managedForm, right, toolkit);
-		if (isEditable() || getPDEEditor().hasInputContext(PluginInputContext.CONTEXT_ID))
-			createExtensionSection(managedForm, right, toolkit);
-        if (isEditable())
-    		createExportingSection(managedForm, right, toolkit);
-	}
-	
-	private void createContentSection(IManagedForm managedForm,
-			Composite parent, FormToolkit toolkit) {
-		String sectionTitle;
-		if(isFragment()){
-			sectionTitle = PDEUIMessages.ManifestEditor_ContentSection_ftitle;
-		}else{
-			sectionTitle = PDEUIMessages.ManifestEditor_ContentSection_title;
-		}
-		Section section = createStaticSection(
-							toolkit, 
-							parent, 
-							sectionTitle);
-
-		Composite container = toolkit.createComposite(section, SWT.NONE);
-		TableWrapLayout layout = new TableWrapLayout();
-		layout.leftMargin = layout.rightMargin = layout.topMargin = layout.bottomMargin = 0;
-		container.setLayout(layout);
-		container.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
-		
-		FormText text = createClient(container, isFragment() ? PDEUIMessages.OverviewPage_fContent : PDEUIMessages.OverviewPage_content, toolkit);
-		PDELabelProvider lp = PDEPlugin.getDefault().getLabelProvider();
-		text.setImage("page", lp.get(PDEPluginImages.DESC_PAGE_OBJ, PDELabelProvider.F_EDIT)); //$NON-NLS-1$
-		
-		if (!isBundle() && isEditable()){
-			String content;
-			if(isFragment()){
-				content = PDEUIMessages.OverviewPage_fOsgi;
-			}else{
-				content = PDEUIMessages.OverviewPage_osgi;
-			}
-			text = createClient(container, content, toolkit);
-		}
-		section.setClient(container);
-		section.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
-	}
-	
-	private void createExtensionSection(IManagedForm managedForm,
-			Composite parent, FormToolkit toolkit) {
-		String sectionTitle = PDEUIMessages.ManifestEditor_ExtensionSection_title;
-		Section section = createStaticSection(
-							toolkit, 
-							parent, 
-							sectionTitle);
-
-		Composite container = toolkit.createComposite(section, SWT.NONE);
-		TableWrapLayout layout = new TableWrapLayout();
-		layout.leftMargin = layout.rightMargin = layout.topMargin = layout.bottomMargin = 0;
-		container.setLayout(layout);
-		container.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
-		
-		FormText text  = createClient(container, isFragment() ? PDEUIMessages.OverviewPage_fExtensionContent : PDEUIMessages.OverviewPage_extensionContent, toolkit);
-		PDELabelProvider lp = PDEPlugin.getDefault().getLabelProvider();
-		text.setImage("page", lp.get(PDEPluginImages.DESC_PAGE_OBJ, PDELabelProvider.F_EDIT)); //$NON-NLS-1$
-		
-		section.setClient(container);
-		section.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
-	}
-	
-	private void createTestingSection(IManagedForm managedForm,
-			Composite parent, FormToolkit toolkit) {
-		Section section = createStaticSection(toolkit, parent, PDEUIMessages.ManifestEditor_TestingSection_title); 
-		PDELabelProvider lp = PDEPlugin.getDefault().getLabelProvider();
-		
-		ImageHyperlink info = new ImageHyperlink(section, SWT.NULL);
-		toolkit.adapt(info, true, true);
-		info.setImage(lp.get(PDEPluginImages.DESC_HELP));
-		info.setBackground(section.getTitleBarGradientBackground());
-		info.addHyperlinkListener(new HyperlinkAdapter() {
-			public void linkActivated(HyperlinkEvent e) {
-				displayHelpResource("/org.eclipse.pde.doc.user/guide/pde_running.htm"); //$NON-NLS-1$
-			}
-		});
-		section.setTextClient(info);
-		
-		FormText text;
-		if (!((ManifestEditor)getEditor()).showExtensionTabs())
-			text = createClient(section, PDEUIMessages.OverviewPage_OSGiTesting, toolkit);
-		else
-			text = createClient(section, isFragment() ? PDEUIMessages.OverviewPage_fTesting : PDEUIMessages.OverviewPage_testing, toolkit);
-		text.setImage("run", lp.get(PDEPluginImages.DESC_RUN_EXC)); //$NON-NLS-1$
-		text.setImage("debug", lp.get(PDEPluginImages.DESC_DEBUG_EXC)); //$NON-NLS-1$
-		section.setClient(text);
-	}
-	
-	private void createExportingSection(IManagedForm managedForm,
-			Composite parent, FormToolkit toolkit) {
-		Section section = createStaticSection(toolkit, parent, PDEUIMessages.ManifestEditor_DeployingSection_title); 
-		ImageHyperlink info = new ImageHyperlink(section, SWT.NULL);
-		toolkit.adapt(info, true, true);
-		info.setImage(PDEPlugin.getDefault().getLabelProvider().get(PDEPluginImages.DESC_HELP));
-		info.addHyperlinkListener(new HyperlinkAdapter() {
-			public void linkActivated(HyperlinkEvent e) {
-				displayHelpResource("/org.eclipse.pde.doc.user/guide/pde_deploy.htm"); //$NON-NLS-1$
-			}
-		});
-		info.setBackground(section.getTitleBarGradientBackground());
-		section.setTextClient(info);
-		section.setClient(createClient(section, isFragment() ? PDEUIMessages.OverviewPage_fDeploying : PDEUIMessages.OverviewPage_deploying, toolkit));
-	}
-	
-	private Section createStaticSection(FormToolkit toolkit, Composite parent, String text) {
-		Section section = toolkit.createSection(parent, Section.TITLE_BAR);
-		section.clientVerticalSpacing = PDESection.CLIENT_VSPACING;
-		section.setText(text);
-		return section;
-	}
-	
-	private FormText createClient(Composite section, String content, FormToolkit toolkit) {
-		FormText text = toolkit.createFormText(section, true);
-		try {
-			text.setText(content, true, false);
-		} catch (SWTException e) {
-			text.setText(e.getMessage(), false, false);
-		}
-		section.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
-		text.addHyperlinkListener(this);
-		return text;
-	}
-	
-	private boolean isFragment() {
-		IPluginModelBase model = (IPluginModelBase) getPDEEditor().getContextManager().getAggregateModel();
-		return model.isFragmentModel();
-	}
-	
-	private boolean isBundle() {
-		return getPDEEditor().getContextManager().findContext(BundleInputContext.CONTEXT_ID) != null;
-	}
-
-	private boolean isEditable() {
-		IPluginModelBase model = (IPluginModelBase) getPDEEditor().getContextManager().getAggregateModel();
-		return model.isEditable();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.forms.events.HyperlinkListener#linkActivated(org.eclipse.ui.forms.events.HyperlinkEvent)
-	 */
-	public void linkActivated(HyperlinkEvent e) {
-		String href = (String) e.getHref();
-		// try page references
-		if (href.equals("dependencies")) //$NON-NLS-1$
-			getEditor().setActivePage(DependenciesPage.PAGE_ID);
-		else if (href.equals("runtime")) //$NON-NLS-1$
-			getEditor().setActivePage(RuntimePage.PAGE_ID);
-		else if (href.equals("extensions")) { //$NON-NLS-1$
-			if (getEditor().setActivePage(ExtensionsPage.PAGE_ID) == null)
-				activateExtensionPages(ExtensionsPage.PAGE_ID);
-		} else if (href.equals("ex-points")) { //$NON-NLS-1$
-			if (getEditor().setActivePage(ExtensionPointsPage.PAGE_ID) == null)
-				activateExtensionPages(ExtensionPointsPage.PAGE_ID);
-		} else if (href.equals("build")) { //$NON-NLS-1$
-			if (!getPDEEditor().hasInputContext(BuildInputContext.CONTEXT_ID)) {
-				if (!MessageDialog.openQuestion(PDEPlugin.getActiveWorkbenchShell(), PDEUIMessages.OverviewPage_buildTitle, PDEUIMessages.OverviewPage_buildQuestion)) 
-					return;
-				IFile file = getPDEEditor().getCommonProject().getFile("build.properties"); //$NON-NLS-1$
-				WorkspaceBuildModel model = new WorkspaceBuildModel(file);
-				model.save();
-				IEditorInput in = new FileEditorInput(file);
-				getPDEEditor().getContextManager().putContext(in, new BuildInputContext(getPDEEditor(), in, false));
-			} 
-			getEditor().setActivePage(BuildPage.PAGE_ID);	
-		} else if (href.equals("action.run")) { //$NON-NLS-1$ {
-			getEditor().doSave(null);
-			getLaunchShortcut().run(getPDEEditor().getCommonProject());
-		} else if (href.equals("action.debug")) { //$NON-NLS-1$
-			getEditor().doSave(null);
-			getLaunchShortcut().debug(getPDEEditor().getCommonProject());
-		} else if (href.equals("export")) { //$NON-NLS-1$
-			getExportAction().run();
-		} else if (href.equals("action.convert")) { //$NON-NLS-1$
-			handleConvert();
-		} else if (href.equals("action.runEquinox")) { //$NON-NLS-1$ {
-			// TODO run osgi launcher
-			getEditor().doSave(null);
-			getEquinoxShortcut().run(getPDEEditor().getCommonProject());
-		} else if (href.equals("action.debugEquinox")) { //$NON-NLS-1$
-			// TODO run osgi launcher in debug
-			getEditor().doSave(null);
-			getEquinoxShortcut().debug(getPDEEditor().getCommonProject());
-		}
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.forms.events.HyperlinkListener#linkEntered(org.eclipse.ui.forms.events.HyperlinkEvent)
-	 */
-	public void linkEntered(HyperlinkEvent e) {
-		IStatusLineManager mng = getEditor().getEditorSite().getActionBars()
-				.getStatusLineManager();
-		mng.setMessage(e.getLabel());
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.forms.events.HyperlinkListener#linkExited(org.eclipse.ui.forms.events.HyperlinkEvent)
-	 */
-	public void linkExited(HyperlinkEvent e) {
-		IStatusLineManager mng = getEditor().getEditorSite().getActionBars()
-				.getStatusLineManager();
-		mng.setMessage(null);
-	}
-	
-	private RuntimeWorkbenchShortcut getLaunchShortcut() {
-		if (fLaunchShortcut == null)
-			fLaunchShortcut = new RuntimeWorkbenchShortcut();
-		return fLaunchShortcut;
-	}
-	
-	private EquinoxLaunchShortcut getEquinoxShortcut() {
-		if (fEquinoxShortcut == null)
-			fEquinoxShortcut = new EquinoxLaunchShortcut();
-		return fEquinoxShortcut;
-	}
-	
-	private PluginExportAction getExportAction() {
-		if (fExportAction == null)
-			fExportAction = new PluginExportAction((PDEFormEditor) getEditor());
-		return fExportAction;
-	}
-	
-	private void displayHelpResource(String resource) {
-		PlatformUI.getWorkbench().getHelpSystem().displayHelpResource(resource);
-	}
-	
-	private void handleConvert() {
-		try {
-			PDEFormEditor editor = getPDEEditor();
-			IPluginModelBase model = (IPluginModelBase)editor.getAggregateModel();
-			IRunnableWithProgress op = new CreateManifestOperation(model);
-			IProgressService service = PlatformUI.getWorkbench().getProgressService();
-			editor.doSave(null);
-			service.runInUI(service, op, PDEPlugin.getWorkspace().getRoot());
-            updateBuildProperties();
-            editor.doSave(null);
-		} catch (InvocationTargetException e) {
-			MessageDialog.openError(PDEPlugin.getActiveWorkbenchShell(), PDEUIMessages.OverviewPage_error, e.getCause().getMessage()); 
-		} catch (InterruptedException e) {
-		}
-	}
-    
-    private void updateBuildProperties() throws InvocationTargetException {
-       try {
-        InputContext context = getPDEEditor().getContextManager().findContext(BuildInputContext.CONTEXT_ID);
-        if (context != null) {
-               IBuildModel buildModel = (IBuildModel)context.getModel();
-               IBuild build = buildModel.getBuild();
-               IBuildEntry entry = build.getEntry("bin.includes"); //$NON-NLS-1$
-               if (entry == null) {
-                   entry = buildModel.getFactory().createEntry("bin.includes"); //$NON-NLS-1$
-                   build.add(entry);
-               } 
-               if (!entry.contains("META-INF")) //$NON-NLS-1$
-                   entry.addToken("META-INF/");           //$NON-NLS-1$
-           }
-        } catch (CoreException e) {
-            throw new InvocationTargetException(e);
-        }
-    }
-    
-    private void activateExtensionPages(String activePageId) {
-    	MessageDialog mdiag = new MessageDialog(PDEPlugin.getActiveWorkbenchShell(),
-				PDEUIMessages.OverviewPage_extensionPageMessageTitle, null, 
-				PDEUIMessages.OverviewPage_extensionPageMessageBody,
-				MessageDialog.QUESTION, new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL }, 0);
-        if (mdiag.open() != MessageDialog.OK)
-        	return;
-        try {
-        	ManifestEditor manifestEditor = (ManifestEditor)getEditor();
-        	manifestEditor.addExtensionTabs();
-        	manifestEditor.setShowExtensions(true);
-        	manifestEditor.setActivePage(activePageId);
-		} catch (PartInitException e) {
-		} catch (BackingStoreException e) {
-		}
-    }
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/PackageSelectionDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/PackageSelectionDialog.java
deleted file mode 100644
index 785cc4a..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/PackageSelectionDialog.java
+++ /dev/null

@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-
-import java.util.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.dialogs.*;
-
-public class PackageSelectionDialog extends ElementListSelectionDialog {
-
-	/**
-	 * @param parent
-	 * @param renderer
-	 */
-	public PackageSelectionDialog(Shell parent, ILabelProvider renderer, IJavaProject jProject, Vector existingPackages, boolean allowJava) {
-		super(parent, renderer);
-		setElements(jProject, existingPackages, allowJava);
-		setMultipleSelection(true);
-		setMessage(PDEUIMessages.PackageSelectionDialog_label);
-	}
-	/**
-	 * 
-	 */
-	private void setElements(IJavaProject jProject, Vector existingPackages, boolean allowJava) {
-		HashMap map = new HashMap();
-		try {
-			IPackageFragmentRoot[] roots = getRoots(jProject);
-			for (int i = 0; i < roots.length; i++) {
-				IJavaElement[] children = roots[i].getChildren();
-				for (int j = 0; j < children.length; j++) {
-					IPackageFragment fragment = (IPackageFragment)children[j];
-					String name = fragment.getElementName();
-					if (fragment.hasChildren() && !existingPackages.contains(name)) {
-						if (!name.equals("java") || !name.startsWith("java.") || allowJava) //$NON-NLS-1$ //$NON-NLS-2$
-							map.put(fragment.getElementName(), fragment);
-					}
-				}
-			}
-		} catch (JavaModelException e) {
-		}
-		setElements(map.values().toArray());
-	}
-	
-	private IPackageFragmentRoot[] getRoots(IJavaProject jProject) {
-		ArrayList result = new ArrayList();
-		try {
-			IPackageFragmentRoot[] roots = jProject.getPackageFragmentRoots();
-			for (int i = 0; i < roots.length; i++) {
-				if (roots[i].getKind() == IPackageFragmentRoot.K_SOURCE
-						|| (roots[i].isArchive() && !roots[i].isExternal())) {
-					result.add(roots[i]);
-				}
-			}
-		} catch (JavaModelException e) {
-		}
-		return (IPackageFragmentRoot[])result.toArray(new IPackageFragmentRoot[result.size()]);	
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.dialogs.ElementListSelectionDialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		Control control = super.createDialogArea(parent);
-		getShell().setText(PDEUIMessages.PackageSelectionDialog_title); 
-		return control;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/PluginExportAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/PluginExportAction.java
deleted file mode 100644
index 694b204..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/PluginExportAction.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.pde.core.IModel;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.pde.internal.ui.wizards.ResizableWizardDialog;
-import org.eclipse.pde.internal.ui.wizards.exports.PluginExportWizard;
-import org.eclipse.ui.PlatformUI;
-
-/**
- *
- */
-public class PluginExportAction extends Action {
-	private PDEFormEditor fEditor;
-	public PluginExportAction(PDEFormEditor editor) {
-		fEditor = editor;
-	}
-	public PluginExportAction() {
-	}
-	private void ensureContentSaved() {
-		if (fEditor.isDirty()) {
-			try {
-				IRunnableWithProgress op = new IRunnableWithProgress() {
-					public void run(IProgressMonitor monitor) {
-						fEditor.doSave(monitor);
-					}
-				};
-				PlatformUI.getWorkbench().getProgressService().runInUI(
-						PDEPlugin.getActiveWorkbenchWindow(), op,
-						PDEPlugin.getWorkspace().getRoot());
-			} catch (InvocationTargetException e) {
-				PDEPlugin.logException(e);
-			} catch (InterruptedException e) {
-			}
-		}
-	}
-	public void run() {
-		if (fEditor != null)
-			ensureContentSaved();
-		PluginExportWizard wizard = new PluginExportWizard();
-		IStructuredSelection selection;
-		IResource resource = null;
-		if (fEditor != null)
-			resource = ((IModel) fEditor.getAggregateModel())
-					.getUnderlyingResource();
-		if (resource != null)
-			selection = new StructuredSelection(resource);
-		else
-			selection = new StructuredSelection();
-		wizard.init(PlatformUI.getWorkbench(), selection);
-		WizardDialog wd = new ResizableWizardDialog(PDEPlugin
-				.getActiveWorkbenchShell(), wizard);
-		wd.create();
-		//wd.getShell().setSize(450, 600);
-		int result = wd.open();
-		notifyResult(result == WizardDialog.OK);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/PluginGeneralInfoSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/PluginGeneralInfoSection.java
deleted file mode 100644
index 8460168..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/PluginGeneralInfoSection.java
+++ /dev/null

@@ -1,229 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-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.core.search.SearchEngine;
-import org.eclipse.jdt.ui.IJavaElementSearchConstants;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.pde.core.plugin.IPlugin;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.ICoreConstants;
-import org.eclipse.pde.internal.core.TargetPlatform;
-import org.eclipse.pde.internal.core.bundle.BundlePluginBase;
-import org.eclipse.pde.internal.core.ibundle.IBundle;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.model.bundle.Bundle;
-import org.eclipse.pde.internal.ui.model.bundle.LazyStartHeader;
-import org.eclipse.pde.internal.ui.model.bundle.ManifestHeader;
-import org.eclipse.pde.internal.ui.parts.FormEntry;
-import org.eclipse.pde.internal.ui.util.SWTUtil;
-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.ui.IActionBars;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.SelectionDialog;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-
-public class PluginGeneralInfoSection extends GeneralInfoSection {
-
-	private FormEntry fClassEntry;
-	private Button fLazyStart;
-
-	public PluginGeneralInfoSection(PDEFormPage page, Composite parent) {
-		super(page, parent);
-	}
-	
-	protected String getSectionDescription() {
-		return PDEUIMessages.ManifestEditor_PluginSpecSection_desc; 
-	}
-	
-	protected void createSpecificControls(Composite parent, FormToolkit toolkit, IActionBars actionBars) {
-		createClassEntry(parent, toolkit, actionBars);		
-		if (isBundle()) {
-			createLazyStart(parent, toolkit, actionBars);
-		}
-	}
-	
-	private void createLazyStart(Composite parent, FormToolkit toolkit, IActionBars actionBars) {
-		fLazyStart = toolkit.createButton(parent, PDEUIMessages.PluginGeneralInfoSection_lazyStart, SWT.CHECK);
-		TableWrapData td = new TableWrapData();
-		td.colspan = 3;
-		fLazyStart.setLayoutData(td);
-		fLazyStart.setEnabled(isEditable());
-		fLazyStart.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				ManifestHeader header = getLazyStartHeader();
-				if (header instanceof LazyStartHeader) {
-					((LazyStartHeader)header).setLazyStart(fLazyStart.getSelection());
-				} else {
-					getBundle().setHeader(getLazyStartHeaderName(), 
-							Boolean.toString(fLazyStart.getSelection()));
-				}
-			}
-		});
-	}
-	
-	private void createClassEntry(Composite client, FormToolkit toolkit, IActionBars actionBars) {
-		fClassEntry = new FormEntry(
-							client,
-							toolkit,
-							PDEUIMessages.GeneralInfoSection_class,  
-							PDEUIMessages.GeneralInfoSection_browse, // 
-							isEditable());
-		fClassEntry.setFormEntryListener(new FormEntryAdapter(this, actionBars) {
-			public void textValueChanged(FormEntry entry) {
-				try {
-					((IPlugin) getPluginBase()).setClassName(entry.getValue());
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-			public void linkActivated(HyperlinkEvent e) {
-				String value = fClassEntry.getValue();
-				IProject project = getPage().getPDEEditor().getCommonProject();
-				try {
-					if (project.hasNature(JavaCore.NATURE_ID)) {
-						IJavaProject javaProject = JavaCore.create(project);
-						IJavaElement element = javaProject.findType(value.replace('$', '.'));
-						if (element != null)
-							JavaUI.openInEditor(element);
-						else {
-							JavaAttributeWizard wizard = new JavaAttributeWizard(createJavaAttributeValue());
-							WizardDialog dialog = new WizardDialog(PDEPlugin.getActiveWorkbenchShell(), wizard);
-							dialog.create();
-							SWTUtil.setDialogSize(dialog, 400, 500);
-							if (dialog.open() == WizardDialog.OK) {
-								fClassEntry.setValue(wizard.getClassNameWithArgs());
-							}
-						}
-					}
-				} catch (PartInitException e1) {
-				} catch (CoreException e1) {
-				}
-			}
-			public void browseButtonSelected(FormEntry entry) {
-				doOpenSelectionDialog();
-			}
-		});
-		fClassEntry.setEditable(isEditable());
-	}
-	
-	private void doOpenSelectionDialog() {
-		try {
-			IResource resource = getPluginBase().getModel().getUnderlyingResource();
-			IProject project = (resource == null) ? null : resource.getProject();
-			if (project != null) {
-				SelectionDialog dialog = JavaUI.createTypeDialog(
-						PDEPlugin.getActiveWorkbenchShell(),
-						PlatformUI.getWorkbench().getProgressService(),
-						getSearchScope(project),
-						IJavaElementSearchConstants.CONSIDER_CLASSES, 
-						false,
-						""); //$NON-NLS-1$
-				dialog.setTitle(PDEUIMessages.GeneralInfoSection_selectionTitle); 
-				if (dialog.open() == SelectionDialog.OK) {
-					IType type = (IType) dialog.getResult()[0];
-					fClassEntry.setValue(type.getFullyQualifiedName('$'));
-				}
-			}
-		} catch (CoreException e) {
-		}
-	}
-	
-	private IJavaSearchScope getSearchScope(IProject project) {
-		return SearchEngine.createJavaSearchScope(getDirectRoots(JavaCore.create(project)));
-	}
-	
-	private IPackageFragmentRoot[] getDirectRoots(IJavaProject project) {
-		ArrayList result = new ArrayList();
-		try {
-			IPackageFragmentRoot[] roots = project.getPackageFragmentRoots();
-			for (int i = 0; i < roots.length; i++) {
-				if (roots[i].getKind() == IPackageFragmentRoot.K_SOURCE
-						|| (roots[i].isArchive() && !roots[i].isExternal())) {
-					result.add(roots[i]);
-				}
-			}
-		} catch (JavaModelException e) {
-		}
-		return (IPackageFragmentRoot[]) result.toArray(new IPackageFragmentRoot[result.size()]);
-	}
-
-	private JavaAttributeValue createJavaAttributeValue() {
-		IProject project = getPage().getPDEEditor().getCommonProject();
-		IPluginModelBase model = (IPluginModelBase) getPage().getModel();
-		return new JavaAttributeValue(project, model, null, fClassEntry.getValue());
-	}
-	
-	public void cancelEdit() {
-		fClassEntry.cancelEdit();
-		super.cancelEdit();
-	}
-	
-	public void commit(boolean onSave) {
-		fClassEntry.commit();
-		super.commit(onSave);
-	}
-	
-	public void refresh() {
-		IPluginModelBase model = (IPluginModelBase) getPage().getModel();
-		IPlugin plugin = (IPlugin)model.getPluginBase();
-		fClassEntry.setValue(plugin.getClassName(), true);
-		if (fLazyStart != null) {
-			ManifestHeader header = getLazyStartHeader();
-			if (header instanceof LazyStartHeader) {
-				fLazyStart.setSelection(((LazyStartHeader)header).isLazyStart());
-			}
-		}
-		super.refresh();
-	}
-	
-	private ManifestHeader getLazyStartHeader() {
-		IBundle bundle = getBundle();
-		if (bundle instanceof Bundle) {
-			ManifestHeader header = ((Bundle)bundle).getManifestHeader(ICoreConstants.ECLIPSE_LAZYSTART);
-			if (header == null)
-				header = ((Bundle)bundle).getManifestHeader(ICoreConstants.ECLIPSE_AUTOSTART);
-			return header;
-		}
-		return null;
-	}
-	
-	private String getLazyStartHeaderName() {
-		if (TargetPlatform.getTargetVersion() >= 3.2
-				&& BundlePluginBase.getBundleManifestVersion(getBundle()) >= 2)
-			return ICoreConstants.ECLIPSE_LAZYSTART;
-		return ICoreConstants.ECLIPSE_AUTOSTART;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/PluginInputContext.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/PluginInputContext.java
deleted file mode 100644
index 0b4650a..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/PluginInputContext.java
+++ /dev/null

@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-
-import java.io.*;
-import java.util.*;
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.text.*;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.editor.context.*;
-import org.eclipse.pde.internal.ui.model.*;
-import org.eclipse.pde.internal.ui.model.plugin.*;
-import org.eclipse.text.edits.*;
-import org.eclipse.ui.*;
-
-public class PluginInputContext extends XMLInputContext {
-	public static final String CONTEXT_ID = "plugin-context"; //$NON-NLS-1$
-	private boolean fIsFragment;
-
-	public PluginInputContext(PDEFormEditor editor, IEditorInput input, boolean primary, boolean isFragment) {
-		super(editor, input, primary);
-		fIsFragment = isFragment;
-		create();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.InputContext#createModel(org.eclipse.ui.IEditorInput)
-	 */
-	protected IBaseModel createModel(IEditorInput input) throws CoreException {
-		PluginModelBase model = null;
-		if (input instanceof IStorageEditorInput) {
-			boolean isReconciling = input instanceof IFileEditorInput;
-			IDocument document = getDocumentProvider().getDocument(input);
-			if (fIsFragment) {
-				model = new FragmentModel(document, isReconciling);
-			} else {
-				model = new PluginModel(document, isReconciling);
-			}
-			if (input instanceof IFileEditorInput) {
-				IFile file = ((IFileEditorInput)input).getFile();
-				model.setUnderlyingResource(file);
-				model.setCharset(file.getCharset());
-			} else if (input instanceof SystemFileEditorInput){
-				File file = (File)((SystemFileEditorInput)input).getAdapter(File.class);
-				model.setInstallLocation(file.getParent());
-				model.setCharset(getDefaultCharset());
-			} else if (input instanceof JarEntryEditorInput){
-				File file = (File)((JarEntryEditorInput)input).getAdapter(File.class);
-				model.setInstallLocation(file.toString());
-				model.setCharset(getDefaultCharset());
-			} else {
-				model.setCharset(getDefaultCharset());				
-			}
-			model.load();
-		}
-		return model;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.InputContext#getId()
-	 */
-	public String getId() {
-		return CONTEXT_ID;
-	}
-	public boolean isFragment() {
-		return fIsFragment;
-	}
-	
-	protected void reorderInsertEdits(ArrayList ops) {
-		HashMap map = getOperationTable();
-		Iterator iter = map.keySet().iterator();
-		TextEdit runtimeInsert = null;
-		TextEdit requiresInsert = null;
-		ArrayList extensionPointInserts = new ArrayList();
-		ArrayList extensionInserts = new ArrayList();
-		
-		while (iter.hasNext()) {
-			Object object = iter.next();
-			if (object instanceof IDocumentNode) {
-				IDocumentNode node = (IDocumentNode)object;
-				if (node.getParentNode() instanceof PluginBaseNode) {
-					TextEdit edit = (TextEdit)map.get(node);
-					if (edit instanceof InsertEdit) {
-						if (node.getXMLTagName().equals("runtime")) { //$NON-NLS-1$
-							runtimeInsert = edit;
-						} else if (node.getXMLTagName().equals("requires")) { //$NON-NLS-1$
-							requiresInsert = edit;
-						} else if (node.getXMLTagName().equals("extension")) { //$NON-NLS-1$
-							extensionInserts.add(edit);
-						} else if (node.getXMLTagName().equals("extension-point")) { //$NON-NLS-1$
-							extensionPointInserts.add(edit);
-						}
-					}
-				}
-			}
-		}
-		
-		for (int i = 0; i < ops.size(); i++) {
-			TextEdit edit = (TextEdit)ops.get(i);
-			if (edit instanceof InsertEdit) {
-				if (extensionPointInserts.contains(edit)) {
-					ops.remove(edit);
-					ops.add(0, edit);
-				}
-			}
-		}
-		
-		if (requiresInsert != null) {
-			ops.remove(requiresInsert);
-			ops.add(0, requiresInsert);
-		}
-		
-		if (runtimeInsert != null) {
-			ops.remove(runtimeInsert);
-			ops.add(0, runtimeInsert);
-		}		
-	}
-	
-	public void doRevert() {
-		fEditOperations.clear();
-		fOperationTable.clear();
-		fMoveOperations.clear();
-		AbstractEditingModel model = (AbstractEditingModel)getModel();
-		model.reconciled(model.getDocument());
-	}
-	protected String getPartitionName() {
-		return "___plugin_partition"; //$NON-NLS-1$
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/PluginInputContextManager.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/PluginInputContextManager.java
deleted file mode 100644
index 57124b2..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/PluginInputContextManager.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.core.IModelChangeProviderExtension;
-import org.eclipse.pde.internal.core.bundle.*;
-import org.eclipse.pde.internal.core.ibundle.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.pde.internal.ui.editor.build.*;
-import org.eclipse.pde.internal.ui.editor.context.*;
-import org.eclipse.ui.forms.IFormPart;
-
-
-public class PluginInputContextManager extends InputContextManager {
-	private BundlePluginModelBase bmodel;
-	/**
-	 * 
-	 */
-	public PluginInputContextManager(PDEFormEditor editor) {
-		super(editor);
-	}
-
-	public IBaseModel getAggregateModel() {
-		if (bmodel!=null)
-			return bmodel;
-		return findPluginModel();
-	}
-	
-	public IModel getPluginModel() {
-		if (bmodel!=null)
-			return bmodel.getExtensionsModel();
-		return findPluginModel();
-	}
-	
-	protected void fireContextChange(InputContext context, boolean added) {
-		super.fireContextChange(context, added);
-		if (context.getId().equals(BundleInputContext.CONTEXT_ID)) {
-			if (added)// bundle arriving
-				bundleAdded(context);
-			else
-			// bundle going away
-			bundleRemoved(context);
-		}
-		else if (context.getId().equals(BuildInputContext.CONTEXT_ID)) {
-			if (added)
-				buildAdded(context);
-			else
-				buildRemoved(context);
-		}
-		else if (context.getId().equals(PluginInputContext.CONTEXT_ID)) {
-			if (added)
-				pluginAdded(context);
-			else
-				pluginRemoved(context);
-		}
-	}
-	private void bundleAdded(InputContext bundleContext) {
-		IBundleModel model = (IBundleModel)bundleContext.getModel();
-		if (model.isFragmentModel())
-			bmodel = new BundleFragmentModel();
-		else
-			bmodel = new BundlePluginModel();
-		bmodel.setBundleModel(model);
-		syncExtensions();
-	}
-	
-	private void syncExtensions() {
-		IModel emodel = findPluginModel();
-		if (emodel!=null && emodel instanceof ISharedExtensionsModel) {
-			bmodel.setExtensionsModel((ISharedExtensionsModel)emodel);
-			transferListeners(emodel, bmodel);
-		}
-		else
-			bmodel.setExtensionsModel(null);
-	}
-	
-	private IModel findPluginModel() {
-		InputContext pcontext = findContext(PluginInputContext.CONTEXT_ID);
-		return (pcontext != null) ? (IModel)pcontext.getModel() : null;
-	}
-
-	private void bundleRemoved(InputContext bundleContext) {
-		if (bmodel!=null) {
-			BundlePluginModelBase preserved = bmodel;
-			bmodel = null;
-			IModel emodel = findPluginModel();
-			if (emodel!=null) 
-				transferListeners(preserved, emodel);
-		}
-	}
-	
-	private void transferListeners(IModel source, IModel target) {
-		if (source instanceof IModelChangeProviderExtension &&
-				target instanceof IModelChangeProviderExtension) {
-			IModelChangeProviderExtension smodel = (IModelChangeProviderExtension)source;
-			IModelChangeProviderExtension tmodel = (IModelChangeProviderExtension)target;
-			// first fire one last event to all the listeners to 
-			// refresh
-			smodel.fireModelChanged(new ModelChangedEvent(smodel, IModelChangedEvent.WORLD_CHANGED, null, null));
-			// now pass the listener to the target model
-			smodel.transferListenersTo(tmodel, new IModelChangedListenerFilter() {
-				public boolean accept(IModelChangedListener listener) {
-					if (listener instanceof IFormPart ||
-							listener instanceof FormOutlinePage)
-						return true;
-					return false;
-				}
-			});
-		}
-	}
-	
-	private void pluginAdded(InputContext pluginContext) {
-		if (bmodel!=null)
-			syncExtensions();
-	}
-	private void pluginRemoved(InputContext pluginContext) {
-		if (bmodel!=null)
-			syncExtensions();
-	}
-	private void buildAdded(InputContext buildContext) {
-	}
-	private void buildRemoved(InputContext buildContext) {
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/PluginUndoManager.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/PluginUndoManager.java
deleted file mode 100644
index 1f82a5a..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/PluginUndoManager.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.core.build.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.build.*;
-import org.eclipse.pde.internal.core.plugin.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.model.plugin.*;
-import org.eclipse.pde.internal.ui.model.plugin.PluginObjectNode;
-import org.eclipse.pde.internal.ui.model.plugin.PluginAttribute;
-
-/**
- * @version 	1.0
- * @author
- */
-public class PluginUndoManager extends ModelUndoManager {
-	
-	public PluginUndoManager(PDEFormEditor editor) {
-		super(editor);
-		setUndoLevelLimit(30);
-	}
-
-	protected String getPageId(Object obj) {
-		if (obj instanceof IPluginBase)
-			return OverviewPage.PAGE_ID;
-		if (obj instanceof IPluginImport)
-			return DependenciesPage.PAGE_ID;
-		if (obj instanceof IPluginLibrary 
-			|| (obj instanceof IPluginElement  && ((IPluginElement)obj).getParent() instanceof IPluginLibrary))
-			return RuntimePage.PAGE_ID;
-		if (obj instanceof IPluginExtension 
-			|| (obj instanceof IPluginElement  && ((IPluginElement)obj).getParent() instanceof IPluginParent)
-			|| obj instanceof IPluginAttribute)
-			return ExtensionsPage.PAGE_ID;
-		if (obj instanceof IPluginExtensionPoint)
-			return ExtensionPointsPage.PAGE_ID;
-		return null;
-	}
-	
-	protected void execute(IModelChangedEvent event, boolean undo) {
-		Object[] elements = event.getChangedObjects();
-		int type = event.getChangeType();
-		String propertyName = event.getChangedProperty();
-		IModelChangeProvider model = event.getChangeProvider();
-
-		switch (type) {
-			case IModelChangedEvent.INSERT :
-				if (undo)
-					executeRemove(model, elements);
-				else
-					executeAdd(model, elements);
-				break;
-			case IModelChangedEvent.REMOVE :
-				if (undo)
-					executeAdd(model, elements);
-				else
-					executeRemove(model, elements);
-				break;
-			case IModelChangedEvent.CHANGE :
-				if (event instanceof AttributeChangedEvent) {
-					executeAttributeChange((AttributeChangedEvent) event, undo);
-				} else {
-					if (undo)
-						executeChange(
-							elements[0],
-							propertyName,
-							event.getNewValue(),
-							event.getOldValue());
-					else
-						executeChange(
-							elements[0],
-							propertyName,
-							event.getOldValue(),
-							event.getNewValue());
-				}
-		}
-	}
-
-	private void executeAdd(IModelChangeProvider model, Object[] elements) {
-		IPluginBase pluginBase=null;
-		IBuild build=null;
-		if (model instanceof IPluginModelBase)
-			pluginBase = ((IPluginModelBase)model).getPluginBase();
-		if (model instanceof IBuildModel)
-			build = ((IBuildModel)model).getBuild();
-		
-		try {
-			for (int i = 0; i < elements.length; i++) {
-				Object element = elements[i];
-
-				if (element instanceof IPluginImport) {
-					pluginBase.add((IPluginImport) element);
-				} else if (element instanceof IPluginLibrary) {
-					pluginBase.add((IPluginLibrary) element);
-				} else if (element instanceof IPluginExtensionPoint) {
-					pluginBase.add((IPluginExtensionPoint) element);
-				} else if (element instanceof IPluginExtension) {
-					pluginBase.add((IPluginExtension) element);
-				} else if (element instanceof IPluginElement) {
-					IPluginElement e = (IPluginElement) element;
-					Object parent = e.getParent();
-					if (parent instanceof PluginLibraryNode && e instanceof PluginElementNode) {
-						((PluginLibraryNode)parent).addContentFilter((PluginElementNode)e);
-					} else if (parent instanceof IPluginParent) {
-						((IPluginParent)parent).add(e);
-					}
-				} else if (element instanceof IBuildEntry) {
-					IBuildEntry e = (IBuildEntry)element;
-					build.add(e);
-				}
-			}
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-	
-	private void executeRemove(IModelChangeProvider model, Object[] elements) {
-		IPluginBase pluginBase=null;
-		IBuild build=null;
-		if (model instanceof IPluginModelBase)
-			pluginBase = ((IPluginModelBase)model).getPluginBase();
-		if (model instanceof IBuildModel)
-			build = ((IBuildModel)model).getBuild();
-
-		try {
-			for (int i = 0; i < elements.length; i++) {
-				Object element = elements[i];
-
-				if (element instanceof IPluginImport) {
-					pluginBase.remove((IPluginImport) element);
-				} else if (element instanceof IPluginLibrary) {
-					pluginBase.remove((IPluginLibrary) element);
-				} else if (element instanceof IPluginExtensionPoint) {
-					pluginBase.remove((IPluginExtensionPoint) element);
-				} else if (element instanceof IPluginExtension) {
-					pluginBase.remove((IPluginExtension) element);
-				} else if (element instanceof IPluginElement) {
-					IPluginElement e = (IPluginElement) element;
-					Object parent = e.getParent();
-					if (parent instanceof PluginLibraryNode && e instanceof PluginElementNode) {
-						((PluginLibraryNode)parent).removeContentFilter((PluginElementNode)e);
-					} else if (parent instanceof IPluginParent) {
-						((IPluginParent)parent).remove(e);
-					}
-				} else if (element instanceof IBuildEntry) {
-					IBuildEntry e = (IBuildEntry)element;
-					build.remove(e);
-				}
-			}
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	private void executeAttributeChange(AttributeChangedEvent e, boolean undo) {
-		PluginElement element = (PluginElement) e.getChangedObjects()[0];
-		PluginAttribute att = (PluginAttribute) e.getChagedAttribute();
-		Object oldValue = e.getOldValue();
-		Object newValue = e.getNewValue();
-		try {
-			if (undo)
-				element.setAttribute(att.getName(), oldValue.toString());
-			else
-				element.setAttribute(att.getName(), newValue.toString());
-		} catch (CoreException ex) {
-			PDEPlugin.logException(ex);
-		}
-	}
-
-	private void executeChange(
-		Object element,
-		String propertyName,
-		Object oldValue,
-		Object newValue) {
-		if (element instanceof PluginObject) {
-			PluginObject pobj = (PluginObject) element;
-			try {
-				pobj.restoreProperty(propertyName, oldValue, newValue);
-			} catch (CoreException e) {
-				PDEPlugin.logException(e);
-			}
-		}
-		else if (element instanceof BuildObject) {
-			BuildObject bobj = (BuildObject) element;
-			try {
-				bobj.restoreProperty(propertyName, oldValue, newValue);
-			} catch (CoreException e) {
-				PDEPlugin.logException(e);
-			}
-		}
-		else if (element instanceof PluginObjectNode) {
-			PluginObjectNode node = (PluginObjectNode)element;
-			String newString = newValue!=null?newValue.toString():null;
-			node.setXMLAttribute(propertyName, newString);
-		}
-	}
-
-	public void modelChanged(IModelChangedEvent event) {
-		if (event.getChangeType() == IModelChangedEvent.CHANGE) {
-			Object changedObject = event.getChangedObjects()[0];
-			if (changedObject instanceof IPluginObject) {
-				IPluginObject obj = (IPluginObject) event.getChangedObjects()[0];
-				//Ignore events from objects that are not yet in the model.
-				if (!(obj instanceof IPluginBase) && obj.isInTheModel() == false)
-					return;
-			}
-			if (changedObject instanceof IBuildObject) {
-				IBuildObject obj = (IBuildObject) event.getChangedObjects()[0];
-				//Ignore events from objects that are not yet in the model.
-				if (obj.isInTheModel() == false)
-					return;
-			}
-		}
-		super.modelChanged(event);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/RequiredExecutionEnvironmentSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/RequiredExecutionEnvironmentSection.java
deleted file mode 100644
index 54c3273..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/RequiredExecutionEnvironmentSection.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-import org.eclipse.pde.core.IBaseModel;
-import org.eclipse.pde.core.IModelChangeProvider;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.ibundle.IBundleModel;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.PDESection;
-import org.eclipse.pde.internal.ui.editor.context.InputContextManager;
-import org.eclipse.pde.internal.ui.model.bundle.Bundle;
-import org.eclipse.pde.internal.ui.model.bundle.ManifestHeader;
-import org.eclipse.pde.internal.ui.model.bundle.RequiredExecutionEnvironmentHeader;
-import org.eclipse.pde.internal.ui.parts.ComboPart;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.forms.FormColors;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
-import org.osgi.framework.Constants;
-
-public class RequiredExecutionEnvironmentSection extends PDESection {
-
-	private ComboPart fJRECombo;
-	private ComboPart fJ2MECombo;
-	
-	public RequiredExecutionEnvironmentSection(PDEFormPage page, Composite parent) {
-		super(page, parent, Section.TITLE_BAR);
-		createClient(getSection(), page.getEditor().getToolkit());
-	}
-
-	protected void createClient(Section section, FormToolkit toolkit) {
-		section.setText(PDEUIMessages.RequiredExecutionEnvironmentSection_title); 
-		section.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
-		
-		Composite client = toolkit.createComposite(section);
-		TableWrapLayout layout = new TableWrapLayout();
-		layout.leftMargin = layout.rightMargin = toolkit.getBorderStyle() != SWT.NULL ? 0 : 2;
-		layout.numColumns = 2;
-		client.setLayout(layout);
-		section.setClient(client);
-		
-		createJRECombo(client, toolkit);
-		createCDCJRECombo(client, toolkit);
-		hookComboListeners();
-		
-		toolkit.paintBordersFor(client);
-		
-		IBaseModel model = getPage().getModel();
-		if (model instanceof IModelChangeProvider)
-			((IModelChangeProvider) model).addModelChangedListener(this);
-	}
-	
-	private void createJRECombo(Composite client, FormToolkit toolkit) {
-		TableWrapData twd = new TableWrapData();
-		twd.colspan = 2;
-		Label descLabel = toolkit.createLabel(client, 
-				isFragment() ? PDEUIMessages.RequiredExecutionEnvironmentSection_fminJRE
-							 : PDEUIMessages.RequiredExecutionEnvironmentSection_minJRE);
-		descLabel.setLayoutData(twd);
-		
-		Label standardLabel = toolkit.createLabel(client, PDEUIMessages.RequiredExecutionEnvironmentSection_jreProfile); 
-		standardLabel.setForeground(toolkit.getColors().getColor(FormColors.TITLE));
-		TableWrapData td = new TableWrapData();
-		td.valign = TableWrapData.MIDDLE;
-		standardLabel.setLayoutData(td);
-		
-		fJRECombo = new ComboPart();
-		fJRECombo.createControl(client, toolkit, SWT.READ_ONLY);
-		td = new TableWrapData(TableWrapData.FILL_GRAB);
-		td.valign = TableWrapData.MIDDLE;
-		fJRECombo.getControl().setLayoutData(td);
-		fJRECombo.setItems(RequiredExecutionEnvironmentHeader.getJRES());
-		fJRECombo.add("", 0); //$NON-NLS-1$
-		fJRECombo.getControl().setEnabled(isEditable());
-	}
-	
-	private void createCDCJRECombo(Composite client, FormToolkit toolkit) {
-		TableWrapData twd = new TableWrapData();
-		twd.colspan = 2;
-		Label descLabel = toolkit.createLabel(client, 
-											isFragment() ? PDEUIMessages.RequiredExecutionEnvironmentSection_fminJ2ME
-											: PDEUIMessages.RequiredExecutionEnvironmentSection_minJ2ME);
-		descLabel.setLayoutData(twd);
-		
-		Label foundationLabel = toolkit.createLabel(client, PDEUIMessages.RequiredExecutionEnvironmentSection_j2meProfile); 
-		foundationLabel.setForeground(toolkit.getColors().getColor(FormColors.TITLE));
-		TableWrapData td = new TableWrapData();
-		td.valign = TableWrapData.MIDDLE;
-		foundationLabel.setLayoutData(td);
-		
-		fJ2MECombo = new ComboPart();
-		fJ2MECombo.createControl(client, toolkit, SWT.READ_ONLY);
-		td = new TableWrapData(TableWrapData.FILL_GRAB);
-		td.valign = TableWrapData.MIDDLE;
-		fJ2MECombo.getControl().setLayoutData(td);
-		fJ2MECombo.setItems(RequiredExecutionEnvironmentHeader.getJ2MES());
-		fJ2MECombo.add("", 0); //$NON-NLS-1$
-		fJ2MECombo.getControl().setEnabled(isEditable());
-	}
-	
-	public void refresh() {
-		RequiredExecutionEnvironmentHeader header = getHeader();
-		if (header != null) {
-			String minJ2ME = header.getMinimumJ2ME();
-			String minJRE = header.getMinimumJRE();
-			if (minJ2ME != null) fJ2MECombo.setText(minJ2ME);
-			else fJ2MECombo.setText(""); //$NON-NLS-1$
-			if (minJRE != null) fJRECombo.setText(minJRE);
-			else fJRECombo.setText(""); //$NON-NLS-1$
-		} else {
-			fJ2MECombo.setText(""); //$NON-NLS-1$
-			fJRECombo.setText(""); //$NON-NLS-1$
-		}
-	}
-	
-	public void hookComboListeners() {
-		fJRECombo.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleSelection(fJRECombo.getSelection(), true);
-			}
-		});
-		fJ2MECombo.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleSelection(fJ2MECombo.getSelection(), false);
-			}
-		});
-	}
-	
-	private BundleInputContext getBundleContext() {
-		InputContextManager manager = getPage().getPDEEditor().getContextManager();
-		return (BundleInputContext) manager.findContext(BundleInputContext.CONTEXT_ID);
-	}
-	
-	private Bundle getBundle() {
-		BundleInputContext context = getBundleContext();
-		if (context != null) {
-			IBundleModel model = (IBundleModel)context.getModel();
-			return (Bundle)model.getBundle();
-		}
-		return null;
-	}
-	
-	private void handleSelection(String newValue, boolean isJRE) {
-		RequiredExecutionEnvironmentHeader header = getHeader();
-		if (header != null) {
-			if (isJRE)
-				newValue = header.updateJRE(newValue);
-			else
-				newValue = header.updateJ2ME(newValue);
-		}
-		getBundle().setHeader(Constants.BUNDLE_REQUIREDEXECUTIONENVIRONMENT, newValue);
-	}
-	
-	private RequiredExecutionEnvironmentHeader getHeader() {
-		ManifestHeader header = getBundle().getManifestHeader(Constants.BUNDLE_REQUIREDEXECUTIONENVIRONMENT);
-		if (header != null && header instanceof RequiredExecutionEnvironmentHeader)
-			return (RequiredExecutionEnvironmentHeader) header;
-		return null;
-	}
-	
-	private boolean isFragment() {
-		InputContextManager manager = getPage().getPDEEditor().getContextManager();
-		IPluginModelBase model = (IPluginModelBase) manager.getAggregateModel();
-		return model.isFragmentModel();
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/RequiresSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/RequiresSection.java
deleted file mode 100644
index 3c38c5f..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/RequiresSection.java
+++ /dev/null

@@ -1,518 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-
-import java.io.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.core.plugin.*;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.TableSection;
-import org.eclipse.pde.internal.ui.elements.DefaultTableProvider;
-import org.eclipse.pde.internal.ui.parts.TablePart;
-import org.eclipse.pde.internal.ui.search.*;
-import org.eclipse.pde.internal.ui.search.dependencies.*;
-import org.eclipse.pde.internal.ui.util.*;
-import org.eclipse.pde.internal.ui.wizards.PluginSelectionDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.actions.*;
-import org.eclipse.ui.forms.widgets.*;
-
-public class RequiresSection
-	extends TableSection
-	implements IModelChangedListener, IModelProviderListener {
-    
-    private static final int ADD_INDEX = 0;
-    private static final int REMOVE_INDEX = 1;
-    private static final int UP_INDEX = 2;
-    private static final int DOWN_INDEX = 3;
-    private static final int PROPERTIES_INDEX = 4;
-    
-	private TableViewer fImportViewer;
-	private Vector fImports;
-	private Action fOpenAction;
-	private Action fAddAction;
-	private Action fRemoveAction;
-    private Action fPropertiesAction;
-
-	class ImportContentProvider extends DefaultTableProvider {
-		public Object[] getElements(Object parent) {
-			if (fImports == null) {
-				createImportObjects();
-			}
-			return fImports.toArray();
-		}
-		private void createImportObjects() {
-			fImports = new Vector();
-			IPluginModelBase model = (IPluginModelBase) getPage().getModel();
-			IPluginImport[] iimports = model.getPluginBase().getImports();
-			for (int i = 0; i < iimports.length; i++) {
-				IPluginImport iimport = iimports[i];
-				fImports.add(new ImportObject(iimport));
-			}
-		}
-	}
-
-	public RequiresSection(DependenciesPage page, Composite parent, String[] labels) {
-		super(page, parent, Section.DESCRIPTION, labels);
-		getSection().setText(PDEUIMessages.RequiresSection_title); 
-		boolean fragment = ((IPluginModelBase)getPage().getModel()).isFragmentModel();
-		if (fragment)
-			getSection().setDescription(PDEUIMessages.RequiresSection_fDesc); 
-		else
-			getSection().setDescription(PDEUIMessages.RequiresSection_desc); 
-		getTablePart().setEditable(false);
-	}
-
-	public void createClient(Section section, FormToolkit toolkit) {
-		Composite container = createClientContainer(section, 2, toolkit);
-		createViewerPartControl(container, SWT.SINGLE, 2, toolkit);
-		TablePart tablePart = getTablePart();
-		fImportViewer = tablePart.getTableViewer();
-
-		fImportViewer.setContentProvider(new ImportContentProvider());
-		fImportViewer.setLabelProvider(PDEPlugin.getDefault().getLabelProvider());
-		toolkit.paintBordersFor(container);
-		makeActions();
-		section.setClient(container);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.minimumWidth = 250;
-		if (!isBundle())
-			gd.verticalSpan = 2;
-		section.setLayoutData(gd);
-		initialize();
-	}
-
-	protected void selectionChanged(IStructuredSelection sel) {
-		getPage().getPDEEditor().setSelection(sel);
-		updateButtons();
-	}
-	
-	private void updateButtons() {
-		Table table = getTablePart().getTableViewer().getTable();
-		TableItem[] selection = table.getSelection();
-		boolean hasSelection = selection.length > 0;
-		boolean canMove = table.getItemCount() > 1;
-		TablePart tablePart = getTablePart();
-        tablePart.setButtonEnabled(ADD_INDEX, isEditable());
-		tablePart.setButtonEnabled(
-			UP_INDEX,
-			canMove && isEditable() && hasSelection && table.getSelectionIndex() > 0);
-		tablePart.setButtonEnabled(
-			DOWN_INDEX,
-			canMove
-				&& hasSelection && isEditable()
-				&& table.getSelectionIndex() < table.getItemCount() - 1);
-        if (isBundle())
-            tablePart.setButtonEnabled(PROPERTIES_INDEX, hasSelection);
-        tablePart.setButtonEnabled(REMOVE_INDEX, isEditable() && hasSelection);
-	}
-
-	protected void handleDoubleClick(IStructuredSelection sel) {
-		handleOpen(sel);
-	}
-
-	protected void buttonSelected(int index) {
-		switch (index) {
-			case ADD_INDEX:
-				handleAdd();
-				break;
-            case REMOVE_INDEX:
-                handleRemove();
-                break;
- 			case UP_INDEX:
-				handleUp();
-				break;
-			case DOWN_INDEX:
-				handleDown();
-                break;
-            case PROPERTIES_INDEX:
-                handleOpenProperties();
-                break;
-		} 
-	}
-    
-    private void handleOpenProperties() {
-        Object changeObject = ((IStructuredSelection)fImportViewer.getSelection()).getFirstElement();
-        IPluginImport importObject = ((ImportObject) changeObject).getImport();
-
-        DependencyPropertiesDialog dialog = new DependencyPropertiesDialog(
-                                            isEditable(),
-                                            importObject);
-        dialog.create();
-        SWTUtil.setDialogSize(dialog, 400, -1);
-        dialog.setTitle(importObject.getId());
-        if (dialog.open() == DependencyPropertiesDialog.OK && isEditable()) {
-            try {
-                importObject.setOptional(dialog.isOptional());
-                importObject.setReexported(dialog.isReexported());
-                importObject.setVersion(dialog.getVersion());
-            } catch (CoreException e) {
-               PDEPlugin.logException(e);
-            }
-         }
-    }
-
-	public void dispose() {
-		IPluginModelBase model = (IPluginModelBase) getPage().getModel();
-		if (model!=null)
-			model.removeModelChangedListener(this);
-		PDECore.getDefault().getWorkspaceModelManager().removeModelProviderListener(
-			this);
-		PDECore.getDefault().getExternalModelManager().removeModelProviderListener(
-			this);
-		super.dispose();
-	}
-	public boolean doGlobalAction(String actionId) {
-		if (actionId.equals(ActionFactory.DELETE.getId())) {
-			handleRemove();
-			return true;
-		}
-		if (actionId.equals(ActionFactory.CUT.getId())) {
-			// delete here and let the editor transfer
-			// the selection to the clipboard
-			handleRemove();
-			return false;
-		}
-		if (actionId.equals(ActionFactory.PASTE.getId())) {
-			doPaste();
-			return true;
-		}
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#doPaste()
-	 */
-	protected void doPaste() {
-	}
-
-	public boolean setFormInput(Object object) {
-		if (object instanceof IPluginImport) {
-			ImportObject iobj = new ImportObject((IPluginImport) object);
-			fImportViewer.setSelection(new StructuredSelection(iobj), true);
-			return true;
-		}
-		return false;
-	}
-
-	protected void fillContextMenu(IMenuManager manager) {
-		ISelection selection = fImportViewer.getSelection();
-		manager.add(fAddAction);
-		if (!selection.isEmpty()) {
-			manager.add(fOpenAction);
-		}
-		manager.add(new Separator());
-		getPage().contextMenuAboutToShow(manager);
-		
-		if (!selection.isEmpty())
-			manager.add(fRemoveAction);
-		getPage().getPDEEditor().getContributor().contextMenuAboutToShow(
-			manager);
-		manager.add(new Separator());
-		
-		PluginSearchActionGroup actionGroup = new PluginSearchActionGroup();
-		actionGroup.setContext(new ActionContext(selection));
-		actionGroup.fillContextMenu(manager);
-		if (((IModel)getPage().getModel()).getUnderlyingResource()!=null) {
-			manager.add(new UnusedDependenciesAction((IPluginModelBase) getPage().getModel(), false));
-		}
-        if (fPropertiesAction != null && !fImportViewer.getSelection().isEmpty()) {
-            manager.add(new Separator());
-            manager.add(fPropertiesAction);
-        }
-	}
-
-	private void handleOpen(ISelection sel) {
-		if (sel instanceof IStructuredSelection) {
-			IStructuredSelection ssel = (IStructuredSelection) sel;
-			if (ssel.size() == 1) {
-                Object obj = ssel.getFirstElement();
-                if (obj instanceof ImportObject) {
-                    IPlugin plugin = ((ImportObject) obj).getPlugin();
-                    if (plugin != null)
-                         ManifestEditor.open(plugin, false);
-                }
-			}
-		}
-	}
-	
-	private void handleRemove() {
-		IStructuredSelection ssel = (IStructuredSelection) fImportViewer.getSelection();
-		IPluginModelBase model = (IPluginModelBase) getPage().getModel();
-		IPluginBase pluginBase = model.getPluginBase();
-		try {
-			for (Iterator iter = ssel.iterator(); iter.hasNext();) {
-				ImportObject iobj = (ImportObject) iter.next();
-				pluginBase.remove(iobj.getImport());
-			}
-		} catch (CoreException e) {
-            PDEPlugin.logException(e);
-		}
-        updateButtons();
-	}
-    
-	private void handleAdd() {
-		IPluginModelBase model = (IPluginModelBase) getPage().getModel();
-		PluginSelectionDialog dialog =
-			new PluginSelectionDialog(
-				PDEPlugin.getActiveWorkbenchShell(),
-				getAvailablePlugins(model),
-				true);
-		dialog.create();
-		if (dialog.open() == PluginSelectionDialog.OK) {
-			Object[] models = dialog.getResult();
-			for (int i = 0; i < models.length; i++) {
-				try {
-					IPluginModel candidate = (IPluginModel) models[i];
-					IPluginImport importNode = model.getPluginFactory().createImport();
-					importNode.setId(candidate.getPlugin().getId());
-					model.getPluginBase().add(importNode);
-				} catch (CoreException e) {
-				}
-			}
-		}
-	}
-	
-	private void handleUp() {
-		int index = getTablePart().getTableViewer().getTable().getSelectionIndex();
-		if (index < 1)
-			return;
-		swap(index, index - 1);
-	}
-	
-	private void handleDown() {
-		Table table = getTablePart().getTableViewer().getTable();
-		int index = table.getSelectionIndex();
-		if (index == table.getItemCount() - 1)
-			return;
-		swap(index, index + 1);		
-	}
-	
-	public void swap(int index1, int index2) {
-		Table table = getTablePart().getTableViewer().getTable();
-		IPluginImport dep1 = ((ImportObject)table.getItem(index1).getData()).getImport();
-		IPluginImport dep2 = ((ImportObject)table.getItem(index2).getData()).getImport();
-
-		try {
-			IPluginModelBase model = (IPluginModelBase) getPage().getModel();
-			IPluginBase pluginBase = model.getPluginBase();
-			pluginBase.swap(dep1, dep2);
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}		
-	}
-	
-	private IPluginModelBase[] getAvailablePlugins(IPluginModelBase model) {
-		IPluginModelBase[] plugins = PDECore.getDefault().getModelManager().getPluginsOnly();
-		HashSet existingImports = PluginSelectionDialog.getExistingImports(model.getPluginBase());
-		ArrayList result = new ArrayList();
-		for (int i = 0; i < plugins.length; i++) {
-			if (!existingImports.contains(plugins[i].getPluginBase().getId())) {
-				result.add(plugins[i]);
-			}
-		}
-
-		if (!existingImports.contains("system.bundle")) //$NON-NLS-1$
-			addSystemBundle(result);
-		return (IPluginModelBase[])result.toArray(new IPluginModelBase[result.size()]);
-	}
-	
-	private void addSystemBundle(java.util.List list) {
-		try {
-			ExternalPluginModel model = new ExternalPluginModel();
-			
-			// Need Install Location to load model.  Giving it org.eclipse.osgi's install location
-			IPluginModelBase osgi = PDECore.getDefault().getModelManager().findModel("org.eclipse.osgi"); //$NON-NLS-1$
-			model.setInstallLocation(osgi.getInstallLocation());
-			
-			// Load model from a String representing the contents of an equivalent plugin.xml file
-			String pluginInfo = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><plugin id=\"system.bundle\" name=\"System Bundle\"></plugin>"; //$NON-NLS-1$
-			InputStream is = new ByteArrayInputStream(pluginInfo.getBytes());
-			model.load(is, false);
-			
-			list.add(model);
-			
-		} catch (CoreException e) {
-		}
-	}
-
-
-	public void initialize() {
-		IPluginModelBase model = (IPluginModelBase) getPage().getModel();
-		if (model == null)
-			return;
-		fImportViewer.setInput(model.getPluginBase());
-        updateButtons();
-		model.addModelChangedListener(this);
-		PDECore.getDefault().getWorkspaceModelManager().addModelProviderListener(
-			this);
-		PDECore.getDefault().getExternalModelManager().addModelProviderListener(this);
-		fAddAction.setEnabled(model.isEditable());
-		fRemoveAction.setEnabled(model.isEditable());
-	}
-
-	private void makeActions() {
-		fAddAction = new Action(PDEUIMessages.RequiresSection_add) { 
-			public void run() {
-				handleAdd();
-			}
-		};
-		fOpenAction = new Action(PDEUIMessages.RequiresSection_open) { 
-			public void run() {
-				handleOpen(fImportViewer.getSelection());
-			}
-		};
-		fRemoveAction = new Action(PDEUIMessages.RequiresSection_delete) { 
-			public void run() {
-				handleRemove();
-			}
-		};
-        if (isBundle()) {
-            fPropertiesAction = new Action(PDEUIMessages.RequiresSection_properties) { 
-                public void run() {
-                    handleOpenProperties();
-                }
-            };
-        }
-	}
-	
-	public void refresh() {
-		fImports = null;
-		fImportViewer.refresh();
-		super.refresh();
-	}
-
-	public void modelChanged(IModelChangedEvent event) {
-		if (event.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			markStale();
-			return;
-		}
-		if (event.getChangedProperty() == IPluginBase.P_IMPORT_ORDER) {
-			refresh();
-			updateButtons();
-			return;
-		}
-
-		Object changeObject = event.getChangedObjects()[0];		
-		if (changeObject instanceof IPluginImport) {
-			IPluginImport iimport = (IPluginImport) changeObject;
-			if (event.getChangeType() == IModelChangedEvent.INSERT) {
-				ImportObject iobj = new ImportObject(iimport);
-				fImports.add(iobj);
-				fImportViewer.add(iobj);
-				fImportViewer.setSelection(new StructuredSelection(iobj), true);
-				fImportViewer.getTable().setFocus();
-			} else {
-				ImportObject iobj = findImportObject(iimport);
-				if (iobj != null) {
-					if (event.getChangeType() == IModelChangedEvent.REMOVE) {
-						fImports.remove(iobj);
-                        Table table = fImportViewer.getTable();
-                        int index = table.getSelectionIndex();
-						fImportViewer.remove(iobj);
-                        table.setSelection(index < table.getItemCount() ? index : table.getItemCount() -1);
-					} else {
-						fImportViewer.update(iobj, null);
-					}
-				}
-			}
-		} else {
-			fImportViewer.update(((IStructuredSelection)fImportViewer.getSelection()).toArray(), null);
-		}
-	}
-
-	public void modelsChanged(IModelProviderEvent e) {
-		fImports = null;
-		final Control control = fImportViewer.getControl();
-		if (!control.isDisposed()) {
-			control.getDisplay().asyncExec(new Runnable() {
-				public void run() {
-					if (!control.isDisposed())
-						fImportViewer.refresh();
-				}
-			});
-		}
-	}
-
-	private ImportObject findImportObject(IPluginImport iimport) {
-		if (fImports == null)
-			return null;
-		for (int i = 0; i < fImports.size(); i++) {
-			ImportObject iobj = (ImportObject) fImports.get(i);
-			if (iobj.getImport().equals(iimport))
-				return iobj;
-		}
-		return null;
-	}
-
-	public void setFocus() {
-		if (fImportViewer != null)
-			fImportViewer.getTable().setFocus();
-	}
-	
-	private boolean isBundle() {
-		return getPage().getPDEEditor().getContextManager().findContext(BundleInputContext.CONTEXT_ID) != null;
-	}
-
-/*
-	protected void doPaste(Object target, Object[] objects) {
-		IPluginModelBase model = (IPluginModelBase) getFormPage().getModel();
-		IPluginBase plugin = model.getPluginBase();
-
-		try {
-			for (int i = 0; i < objects.length; i++) {
-				Object obj = objects[i];
-				if (obj instanceof ImportObject) {
-					ImportObject iobj = (ImportObject) obj;
-					PluginImport iimport = (PluginImport) iobj.getImport();
-					iimport.setModel(model);
-					iimport.setParent(plugin);
-					plugin.add(iimport);
-				}
-			}
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-	protected boolean canPaste(Object target, Object[] objects) {
-		for (int i = 0; i < objects.length; i++) {
-			if (!(objects[i] instanceof ImportObject))
-				return false;
-		}
-		return true;
-	}
-	public boolean canPaste(Clipboard clipboard) {
-		Object [] objects = (Object[])clipboard.getContents(ModelDataTransfer.getInstance());
-		if (objects!=null && objects.length>0) {
-			return canPaste(null, objects);
-		}
-		return false;
-	}
-	protected void doPaste() {
-		Clipboard clipboard = getFormPage().getEditor().getClipboard();
-		ModelDataTransfer modelTransfer = ModelDataTransfer.getInstance();
-		Object [] objects = (Object[])clipboard.getContents(modelTransfer);
-		if (objects!=null) {
-			doPaste(null, objects);
-		}
-	}
-*/
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ResourceAttributeValue.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ResourceAttributeValue.java
deleted file mode 100644
index 4ff88d0..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/ResourceAttributeValue.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-
-import org.eclipse.core.resources.*;
-
-public class ResourceAttributeValue {
-	private IProject project;
-	private String stringValue;
-
-public ResourceAttributeValue(IProject project, String stringValue) {
-	this.project = project;
-	this.stringValue = stringValue;
-}
-public IProject getProject() {
-	return project;
-}
-public String getStringValue() {
-	return stringValue;
-}
-public String toString() {
-	return getStringValue();
-}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/RuntimePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/RuntimePage.java
deleted file mode 100644
index 00f92a3..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/RuntimePage.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin;
-
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-
-public class RuntimePage extends PDEFormPage {
-	public static final String PAGE_ID="runtime"; //$NON-NLS-1$
-
-    public RuntimePage(FormEditor editor) {
-		super(editor, PAGE_ID, PDEUIMessages.RuntimePage_tabName);  
-	}
-    
-	protected void createFormContent(IManagedForm mform) {
-		super.createFormContent(mform);
-		ScrolledForm form = mform.getForm();
-		form.setText(PDEUIMessages.ManifestEditor_RuntimeForm_title); 
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginWidth = 10;
-		layout.horizontalSpacing = 10;
-		layout.verticalSpacing = 20;
-        form.getBody().setLayout(layout);
-		
-        if (isBundle()) {
-            mform.addPart(new ExportPackageSection(this, form.getBody()));
-            if (((ManifestEditor)getEditor()).isEquinox())
-            	mform.addPart(new ExportPackageVisibilitySection(this, form.getBody()));
-            mform.addPart(new LibrarySection(this, form.getBody()));
-        } else {
-            mform.addPart(new LibrarySection(this, form.getBody()));		
-            mform.addPart(new LibraryVisibilitySection(this, form.getBody()));
-        }
-		
-		if (((IPluginModelBase)getPDEEditor().getAggregateModel()).isFragmentModel())
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.MANIFEST_FRAGMENT_RUNTIME);
-		else
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.MANIFEST_PLUGIN_RUNTIME);
-	}
-    
-    private boolean isBundle() {
-        return getPDEEditor().getContextManager().findContext(BundleInputContext.CONTEXT_ID) != null;
-    }
-
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/rows/BooleanAttributeRow.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/rows/BooleanAttributeRow.java
deleted file mode 100644
index f1a4490..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/rows/BooleanAttributeRow.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin.rows;
-import org.eclipse.pde.internal.core.ischema.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.forms.widgets.*;
-
-public class BooleanAttributeRow extends ChoiceAttributeRow {
-	/**
-	 * @param att
-	 */
-	public BooleanAttributeRow(IContextPart part, ISchemaAttribute att) {
-		super(part, att);
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.neweditor.plugin.ExtensionElementEditor#createContents(org.eclipse.swt.widgets.Composite,
-	 *      org.eclipse.ui.forms.widgets.FormToolkit, int)
-	 */
-	public void createContents(Composite parent, FormToolkit toolkit, int span) {
-		super.createContents(parent, toolkit, span);
-		if (getUse()!=ISchemaAttribute.REQUIRED)
-			combo.add(""); //$NON-NLS-1$
-		combo.add("true"); //$NON-NLS-1$
-		combo.add("false"); //$NON-NLS-1$
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.plugin.rows.ChoiceAttributeRow#isValid(java.lang.String)
-	 */
-	protected boolean isValid(String value) {
-	if (getUse() == ISchemaAttribute.REQUIRED)
-		return (value.equals("true") || value.equals("false")); //$NON-NLS-1$ //$NON-NLS-2$
-	return (value.equals("true") || value.equals("false") || value.equals("")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.plugin.rows.ChoiceAttributeRow#getValidValue()
-	 */
-	protected String getValidValue() {
-		return "true"; //$NON-NLS-1$
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/rows/ChoiceAttributeRow.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/rows/ChoiceAttributeRow.java
deleted file mode 100644
index 7a87bcd..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/rows/ChoiceAttributeRow.java
+++ /dev/null

@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 30, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.pde.internal.ui.editor.plugin.rows;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.pde.internal.core.ischema.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.parts.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.forms.widgets.*;
-
-
-public class ChoiceAttributeRow extends ExtensionAttributeRow {
-	protected ComboPart combo;
-	/**
-	 * @param att
-	 */
-	public ChoiceAttributeRow(IContextPart part, ISchemaAttribute att) {
-		super(part, att);
-	}
-
-	public void createContents(Composite parent, FormToolkit toolkit, int span) {
-		createLabel(parent, toolkit);
-		combo = new ComboPart();
-		combo.createControl(parent, toolkit, SWT.READ_ONLY);
-		ISchemaSimpleType type = getAttribute().getType();
-		ISchemaRestriction restriction = type.getRestriction();
-		if (restriction!=null) {
-			Object rchildren[] = restriction.getChildren();
-			if (getUse()!=ISchemaAttribute.REQUIRED)
-				combo.add(""); //$NON-NLS-1$
-			for (int i=0; i<rchildren.length; i++) {
-				Object rchild = rchildren[i];
-				if (rchild instanceof ISchemaEnumeration)
-					combo.add(((ISchemaEnumeration)rchild).getName());
-			}
-		}
-		GridData gd = new GridData(span==2?GridData.FILL_HORIZONTAL:GridData.HORIZONTAL_ALIGN_FILL);
-		gd.widthHint = 20;
-		gd.horizontalSpan = span-1;
-		combo.getControl().setLayoutData(gd);
-		combo.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (!blockNotification) markDirty();
-			}
-		});
-		combo.getControl().setEnabled(part.isEditable());
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.plugin.ExtensionElementEditor#update(org.eclipse.pde.internal.ui.neweditor.plugin.DummyExtensionElement)
-	 */
-	protected void update() {
-		blockNotification=true;
-		String value = getValue();
-		if (value!= null && isValid(value))
-			combo.setText(value); 
-		else if (getUse()==ISchemaAttribute.REQUIRED)
-			combo.setText(getValidValue());
-		else
-			combo.setText(""); //$NON-NLS-1$
-		blockNotification = false;
-		dirty=false;
-	}
-	
-	protected String getValidValue(){
-		ISchemaAttribute attInfo = getAttribute();
-		if (attInfo.getType().getRestriction()!= null)
-			return attInfo.getType().getRestriction().getChildren()[0].toString();		
-		return ""; //$NON-NLS-1$
-	}
-	
-	protected boolean isValid(String value){
-		if (getAttribute().getUse() != ISchemaAttribute.REQUIRED && value.equals("")) //$NON-NLS-1$
-			return true;
-		
-		ISchemaRestriction restriction = getAttribute().getType().getRestriction();
-		if (restriction == null)
-			return true;
-		Object[] children = restriction.getChildren();
-		for (int i =0; i<children.length; i++){
-			Object rchild = children[i];
-			if (rchild instanceof ISchemaEnumeration && ((ISchemaEnumeration)rchild).getName().equals(value))
-				return true;
-		}
-		return false;
-	}
-	public void commit() {
-		if (dirty && input != null) {
-			try {
-				String selection = combo.getSelection();
-				if (selection.length()==0) selection = null;
-				input.setAttribute(getName(), selection);
-				dirty = false;
-			} catch (CoreException e) {
-				PDEPlugin.logException(e);
-			}
-		}
-	}	
-	public void setFocus() {
-		combo.getControl().setFocus();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/rows/ClassAttributeRow.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/rows/ClassAttributeRow.java
deleted file mode 100644
index b366571..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/rows/ClassAttributeRow.java
+++ /dev/null

@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin.rows;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.core.search.*;
-import org.eclipse.jdt.ui.*;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.pde.core.IBaseModel;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.ischema.ISchemaAttribute;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.IContextPart;
-import org.eclipse.pde.internal.ui.editor.plugin.*;
-import org.eclipse.pde.internal.ui.util.SWTUtil;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.dialogs.SelectionDialog;
-import org.eclipse.ui.ide.IDE;
-public class ClassAttributeRow extends ReferenceAttributeRow {
-	public ClassAttributeRow(IContextPart part, ISchemaAttribute att) {
-		super(part, att);
-	}
-	protected boolean isReferenceModel() {
-		return !part.getPage().getModel().isEditable();
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.neweditor.plugin.ReferenceAttributeRow#openReference()
-	 */
-	protected void openReference() {
-		String name = text.getText();
-		name = trimNonAlphaChars(name).replace('$', '.');
-		IProject project = part.getPage().getPDEEditor().getCommonProject();
-		try {
-			if (project.hasNature(JavaCore.NATURE_ID)) {
-				IJavaProject javaProject = JavaCore.create(project);
-				IJavaElement result = null;
-				if (name.length() > 0)
-					result = javaProject.findType(name);
-				if (result != null) {
-					JavaUI.openInEditor(result);
-				} else {
-					JavaAttributeValue value = createJavaAttributeValue(name);
-					JavaAttributeWizard wizard = new JavaAttributeWizard(value);
-					WizardDialog dialog = new WizardDialog(PDEPlugin
-							.getActiveWorkbenchShell(), wizard);
-					dialog.create();
-					SWTUtil.setDialogSize(dialog, 400, 500);
-					int dResult = dialog.open();
-					if (dResult == WizardDialog.OK) {
-						name = wizard.getClassNameWithArgs();
-						text.setText(name);
-						result = javaProject.findType(name);
-						if (result != null)
-							JavaUI.openInEditor(result);
-					}
-				}
-			} else {
-				IResource resource = project.findMember(new Path(name));
-				if (resource != null && resource instanceof IFile) {
-					IWorkbenchPage page = PDEPlugin.getActivePage();
-					IDE.openEditor(page, (IFile) resource, true);
-				} else {
-					JavaAttributeValue value = createJavaAttributeValue(name);
-					JavaAttributeWizard wizard = new JavaAttributeWizard(value);
-					WizardDialog dialog = new WizardDialog(PDEPlugin
-							.getActiveWorkbenchShell(), wizard);
-					dialog.create();
-					SWTUtil.setDialogSize(dialog, 400, 500);
-					int dResult = dialog.open();
-					if (dResult == WizardDialog.OK) {
-						String newValue = wizard.getClassName();
-						name = newValue.replace('.', '/') + ".java"; //$NON-NLS-1$
-						text.setText(newValue);
-						resource = project.findMember(new Path(name));
-						if (resource != null && resource instanceof IFile) {
-							IWorkbenchPage page = PDEPlugin.getActivePage();
-							IDE.openEditor(page, (IFile) resource, true);
-						}
-					}
-				}
-			}
-		} catch (PartInitException e) {
-			PDEPlugin.logException(e);
-		} catch (JavaModelException e) {
-			// nothing
-			Display.getCurrent().beep();
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.neweditor.plugin.ReferenceAttributeRow#browse()
-	 */
-	protected void browse() {
-		BusyIndicator.showWhile(text.getDisplay(), new Runnable() {
-			public void run() {
-				doOpenSelectionDialog();
-			}
-		});
-	}
-	private JavaAttributeValue createJavaAttributeValue(String name) {
-		IProject project = part.getPage().getPDEEditor().getCommonProject();
-		IPluginModelBase model = (IPluginModelBase) part.getPage().getModel();
-		return new JavaAttributeValue(project, model, getAttribute(), name);
-	}
-	private void doOpenSelectionDialog() {
-		try {
-			Shell shell = PDEPlugin.getActiveWorkbenchShell();
-			IResource resource = getPluginBase().getModel()
-					.getUnderlyingResource();
-			IProject project = (resource == null) ? null : resource
-					.getProject();
-			if (project != null) {
-				SelectionDialog dialog = JavaUI.createTypeDialog(shell,
-						PlatformUI.getWorkbench().getProgressService(),
-						SearchEngine.createWorkspaceScope(),
-						IJavaElementSearchConstants.CONSIDER_ALL_TYPES, 
-                        false,
-						""); //$NON-NLS-1$
-				dialog.setTitle(PDEUIMessages.ClassAttributeRow_dialogTitle); 
-				if (dialog.open() == SelectionDialog.OK) {
-					IType type = (IType) dialog.getResult()[0];
-					text.setText(type.getFullyQualifiedName('$'));
-				}
-			}
-		} catch (CoreException e) {
-		}
-	}
-	private IPluginBase getPluginBase() {
-		IBaseModel model = part.getPage().getPDEEditor().getAggregateModel();
-		return ((IPluginModelBase) model).getPluginBase();
-	}
-	private String trimNonAlphaChars(String value) {
-		value = value.trim();
-		while (value.length() > 0 && !Character.isLetter(value.charAt(0)))
-			value = value.substring(1, value.length());
-		int loc = value.indexOf(":"); //$NON-NLS-1$
-		if (loc != -1 && loc > 0)
-			value = value.substring(0, loc);
-		else if (loc == 0)
-			value = ""; //$NON-NLS-1$
-		return value;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/rows/ExtensionAttributeRow.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/rows/ExtensionAttributeRow.java
deleted file mode 100644
index ac18d89..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/rows/ExtensionAttributeRow.java
+++ /dev/null

@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.editor.plugin.rows;
-
-import java.text.BreakIterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.ischema.ISchemaAttribute;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.forms.FormColors;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-public abstract class ExtensionAttributeRow {
-	private static final int TOOLTIP_WIDTH_LIMIT = 300;
-	protected IContextPart part;
-	protected Object att;
-	protected IPluginElement input;
-	protected boolean blockNotification;
-	protected boolean dirty;
-	
-	public ExtensionAttributeRow(IContextPart part, ISchemaAttribute att) {
-		this.part = part;
-		this.att = att;
-	}
-	
-	public ExtensionAttributeRow(IContextPart part, IPluginAttribute att) {
-		this.part = part;
-		this.att = att;
-	}
-	
-	public ISchemaAttribute getAttribute() {
-		return (att instanceof ISchemaAttribute) ? (ISchemaAttribute)att:null;
-	}
-	
-	public String getName() {
-		if (att instanceof ISchemaAttribute)
-			return ((ISchemaAttribute)att).getName();
-
-		return ((IPluginAttribute)att).getName();
-	}
-	
-	protected int getUse() {
-		if (att instanceof ISchemaAttribute)
-			return ((ISchemaAttribute)att).getUse();
-		return ISchemaAttribute.OPTIONAL;
-	}
-	
-	protected String getDescription() {
-		if (att instanceof ISchemaAttribute)
-			return ((ISchemaAttribute)att).getDescription();
-		return ""; //$NON-NLS-1$
-	}
-	
-	protected String getValue() {
-		String value= ""; //$NON-NLS-1$
-		if (input!=null) {
-			IPluginAttribute patt = input.getAttribute(getName());
-			if (patt!=null)
-				value = patt.getValue();
-		}
-		return value;
-	}
-	protected String getPropertyLabel() {
-		String label=getName();
-		if (getUse()==ISchemaAttribute.REQUIRED)
-			label+= "*:"; //$NON-NLS-1$
-		else
-			label+=":"; //$NON-NLS-1$
-		return label;
-	}
-	protected void createLabel(Composite parent, FormToolkit toolkit) {
-		Label label = toolkit.createLabel(parent, getPropertyLabel(), SWT.NULL);
-		label.setForeground(toolkit.getColors().getColor(FormColors.TITLE));
-		label.setToolTipText(getToolTipText(label));
-	}
-	
-	protected String getToolTipText(Control control) {
-		String text = getDescription();
-		if (text==null) return null;
-		int dot = text.indexOf('.');
-		if (dot != -1) {
-			StringBuffer buf = new StringBuffer();
-			boolean inTag=false;
-			for (int i=0; i<text.length(); i++) {
-				char c = text.charAt(i);
-				if (inTag) {
-					if (c=='>') {
-						inTag = false;
-						continue;
-					}
-				}
-				else {
-					if (c=='<') {
-						inTag = true;
-						continue;
-					}
-					else if (c=='.') {
-						if (i<text.length()-1) {
-							char c2 = text.charAt(i+1);
-							if (c2==' ' || c2=='\t' || c2=='\n') break;
-						}
-					}
-					buf.append(c);
-				}
-			}
-			return wrapText(control, buf.toString(), TOOLTIP_WIDTH_LIMIT);
-		}
-		return text;
-	}
-	
-	private String wrapText(Control c, String src, int width) {
-		BreakIterator wb = BreakIterator.getWordInstance();
-		wb.setText(src);
-		int saved = 0;
-		int last = 0;
-		StringBuffer buff = new StringBuffer();
-		GC gc = new GC(c);
-		
-		for (int loc = wb.first(); loc != BreakIterator.DONE; loc = wb.next()) {
-			String word = src.substring(saved, loc);
-			Point extent = gc.textExtent(word);
-			if (extent.x > width) {
-				// overflow
-				String prevLine = src.substring(saved, last);
-				buff.append(prevLine);
-				buff.append(SWT.LF);
-				saved = last;
-			}
-			last = loc;
-		}
-		String lastLine = src.substring(saved, last);
-		buff.append(lastLine);
-		return buff.toString();
-	}
-	
-	public abstract void createContents(Composite parent, FormToolkit toolkit, int span);
-
-	protected abstract void update();	
-	public abstract void commit();
-
-	public abstract void setFocus();
-	
-	public boolean isDirty() {
-		return dirty;
-	}
-
-	protected void markDirty() {
-		dirty=true;
-		part.fireSaveNeeded();
-	}
-
-	public void dispose() {
-	}
-
-	public void setInput(IPluginElement input) {
-		this.input = input;
-		update();
-	}
-	protected IProject getProject() {
-		return part.getPage().getPDEEditor().getCommonProject();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/rows/ReferenceAttributeRow.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/rows/ReferenceAttributeRow.java
deleted file mode 100644
index 06de041..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/rows/ReferenceAttributeRow.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 30, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.pde.internal.ui.editor.plugin.rows;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.ischema.ISchemaAttribute;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.forms.events.*;
-import org.eclipse.ui.forms.widgets.*;
-
-public abstract class ReferenceAttributeRow extends TextAttributeRow {
-
-	public ReferenceAttributeRow(IContextPart part, ISchemaAttribute att) {
-		super(part, att);
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.neweditor.plugin.ExtensionElementEditor#createContents(org.eclipse.swt.widgets.Composite,
-	 *      org.eclipse.ui.forms.widgets.FormToolkit, int)
-	 */
-	protected void createLabel(Composite parent, FormToolkit toolkit) {
-		Hyperlink link = toolkit.createHyperlink(parent, getPropertyLabel(),
-				SWT.NULL);
-		link.addHyperlinkListener(new HyperlinkAdapter() {
-			public void linkActivated(HyperlinkEvent e) {
-				if (!isReferenceModel())
-					openReference();
-			}
-		});
-		link.setToolTipText(getToolTipText(link));
-	}
-	protected boolean isReferenceModel() {
-		return ((IPluginModelBase) part.getPage().getModel())
-				.getUnderlyingResource() != null;
-	}
-	public void createContents(Composite parent, FormToolkit toolkit, int span) {
-		super.createContents(parent, toolkit, span);
-		Button button = toolkit.createButton(parent, PDEUIMessages.ReferenceAttributeRow_browse, SWT.PUSH); 
-		button.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (!isReferenceModel())
-					browse();
-			}
-		});
-		button.setEnabled(part.isEditable());
-	}
-	protected GridData createGridData(int span) {
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.widthHint = 20;
-		return gd;
-	}
-	protected abstract void openReference();
-	protected abstract void browse();
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/rows/ResourceAttributeRow.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/rows/ResourceAttributeRow.java
deleted file mode 100644
index 8bb2d39..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/rows/ResourceAttributeRow.java
+++ /dev/null

@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 30, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.pde.internal.ui.editor.plugin.rows;
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.internal.core.ischema.ISchemaAttribute;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.dialogs.*;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.model.*;
-
-public class ResourceAttributeRow extends ReferenceAttributeRow {
-	public ResourceAttributeRow(IContextPart part, ISchemaAttribute att) {
-		super(part, att);
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.neweditor.plugin.ReferenceAttributeRow#openReference()
-	 */
-	protected boolean isReferenceModel() {
-		return !part.getPage().getModel().isEditable();
-	}	
-	protected void openReference() {
-		IFile file = getFile();
-		if (file!=null && file.exists()) {
-			try {
-				IDE.openEditor(PDEPlugin.getActivePage(), file, true);
-			} catch (PartInitException e) {
-				PDEPlugin.logException(e);
-			}
-			return;
-		} 
-		file = getNLFile();
-		if (file != null && file.exists()) {
-			try {
-				IDE.openEditor(PDEPlugin.getActivePage(), file, true);
-			} catch (PartInitException e) {
-				PDEPlugin.logException(e);
-			}
-			return;
-		} 
-		Display.getCurrent().beep();
-	}
-	private IFile getFile() {
-		String value = text.getText();
-		if (value.length()==0) return null;
-		IPath path = getProject().getFullPath().append(value);
-		return getProject().getWorkspace().getRoot().getFile(path);
-	}
-	private IFile getNLFile() {
-		String value = text.getText();
-		if (value.length() <= 5 || !value.startsWith("$nl$/"))return null; //$NON-NLS-1$
-		IPath path = getProject().getFullPath().append(value.substring(5));
-		return getProject().getWorkspace().getRoot().getFile(path);
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.neweditor.plugin.ReferenceAttributeRow#browse()
-	 */
-	protected void browse() {
-		final IProject project = part.getPage().getPDEEditor()
-				.getCommonProject();
-		ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(
-				PDEPlugin.getActiveWorkbenchShell(),
-				new WorkbenchLabelProvider(), new WorkbenchContentProvider());
-		dialog.setInput(project.getWorkspace());
-		IFile file = getFile();
-		if (file!=null)
-			dialog.setInitialSelection(file);
-		dialog.addFilter(new ViewerFilter() {
-			public boolean select(Viewer viewer, Object parentElement,
-					Object element) {
-				if (element instanceof IProject)
-					return ((IProject) element).equals(project);
-				return true;
-			}
-		});
-		dialog.setAllowMultiple(false);
-		dialog
-				.setTitle(PDEUIMessages.ResourceAttributeCellEditor_title); 
-		dialog
-				.setMessage(PDEUIMessages.ResourceAttributeCellEditor_message); 
-		dialog.setValidator(new ISelectionStatusValidator() {
-			public IStatus validate(Object[] selection) {
-				if (selection != null && selection.length > 0
-						&& selection[0] instanceof IFile)
-					return new Status(IStatus.OK, PDEPlugin.getPluginId(),
-							IStatus.OK, "", null); //$NON-NLS-1$
-				
-				return new Status(IStatus.ERROR, PDEPlugin.getPluginId(),
-						IStatus.ERROR, "", null); //$NON-NLS-1$
-			}
-		});
-		if (dialog.open() == ElementTreeSelectionDialog.OK) {
-			file = (IFile) dialog.getFirstResult();
-			String value = file.getProjectRelativePath().toString();
-			text.setText(value);
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/rows/TextAttributeRow.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/rows/TextAttributeRow.java
deleted file mode 100644
index 673e34b..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/rows/TextAttributeRow.java
+++ /dev/null

@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.plugin.rows;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.pde.core.plugin.IPluginAttribute;
-import org.eclipse.pde.internal.core.ischema.ISchemaAttribute;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.editor.*;
-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.widgets.Composite;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-public class TextAttributeRow extends ExtensionAttributeRow {
-	protected Text text;
-	/**
-	 * @param att
-	 */
-	public TextAttributeRow(IContextPart part, ISchemaAttribute att) {
-		super(part, att);
-	}
-	
-	public TextAttributeRow(IContextPart part, IPluginAttribute att) {
-		super(part, att);
-	}
-	public void createContents(Composite parent, FormToolkit toolkit, int span) {
-		createLabel(parent, toolkit);
-		text = toolkit.createText(parent, "", SWT.SINGLE); //$NON-NLS-1$
-		text.setLayoutData(createGridData(span));
-		text.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				if (!blockNotification) markDirty();
-			}
-		});
-		text.setEditable(part.isEditable());
-	}
-	protected GridData createGridData(int span) {
-		GridData gd = new GridData(span == 2
-				? GridData.FILL_HORIZONTAL
-				: GridData.HORIZONTAL_ALIGN_FILL);
-		gd.widthHint = 20;
-		gd.horizontalSpan = span - 1;
-		return gd;
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.neweditor.plugin.ExtensionElementEditor#update(org.eclipse.pde.internal.ui.neweditor.plugin.DummyExtensionElement)
-	 */
-	protected void update() {
-		blockNotification = true;
-		text.setText(getValue());
-		blockNotification = false;
-	}
-	public void commit() {
-		if (dirty && input!=null) {
-			String value = text.getText();
-			try {
-				input.setAttribute(getName(), value);
-				dirty = false;
-			} catch (CoreException e) {
-				PDEPlugin.logException(e);
-			}
-		}
-	}
-	public void setFocus() {
-		text.setFocus();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/AboutSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/AboutSection.java
deleted file mode 100644
index 21a0746..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/AboutSection.java
+++ /dev/null

@@ -1,185 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.product;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.core.iproduct.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.parts.*;
-import org.eclipse.pde.internal.ui.util.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.dnd.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.dialogs.*;
-import org.eclipse.ui.forms.events.*;
-import org.eclipse.ui.forms.widgets.*;
-import org.eclipse.ui.ide.*;
-import org.eclipse.ui.model.*;
-
-
-public class AboutSection extends PDESection {
-
-	private FormEntry fImageEntry;
-	private FormEntry fTextEntry;
-
-	public AboutSection(PDEFormPage page, Composite parent) {
-		super(page, parent, Section.DESCRIPTION);
-		createClient(getSection(), page.getEditor().getToolkit());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESection#createClient(org.eclipse.ui.forms.widgets.Section, org.eclipse.ui.forms.widgets.FormToolkit)
-	 */
-	protected void createClient(Section section, FormToolkit toolkit) {
-		section.setText(PDEUIMessages.AboutSection_title); 
-		section.setDescription(PDEUIMessages.AboutSection_desc); 
-		
-		Composite client = toolkit.createComposite(section);
-		GridLayout layout = new GridLayout(3, false);
-		layout.marginTop = 5;
-		client.setLayout(layout);
-		
-		IActionBars actionBars = getPage().getPDEEditor().getEditorSite().getActionBars();
-		fImageEntry = new FormEntry(client, toolkit, PDEUIMessages.AboutSection_image, PDEUIMessages.AboutSection_browse, isEditable()); // 
-		fImageEntry.setFormEntryListener(new FormEntryAdapter(this, actionBars) {
-			public void textValueChanged(FormEntry entry) {
-				getAboutInfo().setImagePath(entry.getValue());
-			}
-			public void browseButtonSelected(FormEntry entry) {
-				handleBrowse();
-			}
-			public void linkActivated(HyperlinkEvent e) {
-				openImage();
-			}
-		});
-		fImageEntry.setEditable(isEditable());
-		
-		fTextEntry = new FormEntry(client, toolkit, PDEUIMessages.AboutSection_text, SWT.MULTI|SWT.WRAP); 
-		fTextEntry.setFormEntryListener(new FormEntryAdapter(this, actionBars) {
-			public void textValueChanged(FormEntry entry) {
-				getAboutInfo().setText(entry.getValue());
-			}
-		});
-
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.horizontalSpan = 2;
-		fTextEntry.getText().setLayoutData(gd);
-		fTextEntry.setEditable(isEditable());
-		
-		toolkit.paintBordersFor(client);
-		section.setClient(client);
-		section.setLayoutData(new GridData(GridData.FILL_BOTH));
-	}
-	
-	private void handleBrowse() {
-		ElementTreeSelectionDialog dialog =
-			new ElementTreeSelectionDialog(
-				getSection().getShell(),
-				new WorkbenchLabelProvider(),
-				new WorkbenchContentProvider());
-				
-		dialog.setValidator(new FileValidator());
-		dialog.setAllowMultiple(false);
-		dialog.setTitle(PDEUIMessages.AboutSection_imgTitle);  
-		dialog.setMessage(PDEUIMessages.AboutSection_imgMessage);  
-		dialog.addFilter(new FileExtensionFilter("gif")); //$NON-NLS-1$
-		dialog.setInput(PDEPlugin.getWorkspace().getRoot());
-
-		if (dialog.open() == ElementTreeSelectionDialog.OK) {
-			IFile file = (IFile)dialog.getFirstResult();
-			fImageEntry.setValue(file.getFullPath().toString());
-		}
-	}
-	
-	public void refresh() {
-		fImageEntry.setValue(getAboutInfo().getImagePath(), true);
-		fTextEntry.setValue(getAboutInfo().getText(), true);
-		super.refresh();
-	}
-	
-	public void commit(boolean onSave) {
-		fImageEntry.commit();
-		fTextEntry.commit();
-		super.commit(onSave);
-	}
-	
-	public void cancelEdit() {
-		fImageEntry.cancelEdit();
-		fTextEntry.cancelEdit();
-		super.cancelEdit();
-	}
-	
-	private void openImage() {
-		IWorkspaceRoot root = PDEPlugin.getWorkspace().getRoot();
-		IPath path = new Path(fImageEntry.getValue());
-		if (!path.isAbsolute()) {
-			path = getFullPath(path);
-		}
-		IResource resource = root.findMember(path);
-		try {
-			if (resource != null && resource instanceof IFile)
-				IDE.openEditor(PDEPlugin.getActivePage(), (IFile)resource, true);
-			else
-				MessageDialog.openWarning(PDEPlugin.getActiveWorkbenchShell(), PDEUIMessages.AboutSection_open, PDEUIMessages.AboutSection_warning); // 
-		} catch (PartInitException e) {
-		}		
-	}
-	
-	private IAboutInfo getAboutInfo() {
-		IAboutInfo info = getProduct().getAboutInfo();
-		if (info == null) {
-			info = getModel().getFactory().createAboutInfo();
-			getProduct().setAboutInfo(info);
-		}
-		return info;
-	}
-	
-	private IProduct getProduct() {
-		return getModel().getProduct();
-	}
-	
-	private IProductModel getModel() {
-		return (IProductModel)getPage().getPDEEditor().getAggregateModel();
-	}
-	
-	private IPath getFullPath(IPath path) {
-		String productId = getProduct().getId();
-		int dot = productId.lastIndexOf('.');
-		String pluginId = (dot != -1) ? productId.substring(0, dot) : ""; //$NON-NLS-1$
-		IPluginModelBase model = PDECore.getDefault().getModelManager().findModel(pluginId);
-		if (model != null && model.getUnderlyingResource() != null) {
-			IPath newPath = new Path(model.getInstallLocation()).append(path);
-			IContainer container = PDEPlugin.getWorkspace().getRoot().getContainerForLocation(newPath);
-			if (container != null) {
-				return container.getFullPath();
-			}
-		}
-		return path;
-	}
-	
-	public boolean canPaste(Clipboard clipboard) {
-		Display d = getSection().getDisplay();
-		Control c = d.getFocusControl();
-		if (c instanceof Text)
-			return true;
-		return false;
-	}
-
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ArgumentsSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ArgumentsSection.java
deleted file mode 100644
index 3fc729b..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ArgumentsSection.java
+++ /dev/null

@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.product;
-
-import org.eclipse.pde.internal.core.iproduct.IArgumentsInfo;
-import org.eclipse.pde.internal.core.iproduct.IProduct;
-import org.eclipse.pde.internal.core.iproduct.IProductModel;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.PDESection;
-import org.eclipse.pde.internal.ui.parts.FormEntry;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.Clipboard;
-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.Text;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-public class ArgumentsSection extends PDESection {
-
-	private FormEntry fProgramArgs;
-	private FormEntry fVMArgs;
-
-	public ArgumentsSection(PDEFormPage page, Composite parent) {
-		super(page, parent, Section.DESCRIPTION);
-		createClient(getSection(), page.getEditor().getToolkit());
-	}
-	
-	protected void createClient(Section section, FormToolkit toolkit) {
-		section.setText(PDEUIMessages.ArgumentsSection_title); 
-		section.setDescription(PDEUIMessages.ArgumentsSection_desc); 
-		section.setLayoutData(new GridData(GridData.FILL_BOTH));
-		
-		Composite client = toolkit.createComposite(section);
-		client.setLayout(new GridLayout());
-		
-		IActionBars actionBars = getPage().getPDEEditor().getEditorSite().getActionBars();
-		
-		fProgramArgs = new FormEntry(client, toolkit, PDEUIMessages.ArgumentsSection_program, SWT.MULTI|SWT.WRAP); 
-		fProgramArgs.getText().setLayoutData(new GridData(GridData.FILL_BOTH));
-		fProgramArgs.setFormEntryListener(new FormEntryAdapter(this, actionBars) {
-			public void textValueChanged(FormEntry entry) {
-				getLauncherArguments().setProgramArguments(entry.getValue());
-			}
-		});
-		fProgramArgs.setEditable(isEditable());
-		
-		
-		fVMArgs = new FormEntry(client, toolkit, PDEUIMessages.ArgumentsSection_vm, SWT.MULTI|SWT.WRAP); 
-		fVMArgs.getText().setLayoutData(new GridData(GridData.FILL_BOTH));		
-		fVMArgs.setFormEntryListener(new FormEntryAdapter(this, actionBars) {
-			public void textValueChanged(FormEntry entry) {
-				getLauncherArguments().setVMArguments(entry.getValue());
-			}
-		});
-		fVMArgs.setEditable(isEditable());
-		
-		toolkit.paintBordersFor(client);
-		section.setClient(client);	
-	}
-	
-	public void refresh() {
-		fProgramArgs.setValue(getLauncherArguments().getProgramArguments(), true);
-		fVMArgs.setValue(getLauncherArguments().getVMArguments(), true);
-		super.refresh();
-	}
-	
-	public void commit(boolean onSave) {
-		fProgramArgs.commit();
-		fVMArgs.commit();
-		super.commit(onSave);
-	}
-	
-	public void cancelEdit() {
-		fProgramArgs.cancelEdit();
-		fVMArgs.cancelEdit();
-		super.cancelEdit();
-	}
-	
-	private IArgumentsInfo getLauncherArguments() {
-		IArgumentsInfo info = getProduct().getLauncherArguments();
-		if (info == null) {
-			info = getModel().getFactory().createLauncherArguments();
-			getProduct().setLauncherArguments(info);
-		}
-		return info;
-	}
-
-	private IProduct getProduct() {
-		return getModel().getProduct();
-	}
-	
-	private IProductModel getModel() {
-		return (IProductModel)getPage().getPDEEditor().getAggregateModel();
-	}
-
-	public boolean canPaste(Clipboard clipboard) {
-		Display d = getSection().getDisplay();
-		Control c = d.getFocusControl();
-		if (c instanceof Text)
-			return true;
-		return false;
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/BrandingPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/BrandingPage.java
deleted file mode 100644
index 5bfd7de..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/BrandingPage.java
+++ /dev/null

@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.product;
-
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.*;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.widgets.*;
-
-
-public class BrandingPage extends PDEFormPage {
-	
-	public static final String PAGE_ID = "branding"; //$NON-NLS-1$
-
-	public BrandingPage(FormEditor editor) {
-		super(editor, PAGE_ID, PDEUIMessages.BrandingPage_title); 
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormPage#createFormContent(org.eclipse.ui.forms.IManagedForm)
-	 */
-	protected void createFormContent(IManagedForm managedForm) {
-		super.createFormContent(managedForm);
-		ScrolledForm form = managedForm.getForm();
-		FormToolkit toolkit = managedForm.getToolkit();
-		form.setText(PDEUIMessages.BrandingPage_title);  
-		fillBody(managedForm, toolkit);
-		managedForm.refresh();
-		
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.BRANDING_PAGE);
-	}
-	
-	private void fillBody(IManagedForm managedForm, FormToolkit toolkit) {
-		Composite body = managedForm.getForm().getBody();
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginWidth = 10;
-		layout.verticalSpacing = 30;
-		layout.horizontalSpacing = 10;
-		body.setLayout(layout);
-
-		// sections
-		managedForm.addPart(new SplashSection(this, body));	
-		managedForm.addPart(new IntroSection(this, body));
-		managedForm.addPart(new WindowImagesSection(this, body));
-		managedForm.addPart(new AboutSection(this, body));	
-	}
-
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ConfigurationPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ConfigurationPage.java
deleted file mode 100644
index 4e3823b..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ConfigurationPage.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.product;
-
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.*;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.widgets.*;
-
-
-public class ConfigurationPage extends PDEFormPage {
-	
-	public static final String PLUGIN_ID = "plugin-configuration"; //$NON-NLS-1$
-	public static final String FEATURE_ID = "feature-configuration"; //$NON-NLS-1$
-
-	private boolean fUseFeatures;
-
-	public ConfigurationPage(FormEditor editor, boolean useFeatures) {
-		super(editor, useFeatures ? FEATURE_ID : PLUGIN_ID, PDEUIMessages.Product_ConfigurationPage_title); 
-		fUseFeatures = useFeatures;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormPage#createFormContent(org.eclipse.ui.forms.IManagedForm)
-	 */
-	protected void createFormContent(IManagedForm managedForm) {
-		super.createFormContent(managedForm);
-		ScrolledForm form = managedForm.getForm();
-		FormToolkit toolkit = managedForm.getToolkit();
-		form.setText(PDEUIMessages.Product_ConfigurationPage_title);  
-		fillBody(managedForm, toolkit);
-		managedForm.refresh();
-		
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.CONFIGURATION_PAGE);
-	}
-
-	private void fillBody(IManagedForm managedForm, FormToolkit toolkit) {
-		Composite body = managedForm.getForm().getBody();
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginWidth = 10;
-		layout.verticalSpacing = 20;
-		layout.horizontalSpacing = 10;
-		body.setLayout(layout);
-
-		// sections
-		if (fUseFeatures)
-			managedForm.addPart(new FeatureSection(this, body));
-		else
-			managedForm.addPart(new PluginSection(this, body));	
-		managedForm.addPart(new ConfigurationSection(this, body));
-	}
-	
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ConfigurationSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ConfigurationSection.java
deleted file mode 100644
index ff3da86..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ConfigurationSection.java
+++ /dev/null

@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.product;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.pde.internal.core.iproduct.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.parts.*;
-import org.eclipse.pde.internal.ui.util.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.dnd.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.dialogs.*;
-import org.eclipse.ui.forms.events.*;
-import org.eclipse.ui.forms.widgets.*;
-import org.eclipse.ui.ide.*;
-import org.eclipse.ui.model.*;
-
-
-public class ConfigurationSection extends PDESection {
-
-	private Button fDefault;
-	private Button fCustom;
-	private FormEntry fCustomEntry;
-	
-	public ConfigurationSection(PDEFormPage page, Composite parent) {
-		super(page, parent, Section.DESCRIPTION);
-		createClient(getSection(), page.getEditor().getToolkit());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESection#createClient(org.eclipse.ui.forms.widgets.Section, org.eclipse.ui.forms.widgets.FormToolkit)
-	 */
-	protected void createClient(Section section, FormToolkit toolkit) {
-		section.setText(PDEUIMessages.ConfigurationSection_title); 
-		section.setDescription(PDEUIMessages.ConfigurationSection_desc); 
-		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		Composite client = toolkit.createComposite(section);
-		client.setLayout(new GridLayout(3, false));
-		
-		fDefault = toolkit.createButton(client, PDEUIMessages.ConfigurationSection_default, SWT.RADIO); 
-		GridData gd = new GridData();
-		gd.horizontalSpan = 3;
-		fDefault.setLayoutData(gd);
-		fDefault.setEnabled(isEditable());
-		fDefault.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				boolean selected = fDefault.getSelection();
-				getConfigurationFileInfo().setUse(selected ? "default" : "custom"); //$NON-NLS-1$ //$NON-NLS-2$
-				fCustomEntry.setEditable(!selected);
-			}
-		});
-		
-		fCustom = toolkit.createButton(client, PDEUIMessages.ConfigurationSection_existing, SWT.RADIO); 
-		gd = new GridData();
-		gd.horizontalSpan = 3;
-		fCustom.setLayoutData(gd);
-		fCustom.setEnabled(isEditable());
-		
-		IActionBars actionBars = getPage().getPDEEditor().getEditorSite().getActionBars();
-		fCustomEntry = new FormEntry(client, toolkit, PDEUIMessages.ConfigurationSection_file, PDEUIMessages.ConfigurationSection_browse, isEditable(), 35); // 
-		fCustomEntry.setFormEntryListener(new FormEntryAdapter(this, actionBars) {
-			public void textValueChanged(FormEntry entry) {
-				getConfigurationFileInfo().setPath(entry.getValue());
-			}
-			public void browseButtonSelected(FormEntry entry) {
-				handleBrowse();
-			}
-			public void linkActivated(HyperlinkEvent e) {
-				handleOpen();
-			}
-		});
-		fCustomEntry.setEditable(isEditable());
-		
-		toolkit.paintBordersFor(client);
-		section.setClient(client);
-	}
-	
-	private void handleBrowse() {
-		ElementTreeSelectionDialog dialog =
-			new ElementTreeSelectionDialog(
-				getSection().getShell(),
-				new WorkbenchLabelProvider(),
-				new WorkbenchContentProvider());
-				
-		dialog.setValidator(new FileValidator());
-		dialog.setAllowMultiple(false);
-		dialog.setTitle(PDEUIMessages.ConfigurationSection_selection);  
-		dialog.setMessage(PDEUIMessages.ConfigurationSection_message);  
-		dialog.addFilter(new FileNameFilter("config.ini")); //$NON-NLS-1$
-		dialog.setInput(PDEPlugin.getWorkspace().getRoot());
-
-		if (dialog.open() == ElementTreeSelectionDialog.OK) {
-			IFile file = (IFile)dialog.getFirstResult();
-			fCustomEntry.setValue(file.getFullPath().toString());
-		}
-	}
-	
-	public void refresh() {
-		IConfigurationFileInfo info = getConfigurationFileInfo();
-		if (info == null) {
-			fDefault.setSelection(true);
-			fCustomEntry.setEditable(false);
-		} else {
-			boolean custom = "custom".equals(info.getUse()); //$NON-NLS-1$
-			fDefault.setSelection(!custom);
-			fCustom.setSelection(custom);
-			fCustomEntry.setValue(info.getPath(), true);
-			fCustomEntry.setEditable(custom);
-		}
-		super.refresh();
-	}
-	
-	private IConfigurationFileInfo getConfigurationFileInfo() {
-		IConfigurationFileInfo info = getProduct().getConfigurationFileInfo();
-		if (info == null) {
-			info = getModel().getFactory().createConfigFileInfo();
-			getProduct().setConfigurationFileInfo(info);
-		}
-		return info;
-	}
-	
-	private IProduct getProduct() {
-		return getModel().getProduct();
-	}
-	
-	private IProductModel getModel() {
-		return (IProductModel)getPage().getPDEEditor().getAggregateModel();
-	}
-	
-	public void commit(boolean onSave) {
-		fCustomEntry.commit();
-		super.commit(onSave);
-	}
-	
-	public void cancelEdit() {
-		fCustomEntry.cancelEdit();
-		super.cancelEdit();
-	}
-	
-	public boolean canPaste(Clipboard clipboard) {
-		Display d = getSection().getDisplay();
-		Control c = d.getFocusControl();
-		if (c instanceof Text)
-			return true;
-		return false;
-	}
-
-	private void handleOpen() {
-		IWorkspaceRoot root = PDEPlugin.getWorkspace().getRoot();
-		Path path = new Path(fCustomEntry.getValue());
-		if(path.isEmpty()){
-			MessageDialog.openWarning(PDEPlugin.getActiveWorkbenchShell(), PDEUIMessages.WindowImagesSection_open, PDEUIMessages.WindowImagesSection_emptyPath); // 
-			return;
-		}
-		IResource resource = root.findMember(path);
-		try {
-			if (resource != null && resource instanceof IFile)
-				IDE.openEditor(PDEPlugin.getActivePage(), (IFile)resource, true);
-			else
-				MessageDialog.openWarning(PDEPlugin.getActiveWorkbenchShell(), PDEUIMessages.WindowImagesSection_open, PDEUIMessages.WindowImagesSection_warning); // 
-		} catch (PartInitException e) {
-		}			
-	}
-
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/FeatureSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/FeatureSection.java
deleted file mode 100644
index 543028f..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/FeatureSection.java
+++ /dev/null

@@ -1,326 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.product;
-
-import java.util.ArrayList;
-
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.core.ifeature.*;
-import org.eclipse.pde.internal.core.iproduct.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.editor.feature.FeatureEditor;
-import org.eclipse.pde.internal.ui.elements.*;
-import org.eclipse.pde.internal.ui.parts.*;
-import org.eclipse.pde.internal.ui.util.*;
-import org.eclipse.pde.internal.ui.wizards.FeatureSelectionDialog;
-import org.eclipse.pde.internal.ui.wizards.feature.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.actions.*;
-import org.eclipse.ui.forms.widgets.*;
-
-public class FeatureSection extends TableSection {
-	
-	class ContentProvider extends DefaultTableProvider {
-		public Object[] getElements(Object parent) {
-			return getProduct().getFeatures();
-		}
-	}
-
-	private TableViewer fFeatureTable;
-
-	public FeatureSection(PDEFormPage formPage, Composite parent) {
-		super(formPage, parent, Section.DESCRIPTION, getButtonLabels()); 
-	}
-	
-	private static String[] getButtonLabels() {
-		String[] labels = new String[6];
-		labels[0] = PDEUIMessages.Product_FeatureSection_add; 
-		labels[1] = PDEUIMessages.Product_FeatureSection_remove; 
-		labels[2] = PDEUIMessages.Product_PluginSection_removeAll; 
-		labels[3] = null;
-		labels[4] = null;
-		labels[5] = PDEUIMessages.Product_FeatureSection_newFeature; 
-		return labels;
-	}
-
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESection#createClient(org.eclipse.ui.forms.widgets.Section, org.eclipse.ui.forms.widgets.FormToolkit)
-	 */
-	protected void createClient(Section section, FormToolkit toolkit) {
-		Composite container = createClientContainer(section, 2, toolkit);
-		createViewerPartControl(container, SWT.MULTI, 2, toolkit);
-		container.setLayoutData(new GridData(GridData.FILL_BOTH));
-		
-		TablePart tablePart = getTablePart();
-		fFeatureTable = tablePart.getTableViewer();
-		fFeatureTable.setContentProvider(new ContentProvider());
-		fFeatureTable.setLabelProvider(PDEPlugin.getDefault().getLabelProvider());
-		GridData data = (GridData)tablePart.getControl().getLayoutData();
-		data.minimumWidth = 200;
-		fFeatureTable.setInput(PDECore.getDefault().getFeatureModelManager());
-		
-		tablePart.setButtonEnabled(0, isEditable());
-		tablePart.setButtonEnabled(1, isEditable());
-		tablePart.setButtonEnabled(2, isEditable());
-		tablePart.setButtonEnabled(5, isEditable());
-		
-		toolkit.paintBordersFor(container);
-		section.setClient(container);
-		
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.verticalSpan = 2;
-		section.setLayoutData(gd);
-		section.setText(PDEUIMessages.Product_FeatureSection_title); 
-		section.setDescription(PDEUIMessages.Product_FeatureSection_desc); //		
-
-		getModel().addModelChangedListener(this);	
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#buttonSelected(int)
-	 */
-	protected void buttonSelected(int index) {
-		switch (index) {
-		case 0:
-			handleAdd();
-			break;
-		case 1:
-			handleDelete();
-			break;
-		case 2: 
-			handleRemoveAll();
-			break;
-		case 5:
-			handleNewFeature();
-		}
-	}
-	
-	private void handleNewFeature() {
-		NewFeatureProjectWizard wizard = new NewFeatureProjectWizard();
-		WizardDialog dialog = new WizardDialog(PDEPlugin.getActiveWorkbenchShell(), wizard);
-		dialog.create();
-		SWTUtil.setDialogSize(dialog, 400, 500);
-		if (dialog.open() == WizardDialog.OK) {
-			addFeature(wizard.getFeatureId(), wizard.getFeatureVersion());
-		}
-	}
-	
-	private void addFeature(String id, String version) {
-		IProduct product = getProduct();
-		IProductModelFactory factory = product.getModel().getFactory();
-		IProductFeature feature = factory.createFeature();
-		feature.setId(id);
-		feature.setVersion(version);
-		product.addFeature(feature);
-	}
-	
-
-	private void handleRemoveAll() {
-		TableItem[] items = fFeatureTable.getTable().getItems();
-		IProduct product = getProduct();
-		for (int i = 0; i < items.length; i++) {
-			product.removeFeature((IProductFeature)items[i].getData());
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.TableSection#handleDoubleClick(org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	protected void handleDoubleClick(IStructuredSelection selection) {
-		handleOpen(selection);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#dispose()
-	 */
-	public void dispose() {
-		IProductModel model = getModel();
-		if (model != null)
-			model.removeModelChangedListener(this);
-		super.dispose();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESection#doGlobalAction(java.lang.String)
-	 */
-	public boolean doGlobalAction(String actionId) {
-		if (actionId.equals(ActionFactory.DELETE.getId())) {
-			handleDelete();
-			return true;
-		}
-		if (actionId.equals(ActionFactory.CUT.getId())) {
-			handleDelete();
-			return false;
-		}
-		if (actionId.equals(ActionFactory.PASTE.getId())) {
-			doPaste();
-			return true;
-		}
-		return false;
-	}
-	
-	protected boolean canPaste(Object target, Object[] objects) {
-		for (int i = 0; i < objects.length; i++) {
-			if (objects[i] instanceof IProductFeature)
-				return true;
-		}
-		return false;
-	}
-	
-	protected void doPaste(Object target, Object[] objects) {
-		for (int i = 0; i < objects.length; i++) {
-			if (objects[i] instanceof IProductFeature)
-				getProduct().addFeature((IProductFeature)objects[i]);		
-		}
-	}
-
-	
-	private void handleDelete() {
-		IStructuredSelection ssel = (IStructuredSelection)fFeatureTable.getSelection();
-		if (ssel.size() > 0) {
-			Object[] objects = ssel.toArray();
-			IProduct product = getProduct();
-			for (int i = 0; i < objects.length; i++) {
-				product.removeFeature((IProductFeature)objects[i]);
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#fillContextMenu(org.eclipse.jface.action.IMenuManager)
-	 */
-	protected void fillContextMenu(IMenuManager manager) {
-		IStructuredSelection ssel = (IStructuredSelection)fFeatureTable.getSelection();
-		if (ssel == null)
-			return;
-		
-		Action openAction = new Action(PDEUIMessages.Product_FeatureSection_open) { 
-			public void run() {
-				handleDoubleClick((IStructuredSelection)fFeatureTable.getSelection());
-			}
-		};
-		openAction.setEnabled(isEditable() && ssel.size() == 1);
-		manager.add(openAction);
-		
-		manager.add(new Separator());
-		
-		Action removeAction = new Action(PDEUIMessages.Product_FeatureSection_remove) { 
-			public void run() {
-				handleDelete();
-			}
-		};
-		removeAction.setEnabled(isEditable() && ssel.size() > 0);
-		manager.add(removeAction);
-		
-		Action removeAll = new Action(PDEUIMessages.FeatureSection_removeAll) { 
-			public void run() {
-				handleRemoveAll();
-			}
-		};
-		removeAll.setEnabled(isEditable());
-		manager.add(removeAll);
-
-		manager.add(new Separator());
-		
-		getPage().getPDEEditor().getContributor().contextMenuAboutToShow(manager);
-	}
-
-	private void handleOpen(IStructuredSelection selection) {
-		if (!selection.isEmpty()) {
-			IProductFeature feature = (IProductFeature)selection.getFirstElement();
-			FeatureModelManager manager = PDECore.getDefault().getFeatureModelManager();
-			IFeatureModel model = manager.findFeatureModel(feature.getId(), feature.getVersion());
-			FeatureEditor.openFeatureEditor(model);
-		}
-	}
-
-	private void handleAdd() {
-		FeatureSelectionDialog dialog = new FeatureSelectionDialog(PDEPlugin
-				.getActiveWorkbenchShell(), getAvailableChoices(), true);
-		if (dialog.open() == Window.OK) {
-			Object[] models = dialog.getResult();
-			for (int i = 0; i < models.length; i++) {
-				IFeature feature = ((IFeatureModel)models[i]).getFeature();
-				addFeature(feature.getId(), feature.getVersion());
-			}
-		}
-	}
-	
-	private IFeatureModel[] getAvailableChoices() {
-		IFeatureModel[] models = PDECore.getDefault().getFeatureModelManager().getModels();
-		IProduct product = getProduct();
-		ArrayList list = new ArrayList();
-		for (int i = 0; i < models.length; i++) {
-			String id = models[i].getFeature().getId();
-			if (id != null && !product.containsFeature(id)) {
-				list.add(models[i]);
-			}
-		}
-		return (IFeatureModel[])list.toArray(new IFeatureModel[list.size()]);
-	}
-
-	
-	private IProduct getProduct() {
-		return getModel().getProduct();
-	}
-	
-	private IProductModel getModel() {
-		return (IProductModel) getPage().getPDEEditor().getAggregateModel();	
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESection#modelChanged(org.eclipse.pde.core.IModelChangedEvent)
-	 */
-	public void modelChanged(IModelChangedEvent e) {
-		Object[] objects = e.getChangedObjects();
-		if (e.getChangeType() == IModelChangedEvent.INSERT) {
-			for (int i = 0; i < objects.length; i++) {
-				if (objects[i] instanceof IProductFeature)
-					fFeatureTable.add(objects[i]);
-			}
-		} else if (e.getChangeType() == IModelChangedEvent.REMOVE) {
-			for (int i = 0; i < objects.length; i++) {
-				if (objects[i] instanceof IProductFeature)
-					fFeatureTable.remove(objects[i]);
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#refresh()
-	 */
-	public void refresh() {
-		fFeatureTable.refresh();
-		super.refresh();
-	}
-	
-	protected void selectionChanged(IStructuredSelection selection) {
-		getPage().getPDEEditor().setSelection(selection);
-	}
-
-	public boolean setFormInput(Object input) {
-		if (input instanceof IProductFeature) {
-			fFeatureTable.setSelection(new StructuredSelection(input), true);
-			return true;
-		}
-		return super.setFormInput(input);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/IntroSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/IntroSection.java
deleted file mode 100644
index 99f4606..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/IntroSection.java
+++ /dev/null

@@ -1,288 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.product;
-
-import java.util.TreeSet;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.TextUtilities;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.pde.core.plugin.IPluginElement;
-import org.eclipse.pde.core.plugin.IPluginExtension;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.core.plugin.IPluginObject;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.TargetPlatform;
-import org.eclipse.pde.internal.core.iproduct.IIntroInfo;
-import org.eclipse.pde.internal.core.iproduct.IProduct;
-import org.eclipse.pde.internal.core.iproduct.IProductModel;
-import org.eclipse.pde.internal.core.iproduct.IProductModelFactory;
-import org.eclipse.pde.internal.core.iproduct.IProductPlugin;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.PDESection;
-import org.eclipse.pde.internal.ui.model.bundle.Bundle;
-import org.eclipse.pde.internal.ui.model.bundle.BundleModel;
-import org.eclipse.pde.internal.ui.model.bundle.ManifestHeader;
-import org.eclipse.pde.internal.ui.parts.ComboPart;
-import org.eclipse.pde.internal.ui.wizards.product.ProductIntroWizard;
-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.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.text.edits.InsertEdit;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.TextEdit;
-import org.eclipse.ui.forms.FormColors;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
-import org.osgi.framework.Constants;
-
-
-public class IntroSection extends PDESection {
-
-	private ComboPart fIntroCombo;
-	private IResource fManifest;
-	private String[] fAvailableIntroIds;
-	private static final String INTRO_POINT = "org.eclipse.ui.intro"; //$NON-NLS-1$
-	private static final double NEW_INTRO_SUPPORT_VERSION = 3.1;
-
-	public IntroSection(PDEFormPage page, Composite parent) {
-		super(page, parent, Section.DESCRIPTION);
-		createClient(getSection(), page.getEditor().getToolkit());
-	}
-	
-	public void createClient(Section section, FormToolkit toolkit) {
-		section.setText(PDEUIMessages.IntroSection_sectionText); 
-		section.setDescription(PDEUIMessages.IntroSection_sectionDescription); 
-		
-		Composite client = toolkit.createComposite(section);
-		TableWrapLayout layout = new TableWrapLayout();
-		boolean canCreateNew = TargetPlatform.getTargetVersion() >= NEW_INTRO_SUPPORT_VERSION;
-		layout.numColumns = canCreateNew ? 3 : 2;
-		layout.topMargin = 5;
-		client.setLayout(layout);
-		
-		
-		Label label = toolkit.createLabel(client, PDEUIMessages.IntroSection_introLabel, SWT.WRAP);
-		TableWrapData td = new TableWrapData();
-		td.colspan = canCreateNew ? 3 : 2;
-		label.setLayoutData(td);
-		
-		Label introLabel = toolkit.createLabel(client, PDEUIMessages.IntroSection_introInput); 
-		introLabel.setForeground(toolkit.getColors().getColor(FormColors.TITLE));
-		td = new TableWrapData();
-		td.valign = TableWrapData.MIDDLE;
-		introLabel.setLayoutData(td);
-		
-		fIntroCombo = new ComboPart();
-		fIntroCombo.createControl(client, toolkit, SWT.READ_ONLY);
-		td = new TableWrapData(TableWrapData.FILL_GRAB);
-		td.valign = TableWrapData.MIDDLE;
-		fIntroCombo.getControl().setLayoutData(td);
-		loadManifestAndIntroIds(false);
-		if (fAvailableIntroIds != null ) fIntroCombo.setItems(fAvailableIntroIds);
-		fIntroCombo.add(""); //$NON-NLS-1$
-		fIntroCombo.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleSelection();
-			}
-		});
-		
-		if (canCreateNew) {
-			Button button = toolkit.createButton(client, PDEUIMessages.IntroSection_new, SWT.PUSH); 
-			button.setEnabled(isEditable());
-			button.setLayoutData(new TableWrapData(TableWrapData.FILL));
-			button.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					handleNewIntro();
-				}
-			});	
-		}
-		
-		fIntroCombo.getControl().setEnabled(isEditable());
-		
-		toolkit.paintBordersFor(client);
-		section.setClient(client);
-		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL|GridData.VERTICAL_ALIGN_BEGINNING));
-	}
-	
-	private void handleSelection() {
-		if (!productDefined()) {
-			fIntroCombo.setText(""); //$NON-NLS-1$
-			return;
-		}
-		getIntroInfo().setId(fIntroCombo.getSelection());
-		try { addDependenciesAndPlugins(); } catch (CoreException e) {}
-	}
-
-	private void loadManifestAndIntroIds(boolean onlyLoadManifest) {
-		TreeSet result = new TreeSet();
-		String introId;
-		IPluginModelBase[] plugins = PDECore.getDefault().getModelManager().getPlugins();
-		for (int i = 0; i < plugins.length; i++) {
-			IPluginExtension[] extensions = plugins[i].getPluginBase().getExtensions();
-			for (int j = 0; j < extensions.length; j++) {
-				String point = extensions[j].getPoint();
-				if (point != null && point.equals("org.eclipse.ui.intro")) {//$NON-NLS-1$
-					IPluginObject[] children = extensions[j].getChildren();
-					for (int k = 0; k < children.length; k++) {
-						IPluginElement element = (IPluginElement)children[k];
-						if ("introProductBinding".equals(element.getName())) {//$NON-NLS-1$
-							if (element.getAttribute("productId").getValue().equals(getProduct().getId())) { //$NON-NLS-1$
-								if (fManifest == null)
-									fManifest = element.getPluginModel().getUnderlyingResource();
-								if (onlyLoadManifest)
-									return;
-								introId = element.getAttribute("introId").getValue(); //$NON-NLS-1$
-								if (introId != null)
-									result.add(introId);
-							}
-						}
-					}
-				}
-			}
-		}
-		fAvailableIntroIds = (String[])result.toArray(new String[result.size()]);
-	}
-	
-	private void handleNewIntro() {
-		boolean needNewProduct = false;
-		if (!productDefined()) {
-			needNewProduct = true;
-			MessageDialog mdiag = new MessageDialog(PDEPlugin.getActiveWorkbenchShell(),
-					PDEUIMessages.IntroSection_undefinedProductId, null, 
-					PDEUIMessages.IntroSection_undefinedProductIdMessage,
-					MessageDialog.QUESTION, new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL }, 0);
-	        if (mdiag.open() != MessageDialog.OK)
-	        	return;
-		}
-		ProductIntroWizard wizard = new ProductIntroWizard(getProduct(), needNewProduct);
-		WizardDialog dialog = new WizardDialog(PDEPlugin.getActiveWorkbenchShell(), wizard);
-		dialog.create();
-		if (dialog.open() == WizardDialog.OK) {
-			String id = wizard.getIntroId();
-			fIntroCombo.add(id, 0);
-			fIntroCombo.setText(id);
-			getIntroInfo().setId(id);
-			try { addDependenciesAndPlugins(); } catch (CoreException e) {}
-		}
-	}
-
-	public void refresh() {
-		String introId = getIntroInfo().getId();
-		if (introId != null) fIntroCombo.setText(introId);
-		super.refresh();
-	}
-	
-	private IIntroInfo getIntroInfo() {
-		IIntroInfo info = getProduct().getIntroInfo();
-		if (info == null) {
-			info = getModel().getFactory().createIntroInfo();
-			getProduct().setIntroInfo(info);
-		}
-		return info;
-	}
-	
-	private IProduct getProduct() {
-		return getModel().getProduct();
-	}
-	
-	private IProductModel getModel() {
-		return (IProductModel)getPage().getPDEEditor().getAggregateModel();
-	}
-	
-	private boolean productDefined() {
-		return !getProduct().getId().equals(""); //$NON-NLS-1$
-	}
-	
-	private void addDependenciesAndPlugins() throws CoreException {
-		IProduct product = getProduct();
-		IProductModelFactory factory = product.getModel().getFactory();
-		IProductPlugin plugin = factory.createPlugin();
-		plugin.setId(INTRO_POINT);
-		product.addPlugin(plugin);
-		
-		PluginSection.handleAddRequired(new IProductPlugin[] {plugin});
-		if (fManifest == null) loadManifestAndIntroIds(true);
-		if (fManifest != null) addRequiredBundle();
-	}
-	
-	private void addRequiredBundle() throws CoreException {
-		ITextFileBufferManager manager = FileBuffers.getTextFileBufferManager();
-		IPath manifestPath = fManifest.getFullPath();
-		IProgressMonitor monitor = new NullProgressMonitor();
-		try {
-			manager.connect(manifestPath, monitor);
-			ITextFileBuffer buffer = manager.getTextFileBuffer(manifestPath);
-
-			IDocument document = buffer.getDocument();
-			
-			String ld = TextUtilities.getDefaultLineDelimiter(document);
-			TextEdit edit = checkTrailingNewline(document, ld);
-			if (edit != null)
-				edit.apply(document);
-			
-			BundleModel model = new BundleModel(document, false);
-			model.load();
-			if (!model.isLoaded())
-				return;
-			Bundle bundle = (Bundle)model.getBundle();
-			edit = createAddToHeaderTextEdit(document, bundle, Constants.REQUIRE_BUNDLE, ld);
-			if (edit != null) {
-				edit.apply(document);
-				buffer.commit(monitor, true);
-			}
-		} catch (MalformedTreeException e) {
-		} catch (BadLocationException e) {
-		} finally {
-			manager.disconnect(manifestPath, monitor);
-		}
-	}
-	
-	private TextEdit createAddToHeaderTextEdit(IDocument doc, Bundle bundle, String headerName, String ld) {
-		ManifestHeader header = bundle.getManifestHeader(headerName);
-		if (header == null) 
-			return new InsertEdit(doc.getLength(), Constants.REQUIRE_BUNDLE + ": " + INTRO_POINT + ld); //$NON-NLS-1$
-		if (header.getValue().indexOf(INTRO_POINT) == -1)
-			return new InsertEdit(header.getOffset() + header.getLength() - ld.length(), "," + ld + " " + INTRO_POINT); //$NON-NLS-1$ //$NON-NLS-2$
-		return null;
-	}
-	
-	private TextEdit checkTrailingNewline(IDocument document, String ld) {
-		try {
-			int len = ld.length();
-			if (!document.get(document.getLength() - len, len).equals(ld)) {
-				return new InsertEdit(document.getLength(), ld);
-			}
-		} catch (BadLocationException e) {
-		}
-		return null;
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/LauncherPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/LauncherPage.java
deleted file mode 100644
index 20e5725..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/LauncherPage.java
+++ /dev/null

@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.product;
-
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.*;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.widgets.*;
-
-
-public class LauncherPage extends PDEFormPage {
-	
-	public static final String PAGE_ID = "launcher"; //$NON-NLS-1$
-
-	public LauncherPage(FormEditor editor) {
-		super(editor, PAGE_ID, PDEUIMessages.LauncherPage_title); 
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormPage#createFormContent(org.eclipse.ui.forms.IManagedForm)
-	 */
-	protected void createFormContent(IManagedForm managedForm) {
-		super.createFormContent(managedForm);
-		ScrolledForm form = managedForm.getForm();
-		FormToolkit toolkit = managedForm.getToolkit();
-		form.setText(PDEUIMessages.LauncherPage_title);  
-		fillBody(managedForm, toolkit);
-		managedForm.refresh();
-		
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.BRANDING_PAGE);
-	}
-	
-	private void fillBody(IManagedForm managedForm, FormToolkit toolkit) {
-		Composite body = managedForm.getForm().getBody();
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginWidth = 10;
-		layout.verticalSpacing = 20;
-		layout.horizontalSpacing = 10;
-		body.setLayout(layout);
-
-		// sections
-		managedForm.addPart(new LauncherSection(this, body));
-		managedForm.addPart(new ArgumentsSection(this, body));
-	}
-
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/LauncherSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/LauncherSection.java
deleted file mode 100644
index e5656ff..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/LauncherSection.java
+++ /dev/null

@@ -1,338 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.product;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.pde.internal.core.iproduct.*;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.parts.FormEntry;
-import org.eclipse.pde.internal.ui.util.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.widgets.*;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.model.*;
-
-
-public class LauncherSection extends PDESection {
-
-	private FormEntry fNameEntry;
-
-	private ArrayList fIcons = new ArrayList();
-
-	private Button fIcoButton;
-
-	private Button fBmpButton;
-
-	class IconEntry extends FormEntry {
-		String fIconId;
-		public IconEntry(Composite parent, FormToolkit toolkit, String labelText, String iconId) {
-			super(parent, toolkit, labelText, PDEUIMessages.LauncherSection_browse, isEditable(), 20); 
-			fIconId = iconId;
-			addEntryFormListener();
-			setEditable(isEditable());
-		}		
-		private void addEntryFormListener() {
-			IActionBars actionBars = getPage().getPDEEditor().getEditorSite().getActionBars();
-			setFormEntryListener(new FormEntryAdapter(LauncherSection.this, actionBars) {
-				public void textValueChanged(FormEntry entry) {
-					getLauncherInfo().setIconPath(fIconId, entry.getValue());
-				}			
-				public void browseButtonSelected(FormEntry entry) {
-					handleBrowse((IconEntry)entry);
-				}			
-				public void linkActivated(HyperlinkEvent e) {
-					openImage(IconEntry.this.getValue());
-				}
-			});
-		}		
-		public String getIconId() {
-			return fIconId;
-		}		
-	}
-
-	public LauncherSection(PDEFormPage page, Composite parent) {
-		super(page, parent, Section.DESCRIPTION);
-		createClient(getSection(), page.getEditor().getToolkit());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESection#createClient(org.eclipse.ui.forms.widgets.Section, org.eclipse.ui.forms.widgets.FormToolkit)
-	 */
-	protected void createClient(Section section, FormToolkit toolkit) {
-		section.setText(PDEUIMessages.LauncherSection_title); 
-		section.setDescription(PDEUIMessages.LauncherSection_desc); 
-
-		Composite client = toolkit.createComposite(section);
-		TableWrapLayout layout = new TableWrapLayout();
-		layout.numColumns = 2;
-		client.setLayout(layout);
-		
-		IActionBars actionBars = getPage().getPDEEditor().getEditorSite().getActionBars();
-		fNameEntry = new FormEntry(client, toolkit, PDEUIMessages.LauncherSection_launcherName, null, false); 
-		fNameEntry.setFormEntryListener(new FormEntryAdapter(this, actionBars) {
-			public void textValueChanged(FormEntry entry) {
-				getLauncherInfo().setLauncherName(entry.getValue());
-			}
-		});
-		fNameEntry.setEditable(isEditable());
-		
-		createLabel(client, toolkit, "", 2);	 //$NON-NLS-1$
-		createLabel(client, toolkit, PDEUIMessages.LauncherSection_label, 2); 
-		
-		addLinuxSection(client, toolkit);
-		addMacSection(client, toolkit);
-		addSolarisSection(client, toolkit);
-		addWin32Section(client, toolkit);
-		
-		toolkit.paintBordersFor(client);
-		section.setClient(client);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL|GridData.VERTICAL_ALIGN_BEGINNING);
-		gd.verticalSpan = 4;
-		section.setLayoutData(gd);
-	}
-	
-	private void addWin32Section(Composite parent, FormToolkit toolkit) {
-		Composite comp = createComposite(parent, toolkit, "win32"); //$NON-NLS-1$
-		
-		fIcoButton = toolkit.createButton(comp, PDEUIMessages.LauncherSection_ico, SWT.RADIO); 
-		TableWrapData gd = new TableWrapData();
-		gd.colspan = 3;
-		fIcoButton.setLayoutData(gd);
-		fIcoButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				boolean selected = fIcoButton.getSelection();
-				getLauncherInfo().setUseWinIcoFile(selected);
-				updateWinEntries(selected);
-			}
-		});
-		fIcoButton.setEnabled(isEditable());
-		
-		fIcons.add(new IconEntry(comp, toolkit, PDEUIMessages.LauncherSection_file, ILauncherInfo.P_ICO_PATH)); 
-		
-		fBmpButton = toolkit.createButton(comp, PDEUIMessages.LauncherSection_bmpImages, SWT.RADIO); 
-		gd = new TableWrapData();
-		gd.colspan = 3;
-		fBmpButton.setLayoutData(gd);
-		fBmpButton.setEnabled(isEditable());
-		
-		final Label label = toolkit.createLabel(comp, PDEUIMessages.LauncherSection_bmpImagesText, SWT.WRAP); 
-		gd = new TableWrapData();
-		gd.colspan = 3;
-		label.setLayoutData(gd);
-
-		fIcons.add(new IconEntry(comp, toolkit, PDEUIMessages.LauncherSection_Low16, ILauncherInfo.WIN32_16_LOW)); 
-		fIcons.add(new IconEntry(comp, toolkit, PDEUIMessages.LauncherSection_High16, ILauncherInfo.WIN32_16_HIGH)); 
-		fIcons.add(new IconEntry(comp, toolkit, PDEUIMessages.LauncherSection_32Low, ILauncherInfo.WIN32_32_LOW)); 
-		fIcons.add(new IconEntry(comp, toolkit, PDEUIMessages.LauncherSection_32High, ILauncherInfo.WIN32_32_HIGH)); 
-		fIcons.add(new IconEntry(comp, toolkit, PDEUIMessages.LauncherSection_48Low, ILauncherInfo.WIN32_48_LOW)); 
-		fIcons.add(new IconEntry(comp, toolkit, PDEUIMessages.LauncherSection_48High, ILauncherInfo.WIN32_48_HIGH)); 
-
-		toolkit.paintBordersFor(comp);
-	}
-	
-	private void createLabel(Composite parent, FormToolkit toolkit, String text, int span) {
-		Label label = toolkit.createLabel(parent, text, SWT.WRAP);
-		Layout layout = parent.getLayout();
-		if (layout instanceof GridLayout) {
-			GridData gd = new GridData();
-			gd.horizontalSpan = span;
-			label.setLayoutData(gd);				
-		}
-		else if (layout instanceof TableWrapLayout) {
-			TableWrapData td = new TableWrapData();
-			td.colspan = span;
-			label.setLayoutData(td);			
-		}
-	}
-	
-	private void addLinuxSection(Composite parent, FormToolkit toolkit) {
-		Composite comp = createComposite(parent, toolkit, "linux"); //$NON-NLS-1$
-		createLabel(comp, toolkit, PDEUIMessages.LauncherSection_linuxLabel, 3);	 
-		fIcons.add(new IconEntry(comp, toolkit, PDEUIMessages.LauncherSection_icon, ILauncherInfo.LINUX_ICON)); 
-		toolkit.paintBordersFor(comp);
-	}
-
-	private void addSolarisSection(Composite parent, FormToolkit toolkit) {
-		Composite comp = createComposite(parent, toolkit, "solaris"); //$NON-NLS-1$
-		createLabel(comp, toolkit, PDEUIMessages.LauncherSection_solarisLabel, 3); 
-
-		fIcons.add(new IconEntry(comp, toolkit, PDEUIMessages.LauncherSection_large, ILauncherInfo.SOLARIS_LARGE)); 
-		fIcons.add(new IconEntry(comp, toolkit, PDEUIMessages.LauncherSection_medium, ILauncherInfo.SOLARIS_MEDIUM)); 
-		fIcons.add(new IconEntry(comp, toolkit, PDEUIMessages.LauncherSection_small, ILauncherInfo.SOLARIS_SMALL)); 
-		fIcons.add(new IconEntry(comp, toolkit, PDEUIMessages.LauncherSection_tiny, ILauncherInfo.SOLARIS_TINY)); 
-		
-		toolkit.paintBordersFor(comp);
-	}
-	
-	private void addMacSection(Composite parent, FormToolkit toolkit) {
-		Composite comp = createComposite(parent, toolkit, "macosx");		 //$NON-NLS-1$
-		createLabel(comp, toolkit, PDEUIMessages.LauncherSection_macLabel, 3);		 
-		fIcons.add(new IconEntry(comp, toolkit, PDEUIMessages.LauncherSection_file, ILauncherInfo.MACOSX_ICON)); 
-		toolkit.paintBordersFor(comp);
-	}
-	
-	private Composite createComposite(Composite parent, FormToolkit toolkit, String text) {
-		ExpandableComposite ec = toolkit.createSection(parent, ExpandableComposite.TWISTIE|ExpandableComposite.COMPACT);
-		ec.setText(text);
-		
-		TableWrapData gd = new TableWrapData(TableWrapData.FILL_GRAB);
-		gd.colspan = 2;
-		ec.setLayoutData(gd);
-		Composite comp = toolkit.createComposite(ec);
-		TableWrapLayout layout = new TableWrapLayout();
-		layout.leftMargin = layout.rightMargin = 0;
-		layout.numColumns = 3;
-		comp.setLayout(layout);
-		ec.setClient(comp);
-		return comp;
-	}
-	
-	public void refresh() {
-		ILauncherInfo info = getLauncherInfo();
-		fNameEntry.setValue(info.getLauncherName(), true);
-		boolean useIco = info.usesWinIcoFile();
-		fIcoButton.setSelection(useIco);
-		fBmpButton.setSelection(!useIco);
-		
-		for (int i = 0; i < fIcons.size(); i++) {
-			IconEntry entry = (IconEntry)fIcons.get(i);
-			entry.setValue(info.getIconPath(entry.getIconId()), true);
-		}
-		updateWinEntries(useIco);
-		super.refresh();
-	}
-	
-	private void updateWinEntries(boolean useIco) {
-		for (int i = 0; i < fIcons.size(); i++) {
-			IconEntry entry = (IconEntry)fIcons.get(i);
-			String id = entry.getIconId();
-			if (id.equals(ILauncherInfo.P_ICO_PATH)) {
-				entry.setEditable(isEditable()&& useIco);
-			} else if (id.equals(ILauncherInfo.WIN32_16_HIGH) 
-					|| id.equals(ILauncherInfo.WIN32_16_LOW)
-					|| id.equals(ILauncherInfo.WIN32_32_HIGH)
-					|| id.equals(ILauncherInfo.WIN32_32_LOW)
-					|| id.equals(ILauncherInfo.WIN32_48_HIGH)
-					|| id.equals(ILauncherInfo.WIN32_48_LOW)) {
-				entry.setEditable(isEditable() && !useIco);
-			}
-		}
-	}
-	
-	private ILauncherInfo getLauncherInfo() {
-		ILauncherInfo info = getProduct().getLauncherInfo();
-		if (info == null) {
-			info = getModel().getFactory().createLauncherInfo();
-			getProduct().setLauncherInfo(info);
-		}
-		return info;
-	}
-	
-	private IProduct getProduct() {
-		return getModel().getProduct();
-	}
-	
-	private IProductModel getModel() {
-		return (IProductModel)getPage().getPDEEditor().getAggregateModel();
-	}
-	
-	public void commit(boolean onSave) {
-		fNameEntry.commit();
-		for (int i = 0; i < fIcons.size(); i++)
-			((FormEntry)fIcons.get(i)).commit();
-		super.commit(onSave);
-	}
-	
-	public void cancelEdit() {
-		fNameEntry.cancelEdit();
-		for (int i = 0; i < fIcons.size(); i++)
-			((FormEntry)fIcons.get(i)).commit();
-		super.cancelEdit();
-	}
-	
-	private void handleBrowse(IconEntry entry) {
-		ElementTreeSelectionDialog dialog =
-			new ElementTreeSelectionDialog(
-				getSection().getShell(),
-				new WorkbenchLabelProvider(),
-				new WorkbenchContentProvider());
-				
-		dialog.setValidator(new FileValidator());
-		dialog.setAllowMultiple(false);
-		dialog.setTitle(PDEUIMessages.LauncherSection_dialogTitle);  
-		String extension = getExtension(entry.getIconId());
-		dialog.setMessage(PDEUIMessages.LauncherSection_dialogMessage); 
-		dialog.addFilter(new FileExtensionFilter(extension)); 
-		dialog.setInput(PDEPlugin.getWorkspace().getRoot());
-
-		if (dialog.open() == ElementTreeSelectionDialog.OK) {
-			IFile file = (IFile)dialog.getFirstResult();
-			entry.setValue(file.getFullPath().toString());
-		}
-	}
-	
-	private void openImage(String value) {
-		IWorkspaceRoot root = PDEPlugin.getWorkspace().getRoot();
-		Path path = new Path(value);
-		if(path.isEmpty()){
-			MessageDialog.openWarning(PDEPlugin.getActiveWorkbenchShell(), PDEUIMessages.WindowImagesSection_open, PDEUIMessages.WindowImagesSection_emptyPath); // 
-			return;
-		}
-		IResource resource = root.findMember(new Path(value));
-		try {
-			if (resource != null && resource instanceof IFile)
-				IDE.openEditor(PDEPlugin.getActivePage(), (IFile)resource, true);
-			else
-				MessageDialog.openWarning(PDEPlugin.getActiveWorkbenchShell(), PDEUIMessages.WindowImagesSection_open, PDEUIMessages.WindowImagesSection_warning); // 
-		} catch (PartInitException e) {
-		}			
-	}
-
-	private String getExtension(String iconId) {
-		if (iconId.equals(ILauncherInfo.LINUX_ICON))
-			return "xpm"; //$NON-NLS-1$
-		if (iconId.equals(ILauncherInfo.MACOSX_ICON))
-			return "icns"; //$NON-NLS-1$
-		if (iconId.equals(ILauncherInfo.SOLARIS_LARGE))
-			return "l.pm"; //$NON-NLS-1$
-		if (iconId.equals(ILauncherInfo.SOLARIS_MEDIUM))
-			return "m.pm"; //$NON-NLS-1$
-		if (iconId.equals(ILauncherInfo.SOLARIS_SMALL))
-			return "s.pm"; //$NON-NLS-1$
-		if (iconId.equals(ILauncherInfo.SOLARIS_TINY))
-			return "t.pm"; //$NON-NLS-1$
-		if (iconId.equals(ILauncherInfo.P_ICO_PATH))
-			return "ico"; //$NON-NLS-1$
-		return "bmp";	 //$NON-NLS-1$
-	}
-	
-	public boolean canPaste(Clipboard clipboard) {
-		Display d = getSection().getDisplay();
-		Control c = d.getFocusControl();
-		if (c instanceof Text)
-			return true;
-		return false;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/OverviewPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/OverviewPage.java
deleted file mode 100644
index 1f414c1..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/OverviewPage.java
+++ /dev/null

@@ -1,190 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.product;
-
-import java.io.*;
-import java.lang.reflect.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.debug.core.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.internal.core.iproduct.*;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDELabelProvider;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.PDESection;
-import org.eclipse.pde.internal.ui.launcher.*;
-import org.eclipse.pde.internal.ui.wizards.product.*;
-import org.eclipse.swt.SWTException;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.*;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.events.*;
-import org.eclipse.ui.forms.widgets.*;
-import org.eclipse.ui.progress.*;
-
-
-public class OverviewPage extends PDEFormPage implements IHyperlinkListener {
-	
-	public static final String PAGE_ID = "overview"; //$NON-NLS-1$
-
-	public OverviewPage(FormEditor editor) {
-		super(editor, PAGE_ID, PDEUIMessages.OverviewPage_title); 
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormPage#createFormContent(org.eclipse.ui.forms.IManagedForm)
-	 */
-	protected void createFormContent(IManagedForm managedForm) {
-		super.createFormContent(managedForm);
-		ScrolledForm form = managedForm.getForm();
-		FormToolkit toolkit = managedForm.getToolkit();
-		form.setText(PDEUIMessages.OverviewPage_title);  
-		fillBody(managedForm, toolkit);
-		managedForm.refresh();
-		
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.OVERVIEW_PAGE);
-	}
-
-	private void fillBody(IManagedForm managedForm, FormToolkit toolkit) {
-		Composite body = managedForm.getForm().getBody();
-		TableWrapLayout layout = new TableWrapLayout();
-		layout.bottomMargin = 10;
-		layout.topMargin = 5;
-		layout.leftMargin = 10;
-		layout.rightMargin = 10;
-		layout.numColumns = 2;
-		layout.makeColumnsEqualWidth =true;
-		layout.verticalSpacing = 30;
-		layout.horizontalSpacing = 10;
-		body.setLayout(layout);
-
-		// sections
-		managedForm.addPart(new ProductInfoSection(this, body));
-		if (getModel().isEditable()) {
-			createTestingSection(body, toolkit);
-			createExportingSection(body, toolkit);
-		}
-	}
-	
-	private void createTestingSection(Composite parent, FormToolkit toolkit) {
-		Section section = toolkit.createSection(parent, Section.TITLE_BAR);
-		section.clientVerticalSpacing = PDESection.CLIENT_VSPACING;
-		section.setText(PDEUIMessages.Product_OverviewPage_testing); 
-		FormText text = createClient(section, PDEUIMessages.Product_overview_testing, toolkit); 
-		text.setImage("run", getImage(PDEPluginImages.DESC_RUN_EXC)); //$NON-NLS-1$
-		text.setImage("debug", getImage(PDEPluginImages.DESC_DEBUG_EXC)); //$NON-NLS-1$
-		text.addHyperlinkListener(this);
-		section.setClient(text);
-		section.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
-	}
-	
-	private void createExportingSection(Composite parent, FormToolkit toolkit) {
-		Section section = toolkit.createSection(parent, Section.TITLE_BAR);
-		section.clientVerticalSpacing = PDESection.CLIENT_VSPACING;
-		section.setText(PDEUIMessages.OverviewPage_exportingTitle); 
-		FormText text = createClient(section, PDEUIMessages.Product_overview_exporting, toolkit); 
-		text.addHyperlinkListener(this);
-		section.setClient(text);
-		section.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));		
-	}
-	
-	private FormText createClient(Section section, String content,
-			FormToolkit toolkit) {
-		FormText text = toolkit.createFormText(section, true);
-		try {
-			text.setText(content, true, false);
-		} catch (SWTException e) {
-			text.setText("", false, false); //$NON-NLS-1$
-		}
-		section.setClient(text);
-		section.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
-		return text;
-	}
-	
-	private Image getImage(ImageDescriptor desc) {
-		return getImage(desc, 0);
-	}
-	
-	private Image getImage(ImageDescriptor desc, int overlay) {
-		PDELabelProvider lp = PDEPlugin.getDefault().getLabelProvider();
-		return lp.get(desc, overlay);
-	}
-
-	public void linkEntered(HyperlinkEvent e) {
-		getStatusLineManager().setMessage(e.getLabel());
-	}
-
-	public void linkExited(HyperlinkEvent e) {
-		getStatusLineManager().setMessage(null);
-	}
-
-	public void linkActivated(HyperlinkEvent e) {
-		String href = (String) e.getHref();
-		if (href.equals("action.debug")) { //$NON-NLS-1$
-			handleSynchronize(false);
-			new LaunchAction(getProduct(), getFilePath(), ILaunchManager.DEBUG_MODE).run();
-		} else if (href.equals("action.run")) { //$NON-NLS-1$
-			handleSynchronize(false);
-			new LaunchAction(getProduct(), getFilePath(), ILaunchManager.RUN_MODE).run();
-		} else if (href.equals("action.synchronize")) { //$NON-NLS-1$
-			handleSynchronize(true);
-		} else if (href.equals("action.export")) { //$NON-NLS-1$
-			if (getPDEEditor().isDirty())
-				getPDEEditor().doSave(null);
-			new ProductExportAction(getPDEEditor()).run();
-		} else if (href.equals("configuration")) { //$NON-NLS-1$
-			String pageId = getProduct().useFeatures() ? ConfigurationPage.FEATURE_ID : ConfigurationPage.PLUGIN_ID;
-			getEditor().setActivePage(pageId);
-			
-		}
-	}
-	
-	private String getFilePath() {
-		Object file = getEditorInput().getAdapter(IFile.class);
-		if (file != null)
-			return ((IFile)file).getFullPath().toString();
-		file = getEditorInput().getAdapter(File.class);
-		if (file != null)
-			return ((File)file).getAbsolutePath();
-		return getProduct().getId();
-	}
-	
-	private void handleSynchronize(boolean alert) {
-		try {
-			IProgressService service = PlatformUI.getWorkbench().getProgressService();
-			SynchronizationOperation op = new SynchronizationOperation(getProduct(), getSite().getShell());
-			service.runInUI(service, op, PDEPlugin.getWorkspace().getRoot());
-		} catch (InterruptedException e) {
-		} catch (InvocationTargetException e) {		
-			if (alert) MessageDialog.openError(getSite().getShell(), "Synchronize", e.getTargetException().getMessage()); //$NON-NLS-1$
-		}
-	}
-	
-	private IProduct getProduct() {
-		IBaseModel model = getPDEEditor().getAggregateModel();
-		return ((IProductModel)model).getProduct();
-	}
-
-	private IStatusLineManager getStatusLineManager() {
-		IEditorSite site = getEditor().getEditorSite();
-		return site.getActionBars().getStatusLineManager();
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/PluginSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/PluginSection.java
deleted file mode 100644
index f79c3fb..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/PluginSection.java
+++ /dev/null

@@ -1,505 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.product;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.TreeMap;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.IStructuredSelection;
-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.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.osgi.service.resolver.BundleDescription;
-import org.eclipse.osgi.service.resolver.BundleSpecification;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.IPluginModelListener;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.PluginModelDelta;
-import org.eclipse.pde.internal.core.TargetPlatform;
-import org.eclipse.pde.internal.core.iproduct.IProduct;
-import org.eclipse.pde.internal.core.iproduct.IProductModel;
-import org.eclipse.pde.internal.core.iproduct.IProductModelFactory;
-import org.eclipse.pde.internal.core.iproduct.IProductPlugin;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.TableSection;
-import org.eclipse.pde.internal.ui.editor.plugin.ManifestEditor;
-import org.eclipse.pde.internal.ui.elements.DefaultTableProvider;
-import org.eclipse.pde.internal.ui.parts.TablePart;
-import org.eclipse.pde.internal.ui.util.PersistablePluginObject;
-import org.eclipse.pde.internal.ui.util.SWTUtil;
-import org.eclipse.pde.internal.ui.wizards.plugin.NewFragmentProjectWizard;
-import org.eclipse.pde.internal.ui.wizards.plugin.NewPluginProjectWizard;
-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.TableItem;
-import org.eclipse.ui.IWorkingSet;
-import org.eclipse.ui.IWorkingSetManager;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.dialogs.ElementListSelectionDialog;
-import org.eclipse.ui.dialogs.IWorkingSetSelectionDialog;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-
-public class PluginSection extends TableSection implements IPluginModelListener{
-	
-	class ContentProvider extends DefaultTableProvider {
-		public Object[] getElements(Object parent) {
-			return getProduct().getPlugins();
-		}
-	}
-
-	private TableViewer fPluginTable;
-
-	public PluginSection(PDEFormPage formPage, Composite parent) {
-		super(formPage, parent, Section.DESCRIPTION, getButtonLabels());
-	}
-	
-	private static String[] getButtonLabels() {
-		String[] labels = new String[9];
-		labels[0] = PDEUIMessages.Product_PluginSection_add; 
-		labels[1] = PDEUIMessages.Product_PluginSection_working; 
-		labels[2] = PDEUIMessages.Product_PluginSection_required; 
-		labels[3] = PDEUIMessages.PluginSection_remove; 
-		labels[4] = PDEUIMessages.Product_PluginSection_removeAll; 
-		labels[5] = null;
-		labels[6] = null;
-		labels[7] = PDEUIMessages.Product_PluginSection_newPlugin; 
-		labels[8] = PDEUIMessages.Product_PluginSection_newFragment; 
-		return labels;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESection#createClient(org.eclipse.ui.forms.widgets.Section, org.eclipse.ui.forms.widgets.FormToolkit)
-	 */
-	protected void createClient(Section section, FormToolkit toolkit) {
-		Composite container = createClientContainer(section, 2, toolkit);
-		createViewerPartControl(container, SWT.MULTI, 2, toolkit);
-		container.setLayoutData(new GridData(GridData.FILL_BOTH));
-		
-		TablePart tablePart = getTablePart();
-		fPluginTable = tablePart.getTableViewer();
-		fPluginTable.setContentProvider(new ContentProvider());
-		fPluginTable.setLabelProvider(PDEPlugin.getDefault().getLabelProvider());
-		fPluginTable.setSorter(new ViewerSorter() {
-			public int compare(Viewer viewer, Object e1, Object e2) {
-				IProductPlugin p1 = (IProductPlugin)e1;
-				IProductPlugin p2 = (IProductPlugin)e2;
-				return super.compare(viewer, p1.getId(), p2.getId());
-			}
-		});
-		GridData data = (GridData)tablePart.getControl().getLayoutData();
-		data.minimumWidth = 200;
-		fPluginTable.setInput(PDECore.getDefault().getModelManager());
-		
-		tablePart.setButtonEnabled(0, isEditable());
-		tablePart.setButtonEnabled(1, isEditable());
-		tablePart.setButtonEnabled(2, isEditable());
-		tablePart.setButtonEnabled(3, isEditable());
-		tablePart.setButtonEnabled(4, isEditable());
-		tablePart.setButtonEnabled(6, isEditable());
-		tablePart.setButtonEnabled(7, isEditable());
-		tablePart.setButtonEnabled(8, isEditable());
-		
-		toolkit.paintBordersFor(container);
-		section.setClient(container);
-		
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.verticalSpan = 2;
-		section.setLayoutData(gd);
-		section.setText(PDEUIMessages.Product_PluginSection_title); 
-		section.setDescription(PDEUIMessages.Product_PluginSection_desc); 
-		getModel().addModelChangedListener(this);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#buttonSelected(int)
-	 */
-	protected void buttonSelected(int index) {
-		switch (index) {
-		case 0:
-			handleAdd();
-			break;
-		case 1:
-			handleAddWorkingSet();
-			break;
-		case 2:
-			handleAddRequired(getProduct().getPlugins());
-			break;
-		case 3:
-			handleDelete();
-			break;
-		case 4:
-			handleRemoveAll();
-			break;
-		case 7:
-			handleNewPlugin();
-			break;
-		case 8:
-			handleNewFragment();
-		}
-	}
-	
-	private void handleNewFragment() {
-		NewFragmentProjectWizard wizard = new NewFragmentProjectWizard();
-		WizardDialog dialog = new WizardDialog(PDEPlugin.getActiveWorkbenchShell(), wizard);
-		dialog.create();
-		SWTUtil.setDialogSize(dialog, 400, 500);
-		if (dialog.open() == WizardDialog.OK) {
-			addPlugin(wizard.getFragmentId());
-		}
-	}
-
-	private void handleNewPlugin() {
-		NewPluginProjectWizard wizard = new NewPluginProjectWizard();
-		WizardDialog dialog = new WizardDialog(PDEPlugin.getActiveWorkbenchShell(), wizard);
-		dialog.create();
-		SWTUtil.setDialogSize(dialog, 400, 500);
-		if (dialog.open() == WizardDialog.OK) {
-			addPlugin(wizard.getPluginId());
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.TableSection#handleDoubleClick(org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	protected void handleDoubleClick(IStructuredSelection selection) {
-		handleOpen(selection);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#dispose()
-	 */
-	public void dispose() {
-		IProductModel model = getModel();
-		if (model != null)
-			model.removeModelChangedListener(this);
-		super.dispose();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESection#doGlobalAction(java.lang.String)
-	 */
-	public boolean doGlobalAction(String actionId) {
-		if (actionId.equals(ActionFactory.DELETE.getId())) {
-			handleDelete();
-			return true;
-		} 	
-		if (actionId.equals(ActionFactory.CUT.getId())) {
-			handleDelete();
-			return false;
-		}
-		if (actionId.equals(ActionFactory.PASTE.getId())) {
-			doPaste();
-			return true;
-		}
-		return false;
-	}
-	
-	protected boolean canPaste(Object target, Object[] objects) {
-		for (int i = 0; i < objects.length; i++) {
-			if (objects[i] instanceof IProductPlugin)
-				return true;
-		}
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#fillContextMenu(org.eclipse.jface.action.IMenuManager)
-	 */
-	protected void fillContextMenu(IMenuManager manager) {
-		IStructuredSelection ssel = (IStructuredSelection)fPluginTable.getSelection();
-		if (ssel == null)
-			return;
-		
-		Action openAction = new Action(PDEUIMessages.PluginSection_open) { 
-			public void run() {
-				handleDoubleClick((IStructuredSelection)fPluginTable.getSelection());
-			}
-		};
-		openAction.setEnabled(isEditable() && ssel.size() == 1);
-		manager.add(openAction);
-		
-		manager.add(new Separator());
-		
-		Action removeAction = new Action(PDEUIMessages.PluginSection_remove) { 
-			public void run() {
-				handleDelete();
-			}
-		};
-		removeAction.setEnabled(isEditable() && ssel.size() > 0);
-		manager.add(removeAction);
-		
-		Action removeAll = new Action(PDEUIMessages.PluginSection_removeAll) { 
-			public void run() {
-				handleRemoveAll();
-			}
-		};
-		removeAll.setEnabled(isEditable());
-		manager.add(removeAll);
-
-		manager.add(new Separator());
-		
-		getPage().getPDEEditor().getContributor().contextMenuAboutToShow(manager);
-	}
-
-	private void handleOpen(IStructuredSelection selection) {
-		Object object = selection.getFirstElement();
-		if (object instanceof IProductPlugin) {
-			ManifestEditor.openPluginEditor(((IProductPlugin)object).getId());
-		}
-	}
-	
-	public static void handleAddRequired(IProductPlugin[] plugins) {
-		if (plugins.length == 0)
-			return;
-		
-		HashSet set = new HashSet();
-		for (int i = 0; i < plugins.length; i++) {
-			addDependencies(TargetPlatform.getState().getBundle(plugins[i].getId(), null), set);
-		}
-		
-		IProduct product = plugins[0].getProduct();
-		BundleDescription[] fragments = getAllFragments();
-		for (int i = 0; i < fragments.length; i++) {
-			String id = fragments[i].getSymbolicName();
-			if (set.contains(id) || "org.eclipse.ui.workbench.compatibility".equals(id)) //$NON-NLS-1$
-				continue;
-			String host = fragments[i].getHost().getName();
-			if (set.contains(host) || product.containsPlugin(host)) {
-				addDependencies(fragments[i], set);
-			}
-		}
-		IProductModelFactory factory = product.getModel().getFactory();
-		Iterator iter = set.iterator();
-		while (iter.hasNext()) {
-			String id = iter.next().toString();
-			IProductPlugin plugin = factory.createPlugin();
-			plugin.setId(id);
-			product.addPlugin(plugin);
-		}
-	}
-	
-	private static void addDependencies(BundleDescription desc, Set set) {
-		if (desc == null)
-			return;
-		
-		String id = desc.getSymbolicName();
-		if (!set.add(id))
-			return;
-
-		
-		if (desc.getHost() != null) {
-			addDependencies((BundleDescription)desc.getHost().getSupplier(), set);
-		} else {
-			if (desc != null && !"org.eclipse.ui.workbench".equals(desc.getSymbolicName())) { //$NON-NLS-1$
-				BundleDescription[] fragments = desc.getFragments();
-				for (int i = 0; i < fragments.length; i++) {
-					addDependencies(fragments[i], set);
-				}
-			}
-		}
-		
-		BundleSpecification[] requires = desc.getRequiredBundles();
-		for (int i = 0; i < requires.length; i++) {
-			addDependencies((BundleDescription)requires[i].getSupplier(), set);
-		}
-	}
-	
-	private static BundleDescription[] getAllFragments() {
-		ArrayList list = new ArrayList();
-		BundleDescription[] bundles = TargetPlatform.getState().getBundles();
-		for (int i = 0; i < bundles.length; i++) {
-			if (bundles[i].getHost() != null)
-				list.add(bundles[i]);
-		}
-		return (BundleDescription[])list.toArray(new BundleDescription[list.size()]);
-	}
-	
-	private void handleAddWorkingSet() {
-		IWorkingSetManager manager = PlatformUI.getWorkbench().getWorkingSetManager();
-		IWorkingSetSelectionDialog dialog = manager.createWorkingSetSelectionDialog(PDEPlugin.getActiveWorkbenchShell(), true);
-		if (dialog.open() == Window.OK) {
-			IWorkingSet[] workingSets = dialog.getSelection();
-			IProduct product = getProduct();
-			IProductModelFactory factory = product.getModel().getFactory();
-			for (int i = 0; i < workingSets.length; i++) {
-				IAdaptable[] elements = workingSets[i].getElements();
-				for (int j = 0; j < elements.length; j++) {
-					IPluginModelBase model = findModel(elements[j]);
-					if (model != null) {
-						IProductPlugin plugin = factory.createPlugin();
-						plugin.setId(model.getPluginBase().getId());
-						product.addPlugin(plugin);						
-					}
-				}
-			}
-		}
-	}
-	
-	private void handleRemoveAll() {
-		TableItem[] items = fPluginTable.getTable().getItems();
-		IProduct product = getProduct();
-		for (int i = 0; i < items.length; i++) {
-			product.removePlugin((IProductPlugin)items[i].getData());
-		}
-	}
-	
-	private void handleDelete() {
-		IStructuredSelection ssel = (IStructuredSelection)fPluginTable.getSelection();
-		if (ssel.size() > 0) {
-			Object[] objects = ssel.toArray();
-			IProduct product = getProduct();
-			for (int i = 0; i < objects.length; i++) {
-				product.removePlugin((IProductPlugin)objects[i]);
-			}
-		}
-	}
-
-	private void handleAdd() {
-		ElementListSelectionDialog dialog = new ElementListSelectionDialog(
-				PDEPlugin.getActiveWorkbenchShell(), 
-				PDEPlugin.getDefault().getLabelProvider());
-		dialog.setElements(getBundles());
-		dialog.setTitle(PDEUIMessages.PluginSelectionDialog_title); 
-		dialog.setMessage(PDEUIMessages.PluginSelectionDialog_message);
-		dialog.setMultipleSelection(true);
-		if (dialog.open() == Window.OK) {
-			Object[] bundles = dialog.getResult();
-			for (int i = 0; i < bundles.length; i++) {
-				addPlugin(((BundleDescription)bundles[i]).getSymbolicName());
-			}
-		}
-	}
-	
-	private BundleDescription[] getBundles() {
-		TreeMap map = new TreeMap();
-		IProduct product = getProduct();
-		BundleDescription[] bundles = TargetPlatform.getState().getBundles();
-		for (int i = 0; i < bundles.length; i++) {
-			String id = bundles[i].getSymbolicName();
-			if (!product.containsPlugin(id)) {
-				map.put(id, bundles[i]);
-			}
-		}
-		return (BundleDescription[])map.values().toArray(new BundleDescription[map.size()]);
-	}
-	
-	private void addPlugin(String id) {
-		IProduct product = getProduct();
-		IProductModelFactory factory = product.getModel().getFactory();
-		IProductPlugin plugin = factory.createPlugin();
-		plugin.setId(id);
-		product.addPlugin(plugin);
-	}
-	
-	private IProduct getProduct() {
-		return getModel().getProduct();
-	}
-	
-	private IProductModel getModel() {
-		return (IProductModel) getPage().getPDEEditor().getAggregateModel();	
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESection#modelChanged(org.eclipse.pde.core.IModelChangedEvent)
-	 */
-	public void modelChanged(IModelChangedEvent e) {
-		if (e.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			markStale();
-			return;
-		}
-		Object[] objects = e.getChangedObjects();
-		if (e.getChangeType() == IModelChangedEvent.INSERT) {
-			for (int i = 0; i < objects.length; i++) {
-				if (objects[i] instanceof IProductPlugin)
-					fPluginTable.add(objects[i]);
-			}
-		} else if (e.getChangeType() == IModelChangedEvent.REMOVE) {
-			for (int i = 0; i < objects.length; i++) {
-				if (objects[i] instanceof IProductPlugin)
-					fPluginTable.remove(objects[i]);
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#refresh()
-	 */
-	public void refresh() {
-		fPluginTable.refresh();
-		super.refresh();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.core.IPluginModelListener#modelsChanged(org.eclipse.pde.internal.core.PluginModelDelta)
-	 */
-	public void modelsChanged(PluginModelDelta delta) {
-		final Control control = fPluginTable.getControl();
-		if (!control.isDisposed()) {
-			control.getDisplay().asyncExec(new Runnable() {
-				public void run() {
-					if (!control.isDisposed())
-						fPluginTable.refresh();
-				}
-			});
-		}
-	}
-	
-	private IPluginModelBase findModel(IAdaptable object) {
-		if (object instanceof IJavaProject)
-			object = ((IJavaProject)object).getProject();
-		if (object instanceof IProject)
-			return PDECore.getDefault().getModelManager().findModel((IProject)object);
-		if (object instanceof PersistablePluginObject) {
-			return PDECore.getDefault().getModelManager().findModel(((PersistablePluginObject)object).getPluginID());
-		}
-		return null;
-	}
-	
-	protected void selectionChanged(IStructuredSelection selection) {
-		getPage().getPDEEditor().setSelection(selection);
-	}
-	
-	public boolean setFormInput(Object input) {
-		if (input instanceof IProductPlugin) {
-			fPluginTable.setSelection(new StructuredSelection(input), true);
-			return true;
-		}
-		return super.setFormInput(input);
-	}
-	
-	protected void doPaste(Object target, Object[] objects) {
-		for (int i = 0; i < objects.length; i++) {
-			if (objects[i] instanceof IProductPlugin)
-				getProduct().addPlugin((IProductPlugin)objects[i]);		
-		}
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductEditor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductEditor.java
deleted file mode 100644
index 3402d7f..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductEditor.java
+++ /dev/null

@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.product;
-
-import java.io.File;
-import java.util.Locale;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.internal.core.iproduct.*;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.editor.ISortableContentOutlinePage;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.pde.internal.ui.editor.SystemFileEditorInput;
-import org.eclipse.pde.internal.ui.editor.context.InputContext;
-import org.eclipse.pde.internal.ui.editor.context.InputContextManager;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.ui.PartInitException;
-
-
-public class ProductEditor extends PDEFormEditor {
-
-	private ConfigurationPage fPluginConfigurationPage;
-	private ConfigurationPage fFeatureConfigurationPage;
-
-	/**
-	 * 
-	 */
-	public ProductEditor() {
-		super();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#createInputContextManager()
-	 */
-	protected InputContextManager createInputContextManager() {
-		ProductInputContextManager manager = new ProductInputContextManager(this);
-		return manager;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#createResourceContexts(org.eclipse.pde.internal.ui.editor.context.InputContextManager, org.eclipse.ui.IFileEditorInput)
-	 */
-	protected void createResourceContexts(InputContextManager manager,
-			IFileEditorInput input) {
-		manager.putContext(input, new ProductInputContext(this, input, true));
-		manager.monitorFile(input.getFile());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#createSystemFileContexts(org.eclipse.pde.internal.ui.editor.context.InputContextManager, org.eclipse.pde.internal.ui.editor.SystemFileEditorInput)
-	 */
-	protected void createSystemFileContexts(InputContextManager manager,
-			SystemFileEditorInput input) {
-		File file = (File) input.getAdapter(File.class);
-		if (file != null) {
-			String name = file.getName();
-			if (name.endsWith(".product")) {  //$NON-NLS-1$
-				IEditorInput in = new SystemFileEditorInput(file);
-				manager.putContext(in, new ProductInputContext(this, in, true));
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#createStorageContexts(org.eclipse.pde.internal.ui.editor.context.InputContextManager, org.eclipse.ui.IStorageEditorInput)
-	 */
-	protected void createStorageContexts(InputContextManager manager,
-			IStorageEditorInput input) {
-		if (input.getName().toLowerCase(Locale.ENGLISH).endsWith(".product")) { //$NON-NLS-1$
-			manager.putContext(input, new ProductInputContext(this, input, true));
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#createContentOutline()
-	 */
-	protected ISortableContentOutlinePage createContentOutline() {
-		return new ProductOutlinePage(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#getInputContext(java.lang.Object)
-	 */
-	protected InputContext getInputContext(Object object) {
-		return inputContextManager.findContext(ProductInputContext.CONTEXT_ID);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.editor.FormEditor#addPages()
-	 */
-	protected void addPages() {
-		try {
-			addPage(new OverviewPage(this));
-			fPluginConfigurationPage = new ConfigurationPage(this, false);
-			fFeatureConfigurationPage = new ConfigurationPage(this, true);
-			if (useFeatures())
-				addPage(fFeatureConfigurationPage);
-			else
-				addPage(fPluginConfigurationPage);
-			addPage(new LauncherPage(this));
-			addPage(new BrandingPage(this));
-		} catch (PartInitException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-	
-	public void updateConfigurationPage() {
-		try {
-			if (useFeatures()) {
-				removePage(fPluginConfigurationPage.getIndex());
-				addPage(1, fFeatureConfigurationPage);
-			} else {
-				removePage(fFeatureConfigurationPage.getIndex());
-				addPage(1, fPluginConfigurationPage);
-			}
-		} catch (PartInitException e) {
-		}
-	}
-	
-	public boolean useFeatures() {
-		IBaseModel model = getAggregateModel();
-		return ((IProductModel)model).getProduct().useFeatures();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.context.IInputContextListener#contextAdded(org.eclipse.pde.internal.ui.editor.context.InputContext)
-	 */
-	public void contextAdded(InputContext context) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.context.IInputContextListener#contextRemoved(org.eclipse.pde.internal.ui.editor.context.InputContext)
-	 */
-	public void contextRemoved(InputContext context) {
-		close(true);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.context.IInputContextListener#monitoredFileAdded(org.eclipse.core.resources.IFile)
-	 */
-	public void monitoredFileAdded(IFile monitoredFile) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.context.IInputContextListener#monitoredFileRemoved(org.eclipse.core.resources.IFile)
-	 */
-	public boolean monitoredFileRemoved(IFile monitoredFile) {
-		return true;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductEditorContributor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductEditorContributor.java
deleted file mode 100644
index 4b70eeb..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductEditorContributor.java
+++ /dev/null

@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.product;
-
-import org.eclipse.pde.internal.ui.editor.PDEFormEditorContributor;
-
-
-public class ProductEditorContributor extends PDEFormEditorContributor {
-
-	public ProductEditorContributor() {
-		super("Product"); //$NON-NLS-1$
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductExportAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductExportAction.java
deleted file mode 100644
index 39697ce..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductExportAction.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.product;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.wizards.*;
-import org.eclipse.pde.internal.ui.wizards.exports.*;
-import org.eclipse.ui.*;
-
-public class ProductExportAction extends Action {
-
-	private IStructuredSelection fSelection;
-	
-	public ProductExportAction(PDEFormEditor editor) {
-		IResource resource = null;
-		if (editor != null)
-			resource = ((IModel) editor.getAggregateModel()).getUnderlyingResource();
-		fSelection = resource != null ? new StructuredSelection(resource) : new StructuredSelection();
-	}
-	
-	public ProductExportAction(IStructuredSelection selection) {
-		fSelection = selection;
-	}
-	
-	public void run() {
-		ProductExportWizard wizard = new ProductExportWizard();
-		wizard.init(PlatformUI.getWorkbench(), fSelection);
-		WizardDialog wd = new ResizableWizardDialog(PDEPlugin.getActiveWorkbenchShell(), wizard);
-		wd.create();
-		notifyResult(wd.open() == WizardDialog.OK);
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductInfoSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductInfoSection.java
deleted file mode 100644
index a2258bd..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductInfoSection.java
+++ /dev/null

@@ -1,300 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.product;
-
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.TargetPlatform;
-import org.eclipse.pde.internal.core.iproduct.IProduct;
-import org.eclipse.pde.internal.core.iproduct.IProductModel;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.PDESection;
-import org.eclipse.pde.internal.ui.parts.ComboPart;
-import org.eclipse.pde.internal.ui.parts.FormEntry;
-import org.eclipse.pde.internal.ui.wizards.product.ProductDefinitionWizard;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.Clipboard;
-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.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.FormColors;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.FormText;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
-
-
-public class ProductInfoSection extends PDESection {
-
-	private FormEntry fNameEntry;
-	private ComboPart fAppCombo;
-	private ComboPart fProductCombo;
-	private Button fPluginButton;
-	private Button fFeatureButton;
-	
-	private static int NUM_COLUMNS = 3;
-
-	public ProductInfoSection(PDEFormPage page, Composite parent) {
-		super(page, parent, Section.DESCRIPTION);
-		createClient(getSection(), page.getEditor().getToolkit());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESection#createClient(org.eclipse.ui.forms.widgets.Section, org.eclipse.ui.forms.widgets.FormToolkit)
-	 */
-	protected void createClient(Section section, FormToolkit toolkit) {
-		section.setText(PDEUIMessages.ProductInfoSection_title); 
-		section.setDescription(PDEUIMessages.ProductInfoSection_desc); 
-
-		Composite client = toolkit.createComposite(section);
-		TableWrapLayout layout = new TableWrapLayout();
-		layout.leftMargin = layout.rightMargin = toolkit.getBorderStyle() != SWT.NULL ? 0 : 2;
-		layout.numColumns = NUM_COLUMNS;
-		client.setLayout(layout);
-
-		IActionBars actionBars = getPage().getPDEEditor().getEditorSite().getActionBars();
-		
-		createNameEntry(client, toolkit, actionBars);
-		createIdEntry(client, toolkit, actionBars);
-		createApplicationEntry(client, toolkit, actionBars);
-		createConfigurationOption(client, toolkit);
-		
-		toolkit.paintBordersFor(client);
-		section.setClient(client);	
-		TableWrapData td = new TableWrapData(TableWrapData.FILL_GRAB);
-		td.colspan = 2;
-		section.setLayoutData(td);
-		
-		getProductModel().addModelChangedListener(this);
-	}
-	
-	public void dispose() {
-		IProductModel model = getProductModel();
-		if (model != null)
-			model.removeModelChangedListener(this);
-		super.dispose();
-	}
-	
-	private void createNameEntry(Composite client, FormToolkit toolkit, IActionBars actionBars) {
-		createLabel(client, toolkit, PDEUIMessages.ProductInfoSection_titleLabel); 
-
-		fNameEntry = new FormEntry(client, toolkit, "Product Name:", null, false); //$NON-NLS-1$
-		fNameEntry.setFormEntryListener(new FormEntryAdapter(this, actionBars) {
-			public void textValueChanged(FormEntry entry) {
-				getProduct().setName(entry.getValue().trim());
-			}
-		});
-		fNameEntry.setEditable(isEditable());
-	}
-	
-	private void createIdEntry(Composite client, FormToolkit toolkit, IActionBars actionBars) {
-		createLabel(client, toolkit, ""); //$NON-NLS-1$
-		createLabel(client, toolkit, PDEUIMessages.ProductInfoSection_prodIdLabel); 
-
-		Label label = toolkit.createLabel(client, PDEUIMessages.ProductInfoSection_id); 
-		label.setForeground(toolkit.getColors().getColor(FormColors.TITLE));
-		TableWrapData td = new TableWrapData();
-		td.valign = TableWrapData.MIDDLE;
-		label.setLayoutData(td);
-		
-		fProductCombo = new ComboPart();
-		fProductCombo.createControl(client, toolkit, SWT.READ_ONLY);
-		td = new TableWrapData(TableWrapData.FILL_GRAB);
-		td.valign = TableWrapData.MIDDLE;
-		fProductCombo.getControl().setLayoutData(td);
-		fProductCombo.setItems(TargetPlatform.getProductNames());
-		fProductCombo.add(""); //$NON-NLS-1$
-		fProductCombo.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				getProduct().setId(fProductCombo.getSelection());
-			}
-		});
-		
-		Button button = toolkit.createButton(client, PDEUIMessages.ProductInfoSection_new, SWT.PUSH); 
-		button.setEnabled(isEditable());
-		button.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleNewDefinition();
-			}
-		});	
-		fProductCombo.getControl().setEnabled(isEditable());
-	}
-
-	private void handleNewDefinition() {
-		ProductDefinitionWizard wizard = new ProductDefinitionWizard(getProduct());
-		WizardDialog dialog = new WizardDialog(PDEPlugin.getActiveWorkbenchShell(), wizard);
-		dialog.create();
-		if (dialog.open() == WizardDialog.OK) {
-			String id = wizard.getProductId();
-			IProduct product = getProduct();
-			product.setId(id);
-			product.setApplication(wizard.getApplication());
-		}
-	}
-
-	private void createApplicationEntry(Composite client, FormToolkit toolkit, IActionBars actionBars) {
-		createLabel(client, toolkit, ""); //$NON-NLS-1$
-		createLabel(client, toolkit, PDEUIMessages.ProductInfoSection_appLabel); 
-		
-		Label label = toolkit.createLabel(client, PDEUIMessages.ProductInfoSection_app, SWT.WRAP); 
-		label.setForeground(toolkit.getColors().getColor(FormColors.TITLE));
-		TableWrapData td = new TableWrapData();
-		td.valign = TableWrapData.MIDDLE;
-		label.setLayoutData(td);
-		
-		fAppCombo = new ComboPart();
-		fAppCombo.createControl(client, toolkit, SWT.READ_ONLY);
-		td = new TableWrapData(TableWrapData.FILL);
-		td.colspan = NUM_COLUMNS - 1;
-		td.valign = TableWrapData.MIDDLE;
-		fAppCombo.getControl().setLayoutData(td);
-		fAppCombo.setItems(TargetPlatform.getApplicationNames());
-		fAppCombo.add(""); //$NON-NLS-1$
-		fAppCombo.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				getProduct().setApplication(fAppCombo.getSelection());
-			}
-		});
-		
-		fAppCombo.getControl().setEnabled(isEditable());
-	}
-	
-	private void createConfigurationOption(Composite client, FormToolkit toolkit) {
-		createLabel(client, toolkit, ""); //$NON-NLS-1$
-		FormText text = toolkit.createFormText(client, true);
-		text.setText(PDEUIMessages.Product_overview_configuration, true, true); 
-		TableWrapData gd = new TableWrapData(TableWrapData.FILL);
-		gd.colspan = NUM_COLUMNS;
-		text.setLayoutData(gd);
-		text.addHyperlinkListener(new IHyperlinkListener() {
-			public void linkEntered(HyperlinkEvent e) {
-				getStatusLineManager().setMessage(e.getLabel());
-			}
-			public void linkExited(HyperlinkEvent e) {
-				getStatusLineManager().setMessage(null);
-			}
-			public void linkActivated(HyperlinkEvent e) {
-				String pageId = fPluginButton.getSelection() ? ConfigurationPage.PLUGIN_ID : ConfigurationPage.FEATURE_ID;
-				getPage().getEditor().setActivePage(pageId);
-			}
-		});
-		
-		fPluginButton = toolkit.createButton(client, "plug-ins", SWT.RADIO); //$NON-NLS-1$
-		gd = new TableWrapData();
-		gd.indent = 25;
-		fPluginButton.setLayoutData(gd);
-		fPluginButton.setEnabled(isEditable());
-		fPluginButton.addSelectionListener(new SelectionAdapter() {	
-			public void widgetSelected(SelectionEvent e) {
-				boolean selected = fPluginButton.getSelection();
-				getProduct().setUseFeatures(!selected);
-				((ProductEditor)getPage().getEditor()).updateConfigurationPage();
-			}
-		});
-		
-		fFeatureButton = toolkit.createButton(client, "features", SWT.RADIO); //$NON-NLS-1$
-		gd = new TableWrapData();
-		gd.indent = 25;
-		fFeatureButton.setLayoutData(gd);
-		fFeatureButton.setEnabled(isEditable());
-	}
-	
-	private void createLabel(Composite client, FormToolkit toolkit, String text) {
-		Label label = toolkit.createLabel(client, text, SWT.WRAP);
-		TableWrapData td = new TableWrapData();
-		td.colspan = NUM_COLUMNS;
-		label.setLayoutData(td);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#commit(boolean)
-	 */
-	public void commit(boolean onSave) {
-		fNameEntry.commit();
-		super.commit(onSave);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESection#cancelEdit()
-	 */
-	public void cancelEdit() {
-		fNameEntry.cancelEdit();
-		super.cancelEdit();
-	}
-	
-	private IProductModel getProductModel() {
-		return (IProductModel) getPage().getPDEEditor().getAggregateModel();
-	}
-	
-	private IProduct getProduct() {
-		return getProductModel().getProduct();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#refresh()
-	 */
-	public void refresh() {
-		IProduct product = getProduct();
-		fNameEntry.setValue(product.getName(), true);
-		refreshProductCombo(product.getId());
-		fAppCombo.setText(product.getApplication());
-		fPluginButton.setSelection(!product.useFeatures());
-		fFeatureButton.setSelection(product.useFeatures());
-		super.refresh();
-	}
-	
-	public void modelChanged(IModelChangedEvent e) {
-		String prop = e.getChangedProperty();
-		if (prop == null)
-			return;
-		if (prop.equals(IProduct.P_ID)) {
-			refreshProductCombo(e.getNewValue().toString());
-		} else if (prop.equals(IProduct.P_NAME)) {
-			fNameEntry.setValue(e.getNewValue().toString(), true);
-		} else  if (prop.equals(IProduct.P_APPLICATION)) {
-			fAppCombo.setText(e.getNewValue().toString());			
-		}
-		super.modelChanged(e);
-	}
-	
-	private void refreshProductCombo(String productId) {
-		if (fProductCombo.indexOf(productId) == -1)
-			fProductCombo.add(productId, 0);		
-		fProductCombo.setText(productId);
-	}
-	
-	private IStatusLineManager getStatusLineManager() {
-		IEditorSite site = getPage().getEditor().getEditorSite();
-		return site.getActionBars().getStatusLineManager();
-	}
-	
-	public boolean canPaste(Clipboard clipboard) {
-		Display d = getSection().getDisplay();
-		Control c = d.getFocusControl();
-		if (c instanceof Text)
-			return true;
-		return false;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductInputContext.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductInputContext.java
deleted file mode 100644
index 6954dc5..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductInputContext.java
+++ /dev/null

@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.product;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.pde.core.IBaseModel;
-import org.eclipse.pde.core.IEditable;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.iproduct.IProductModel;
-import org.eclipse.pde.internal.core.product.ProductModel;
-import org.eclipse.pde.internal.core.product.WorkspaceProductModel;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.pde.internal.ui.editor.context.UTF8InputContext;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IStorageEditorInput;
-
-
-public class ProductInputContext extends UTF8InputContext {
-	
-	public static final String CONTEXT_ID = "product-context"; //$NON-NLS-1$
-
-	public ProductInputContext(PDEFormEditor editor, IEditorInput input,
-			boolean primary) {
-		super(editor, input, primary);
-		create();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.context.InputContext#getId()
-	 */
-	public String getId() {
-		return CONTEXT_ID;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.context.InputContext#createModel(org.eclipse.ui.IEditorInput)
-	 */
-	protected IBaseModel createModel(IEditorInput input) throws CoreException {
-		IProductModel model = null;
-		if (input instanceof IStorageEditorInput) {
-			try {
-				if (input instanceof IFileEditorInput) {
-					IFile file = ((IFileEditorInput) input).getFile();
-					model = new WorkspaceProductModel(file, true);
-					model.load();
-				} else if (input instanceof IStorageEditorInput) {
-					InputStream is = ((IStorageEditorInput) input).getStorage()
-							.getContents();
-					model =  new ProductModel();
-					model.load(is, false);
-				}
-			} catch (CoreException e) {
-				PDEPlugin.logException(e);
-				return null;
-			}
-		}
-		return model;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.context.InputContext#addTextEditOperation(java.util.ArrayList, org.eclipse.pde.core.IModelChangedEvent)
-	 */
-	protected void addTextEditOperation(ArrayList ops, IModelChangedEvent event) {
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.context.InputContext#flushModel(org.eclipse.jface.text.IDocument)
-	 */
-	protected void flushModel(IDocument doc) {
-		if (!(getModel() instanceof IEditable))
-			return;
-		IEditable editableModel = (IEditable) getModel();
-		if (editableModel.isDirty() == false)
-			return;
-		try {
-			StringWriter swriter = new StringWriter();
-			PrintWriter writer = new PrintWriter(swriter);
-			editableModel.save(writer);
-			writer.flush();
-			swriter.close();
-			doc.set(swriter.toString());
-		} catch (IOException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	protected String getPartitionName() {
-		return "___prod_partition"; //$NON-NLS-1$
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductInputContextManager.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductInputContextManager.java
deleted file mode 100644
index bfbbdbc..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductInputContextManager.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.product;
-
-import org.eclipse.pde.core.IBaseModel;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.pde.internal.ui.editor.context.InputContext;
-import org.eclipse.pde.internal.ui.editor.context.InputContextManager;
-
-
-public class ProductInputContextManager extends InputContextManager {
-
-	/**
-	 * @param editor
-	 */
-	public ProductInputContextManager(PDEFormEditor editor) {
-		super(editor);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.context.InputContextManager#getAggregateModel()
-	 */
-	public IBaseModel getAggregateModel() {
-		InputContext context = findContext(ProductInputContext.CONTEXT_ID);
-		return (context != null) ? context.getModel() : null;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductOutlinePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductOutlinePage.java
deleted file mode 100644
index 2012e2f..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ProductOutlinePage.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.product;
-
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.internal.core.iproduct.*;
-import org.eclipse.pde.internal.ui.editor.*;
-
-public class ProductOutlinePage extends FormOutlinePage {
-
-	public ProductOutlinePage(PDEFormEditor editor) {
-		super(editor);
-	}
-	
-	public void sort(boolean sorting) {
-	}
-	
-	public void modelChanged(IModelChangedEvent event) {
-		super.modelChanged(event);
-	}
-	
-	protected Object[] getChildren(Object parent) {
-		if (parent instanceof ConfigurationPage) {
-			ConfigurationPage page = (ConfigurationPage)parent;
-			IProduct product = ((IProductModel)page.getModel()).getProduct();
-			if (product.useFeatures())
-				return product.getFeatures();
-			return product.getPlugins();
-		}
-		return new Object[0];
-	}
-	
-	protected String getParentPageId(Object item) {
-		if (item instanceof IProductPlugin)
-			return ConfigurationPage.PLUGIN_ID;
-		if (item instanceof IProductFeature)
-			return ConfigurationPage.FEATURE_ID;
-		return super.getParentPageId(item);
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/SplashSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/SplashSection.java
deleted file mode 100644
index a882d9d..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/SplashSection.java
+++ /dev/null

@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.product;
-
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.core.iproduct.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.parts.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.dialogs.*;
-import org.eclipse.ui.forms.widgets.*;
-
-
-public class SplashSection extends PDESection {
-
-	private FormEntry fPluginEntry;
-
-	public SplashSection(PDEFormPage page, Composite parent) {
-		super(page, parent, Section.DESCRIPTION);
-		createClient(getSection(), page.getEditor().getToolkit());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESection#createClient(org.eclipse.ui.forms.widgets.Section, org.eclipse.ui.forms.widgets.FormToolkit)
-	 */
-	protected void createClient(Section section, FormToolkit toolkit) {
-		section.setText(PDEUIMessages.SplashSection_title); 
-		section.setDescription(PDEUIMessages.SplashSection_desc); 
-
-		Composite client = toolkit.createComposite(section);
-		TableWrapLayout layout = new TableWrapLayout();
-		layout.numColumns = 3;
-		layout.topMargin = 5;
-		client.setLayout(layout);
-		
-		Label label = toolkit.createLabel(client, PDEUIMessages.SplashSection_label, SWT.WRAP); 
-		TableWrapData td = new TableWrapData();
-		td.colspan = 3;
-		label.setLayoutData(td);
-		
-		IActionBars actionBars = getPage().getPDEEditor().getEditorSite().getActionBars();
-		fPluginEntry = new FormEntry(client, toolkit, PDEUIMessages.SplashSection_plugin, PDEUIMessages.SplashSection_browse, false); // 
-		fPluginEntry.setFormEntryListener(new FormEntryAdapter(this, actionBars) {
-			public void textValueChanged(FormEntry entry) {
-				getSplashInfo().setLocation(entry.getValue());
-			}
-			public void browseButtonSelected(FormEntry entry) {
-				handleBrowse();
-			}
-		});
-		fPluginEntry.setEditable(isEditable());
-				
-		toolkit.paintBordersFor(client);
-		section.setClient(client);
-		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL|GridData.VERTICAL_ALIGN_BEGINNING));
-	}
-	
-	public void refresh() {
-		fPluginEntry.setValue(getSplashInfo().getLocation(), true);
-		super.refresh();
-	}
-	
-	public void commit(boolean onSave) {
-		fPluginEntry.commit();
-		super.commit(onSave);
-	}
-	
-	public void cancelEdit() {
-		fPluginEntry.cancelEdit();
-		super.cancelEdit();
-	}
-	
-	private ISplashInfo getSplashInfo() {
-		ISplashInfo info = getProduct().getSplashInfo();
-		if (info == null) {
-			info = getModel().getFactory().createSplashInfo();
-			getProduct().setSplashInfo(info);
-		}
-		return info;
-	}
-	
-	private IProduct getProduct() {
-		return getModel().getProduct();
-	}
-	
-	private IProductModel getModel() {
-		return (IProductModel)getPage().getPDEEditor().getAggregateModel();
-	}
-	
-	private void handleBrowse() {
-		ElementListSelectionDialog dialog = new ElementListSelectionDialog(PDEPlugin.getActiveWorkbenchShell(), PDEPlugin.getDefault().getLabelProvider());
-		dialog.setElements(PDECore.getDefault().getModelManager().getAllPlugins());
-		dialog.setMultipleSelection(false);
-		dialog.setTitle(PDEUIMessages.SplashSection_selection); 
-		dialog.setMessage(PDEUIMessages.SplashSection_message); 
-		if (dialog.open() == ElementListSelectionDialog.OK) {
-			IPluginModelBase model = (IPluginModelBase)dialog.getFirstResult();
-			fPluginEntry.setValue(model.getPluginBase().getId());
-		}
-	}
-
-	public boolean canPaste(Clipboard clipboard) {
-		Display d = getSection().getDisplay();
-		Control c = d.getFocusControl();
-		if (c instanceof Text)
-			return true;
-		return false;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/WindowImagesSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/WindowImagesSection.java
deleted file mode 100644
index faebe8a..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/WindowImagesSection.java
+++ /dev/null

@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.product;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.core.iproduct.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.parts.*;
-import org.eclipse.pde.internal.ui.util.*;
-import org.eclipse.swt.dnd.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.dialogs.*;
-import org.eclipse.ui.forms.events.*;
-import org.eclipse.ui.forms.widgets.*;
-import org.eclipse.ui.ide.*;
-import org.eclipse.ui.model.*;
-
-
-public class WindowImagesSection extends PDESection {
-
-	private FormEntry fImage16;
-	private FormEntry fImage32;
-	private FormEntry fImage48;
-	private FormEntry fImage64;
-	private FormEntry fImage128;
-
-	public WindowImagesSection(PDEFormPage page, Composite parent) {
-		super(page, parent, Section.DESCRIPTION);
-		createClient(getSection(), page.getEditor().getToolkit());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESection#createClient(org.eclipse.ui.forms.widgets.Section, org.eclipse.ui.forms.widgets.FormToolkit)
-	 */
-	protected void createClient(Section section, FormToolkit toolkit) {
-		section.setText(PDEUIMessages.WindowImagesSection_title); 
-		section.setDescription(PDEUIMessages.WindowImagesSection_desc); 
-
-		Composite client = toolkit.createComposite(section);
-		client.setLayout(new GridLayout(3, false));
-		
-		IActionBars actionBars = getPage().getPDEEditor().getEditorSite().getActionBars();
-		fImage16 = new FormEntry(client, toolkit, PDEUIMessages.WindowImagesSection_16, PDEUIMessages.WindowImagesSection_browse, isEditable()); // 
-		fImage16.setFormEntryListener(new FormEntryAdapter(this, actionBars) {
-			public void textValueChanged(FormEntry entry) {
-				getWindowImages().setImagePath(entry.getValue(), 0);
-			}
-			public void browseButtonSelected(FormEntry entry) {
-				handleBrowse(entry);
-			}
-			public void linkActivated(HyperlinkEvent e) {
-				openImage(fImage16.getValue());
-			}
-		});
-		fImage16.setEditable(isEditable());
-		
-		fImage32 = new FormEntry(client, toolkit, PDEUIMessages.WindowImagesSection_32, PDEUIMessages.WindowImagesSection_browse, isEditable()); // 
-		fImage32.setFormEntryListener(new FormEntryAdapter(this, actionBars) {
-			public void textValueChanged(FormEntry entry) {
-				getWindowImages().setImagePath(entry.getValue(), 1);
-			}
-			public void browseButtonSelected(FormEntry entry) {
-				handleBrowse(entry);
-			}
-			public void linkActivated(HyperlinkEvent e) {
-				openImage(fImage32.getValue());
-			}
-		});
-		fImage32.setEditable(isEditable());
-		
-		fImage48 = new FormEntry(client, toolkit, PDEUIMessages.WindowImagesSection_48, PDEUIMessages.WindowImagesSection_browse, isEditable()); // 
-		fImage48.setFormEntryListener(new FormEntryAdapter(this, actionBars) {
-			public void textValueChanged(FormEntry entry) {
-				getWindowImages().setImagePath(entry.getValue(), 2);
-			}
-			public void browseButtonSelected(FormEntry entry) {
-				handleBrowse(entry);
-			}
-			public void linkActivated(HyperlinkEvent e) {
-				openImage(fImage48.getValue());
-			}
-		});
-		fImage48.setEditable(isEditable());
-		
-		fImage64 = new FormEntry(client, toolkit, PDEUIMessages.WindowImagesSection_64, PDEUIMessages.WindowImagesSection_browse, isEditable()); // 
-		fImage64.setFormEntryListener(new FormEntryAdapter(this, actionBars) {
-			public void textValueChanged(FormEntry entry) {
-				getWindowImages().setImagePath(entry.getValue(), 3);
-			}
-			public void browseButtonSelected(FormEntry entry) {
-				handleBrowse(entry);
-			}
-			public void linkActivated(HyperlinkEvent e) {
-				openImage(fImage64.getValue());
-			}
-		});
-		fImage64.setEditable(isEditable());
-		
-		fImage128 = new FormEntry(client, toolkit, PDEUIMessages.WindowImagesSection_128, PDEUIMessages.WindowImagesSection_browse, isEditable()); // 
-		fImage128.setFormEntryListener(new FormEntryAdapter(this, actionBars) {
-			public void textValueChanged(FormEntry entry) {
-				getWindowImages().setImagePath(entry.getValue(), 4);
-			}
-			public void browseButtonSelected(FormEntry entry) {
-				handleBrowse(entry);
-			}
-			public void linkActivated(HyperlinkEvent e) {
-				openImage(fImage128.getValue());
-			}
-		});
-		fImage128.setEditable(isEditable());
-		
-		toolkit.paintBordersFor(client);
-		section.setClient(client);
-		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL|GridData.VERTICAL_ALIGN_BEGINNING));
-	}
-	
-	public void refresh() {
-		IWindowImages images = getWindowImages();
-		fImage16.setValue(images.getImagePath(0), true);
-		fImage32.setValue(images.getImagePath(1), true);
-		fImage48.setValue(images.getImagePath(2), true);
-		fImage64.setValue(images.getImagePath(3), true);
-		fImage128.setValue(images.getImagePath(4), true);
-		super.refresh();
-	}
-
-	private IWindowImages getWindowImages() {
-		IWindowImages images = getProduct().getWindowImages();
-		if (images == null) {
-			images = getModel().getFactory().createWindowImages();
-			getProduct().setWindowImages(images);
-		}
-		return images;
-	}
-	
-	private IProduct getProduct() {
-		return getModel().getProduct();
-	}
-	
-	private IProductModel getModel() {
-		return (IProductModel)getPage().getPDEEditor().getAggregateModel();
-	}
-
-	public void commit(boolean onSave) {
-		fImage16.commit();
-		fImage32.commit();
-		fImage48.commit();
-		fImage64.commit();
-		fImage128.commit();
-		super.commit(onSave);
-	}
-	
-	public void cancelEdit() {
-		fImage16.cancelEdit();
-		fImage32.cancelEdit();
-		fImage48.cancelEdit();
-		fImage64.cancelEdit();
-		fImage128.cancelEdit();
-		super.cancelEdit();
-	}
-	
-	private void handleBrowse(FormEntry entry) {
-		ElementTreeSelectionDialog dialog =
-			new ElementTreeSelectionDialog(
-				getSection().getShell(),
-				new WorkbenchLabelProvider(),
-				new WorkbenchContentProvider());
-				
-		dialog.setValidator(new FileValidator());
-		dialog.setAllowMultiple(false);
-		dialog.setTitle(PDEUIMessages.WindowImagesSection_dialogTitle);  
-		dialog.setMessage(PDEUIMessages.WindowImagesSection_dialogMessage); 
-		dialog.addFilter(new FileExtensionFilter("gif")); //$NON-NLS-1$
-		dialog.setInput(PDEPlugin.getWorkspace().getRoot());
-
-		if (dialog.open() == ElementTreeSelectionDialog.OK) {
-			IFile file = (IFile)dialog.getFirstResult();
-			entry.setValue(file.getFullPath().toString());
-		}
-	}
-	
-	private void openImage(String value) {
-		IWorkspaceRoot root = PDEPlugin.getWorkspace().getRoot();
-		IPath path = new Path(value);
-		if(path.isEmpty()){
-			MessageDialog.openWarning(PDEPlugin.getActiveWorkbenchShell(), PDEUIMessages.WindowImagesSection_open, PDEUIMessages.WindowImagesSection_emptyPath); // 
-			return;
-		}
-		if (!path.isAbsolute()) {
-			path = getFullPath(path);
-		}
-		IResource resource = root.findMember(path);
-		try {
-			if (resource != null && resource instanceof IFile)
-				IDE.openEditor(PDEPlugin.getActivePage(), (IFile)resource, true);
-			else
-				MessageDialog.openWarning(PDEPlugin.getActiveWorkbenchShell(), PDEUIMessages.WindowImagesSection_open, PDEUIMessages.WindowImagesSection_warning); // 
-		} catch (PartInitException e) {
-		}			
-	}
-	
-	private IPath getFullPath(IPath path) {
-		String productId = getProduct().getId();
-		int dot = productId.lastIndexOf('.');
-		String pluginId = (dot != -1) ? productId.substring(0, dot) : ""; //$NON-NLS-1$
-		IPluginModelBase model = PDECore.getDefault().getModelManager().findModel(pluginId);
-		if (model != null && model.getUnderlyingResource() != null) {
-			IPath newPath = new Path(model.getInstallLocation()).append(path);
-			IContainer container = PDEPlugin.getWorkspace().getRoot().getContainerForLocation(newPath);
-			if (container != null) {
-				return container.getFullPath();
-			}
-		}
-		return path;
-	}
-
-	public boolean canPaste(Clipboard clipboard) {
-		Display d = getSection().getDisplay();
-		Control c = d.getFocusControl();
-		if (c instanceof Text)
-			return true;
-		return false;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/AttributePropertySource.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/AttributePropertySource.java
deleted file mode 100644
index 94953ab..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/AttributePropertySource.java
+++ /dev/null

@@ -1,204 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.internal.core.schema.*;
-import org.eclipse.ui.views.properties.*;
-import java.util.*;
-import org.eclipse.pde.internal.core.ischema.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.internal.ui.*;
-
-public class AttributePropertySource extends SchemaObjectPropertySource implements
-        ICloneablePropertySource {
-    public static final String P_USE = "use"; //$NON-NLS-1$
-    public static final String P_KIND = "kind"; //$NON-NLS-1$
-    public static final String P_VALUE = "value"; //$NON-NLS-1$
-    public static final String P_BASED_ON = "basedOn"; //$NON-NLS-1$
-    public static final String P_TYPE = "type"; //$NON-NLS-1$
-    public static final String P_TRANSLATABLE = "translatable"; //$NON-NLS-1$
-    public static final String P_DEPRECATED = "deprecated"; //$NON-NLS-1$
-    
-    public static final String P_RESTRICTION = "restriction"; //$NON-NLS-1$
-    public static final String P_NAME = "name"; //$NON-NLS-1$
-    private Vector descriptors;
-    
-    private static final String[] typeTable = { "string", "boolean" }; //$NON-NLS-1$ //$NON-NLS-2$
-    private static final String[] booleanTable = { "false", "true" }; //$NON-NLS-1$ //$NON-NLS-2$
-    
-    class ValueValidator implements ICellEditorValidator {
-        public String isValid(Object value) {
-            String svalue = value.toString();
-            ISchemaAttribute att = (ISchemaAttribute) getSourceObject();
-            ISchemaSimpleType type = att.getType();
-            if (type.getName().equals("boolean")) { //$NON-NLS-1$
-                if (!svalue.equals("true") && !svalue.equals("false")) //$NON-NLS-1$ //$NON-NLS-2$
-                    return PDEUIMessages.AttributePropertySource_assertBoolean; 
-            } else if (type.getName().equals("string") //$NON-NLS-1$
-                    && type.getRestriction() != null) {
-                ISchemaRestriction restriction = type.getRestriction();
-                if (restriction.isValueValid(svalue) == false) {
-                    return NLS.bind(PDEUIMessages.AttributePropertySource_invalidRestriction, svalue); 
-                }
-            }
-            return null;
-        }
-    }
-
-    public AttributePropertySource(
-            org.eclipse.pde.internal.core.ischema.ISchemaAttribute att) {
-        super(att);
-    }
-
-    public Object doClone() {
-        ISchemaAttribute att = (ISchemaAttribute) getSourceObject();
-        SchemaElement element = (SchemaElement) att.getParent();
-        String value = NLS.bind(PDEUIMessages.SchemaEditor_AttributePR_attributeCopy, att.getName());
-        SchemaAttribute att2 = new SchemaAttribute(att, value);
-        ((SchemaComplexType) element.getType()).addAttribute(att2);
-        return att2;
-    }
-
-    public Object getEditableValue() {
-        return null;
-    }
-
-    private int getIndexOf(String value, String[] table) {
-        for (int i = 0; i < table.length; i++) {
-            if (value.equals(table[i]))
-                return i;
-        }
-        return 0;
-    }
-
-    public IPropertyDescriptor[] getPropertyDescriptors() {
-        descriptors = new Vector();
-        PropertyDescriptor cdesc = createComboBoxPropertyDescriptor(P_USE, PDEUIMessages.SchemaEditor_AttributePR_use, ISchemaAttribute.useTable);
-        cdesc.setLabelProvider(new ComboProvider(P_USE, ISchemaAttribute.useTable));
-        descriptors.addElement(cdesc);
-        
-        cdesc = createComboBoxPropertyDescriptor(P_KIND, PDEUIMessages.SchemaEditor_AttributePR_kind, ISchemaAttribute.kindTable);
-        cdesc.setLabelProvider(new ComboProvider(P_KIND, ISchemaAttribute.kindTable));
-        descriptors.addElement(cdesc);
-        
-        cdesc = createComboBoxPropertyDescriptor(P_TYPE, PDEUIMessages.SchemaEditor_AttributePR_type, typeTable);
-        cdesc.setLabelProvider(new ComboProvider(P_TYPE, typeTable));
-        descriptors.addElement(cdesc);
-        
-        cdesc = createComboBoxPropertyDescriptor(P_TRANSLATABLE, PDEUIMessages.AttributePropertySource_translatable, booleanTable); 
-        cdesc.setLabelProvider(new ComboProvider(P_TRANSLATABLE, booleanTable));
-        descriptors.addElement(cdesc);
-
-        cdesc = createComboBoxPropertyDescriptor(P_DEPRECATED, PDEUIMessages.AttributePropertySource_deprecated, booleanTable); 
-        cdesc.setLabelProvider(new ComboProvider(P_DEPRECATED, booleanTable));
-        descriptors.addElement(cdesc);
-
-        cdesc = new TypeRestrictionDescriptor(P_RESTRICTION, PDEUIMessages.SchemaEditor_AttributePR_restriction, !isEditable());
-        descriptors.addElement(cdesc);
-        cdesc = createTextPropertyDescriptor(P_VALUE, PDEUIMessages.SchemaEditor_AttributePR_value);
-        cdesc.setValidator(new ValueValidator());
-        descriptors.addElement(cdesc);
-        
-        PropertyDescriptor desc = createTextPropertyDescriptor(P_BASED_ON, PDEUIMessages.SchemaEditor_AttributePR_basedOn);
-        descriptors.addElement(desc);
-        
-        desc = createTextPropertyDescriptor(P_NAME, PDEUIMessages.SchemaEditor_AttributePR_name);
-        descriptors.addElement(desc);
-
-        return toDescriptorArray(descriptors);
-    }
-
-    public Object getPropertyValue(Object name) {
-        ISchemaAttribute att = (ISchemaAttribute) getSourceObject();
-        if (name.equals(P_DEPRECATED))
-        	return att.isDeprecated() ? new Integer(1) : new Integer(0);
-        	
-        if (name.equals(P_TRANSLATABLE))
-        	return att.isTranslatable() ? new Integer(1) : new Integer(0);
-        	
-        if (name.equals(P_RESTRICTION))
-            return att.getType().getRestriction();
-        if (name.equals(P_VALUE))
-            return getNonzeroValue(att.getValue());
-        if (name.equals(P_BASED_ON))
-            return getNonzeroValue(att.getBasedOn());
-        if (name.equals(P_NAME))
-            return getNonzeroValue(att.getName());
-        if (name.equals(P_USE)) {
-            if (isSchemaObject)
-                return new Integer(att.getUse());
-            return ISchemaAttribute.useTable[att.getUse()];
-        }
-        if (name.equals(P_KIND)) {
-            if (isSchemaObject)
-                return new Integer(att.getKind());
-            return ISchemaAttribute.kindTable[att.getKind()];
-        }
-        if (name.equals(P_TYPE)) {
-            if (isSchemaObject)
-                return new Integer(getIndexOf(att.getType().getName(), typeTable));
-            return att.getType().getName();
-        }
-        return ""; //$NON-NLS-1$
-    }
-
-    public boolean isCloneable() {
-        ISchemaAttribute att = (ISchemaAttribute) getSourceObject();
-        if (att.getParent().getName().equals("extension")) //$NON-NLS-1$
-            return false;
-        return true;
-    }
-
-    public boolean isPropertySet(Object property) {
-        return false;
-    }
-
-    public void resetPropertyValue(Object property) {
-    }
-
-    public void setPropertyValue(Object name, Object value) {
-        SchemaAttribute att = (SchemaAttribute) getSourceObject();
-        if (value instanceof Integer) {
-            int index = ((Integer) value).intValue();
-            if (name.equals(P_USE))
-                att.setUse(index);
-            else if (name.equals(P_KIND))
-                att.setKind(index);
-            else if (name.equals(P_TYPE)) {
-                att.setType(new SchemaSimpleType(att.getSchema(), typeTable[index]));
-                if (att.getValue() != null)
-                    att.setValue(null);
-            } else if (name.equals(P_TRANSLATABLE)) {
-            	att.setTranslatableProperty(index == 1);
-            } else if (name.equals(P_DEPRECATED)) {
-            	att.setDeprecatedProperty(index == 1);
-            }
-        } else if (name.equals(P_RESTRICTION)) {
-            ISchemaRestriction restriction = (ISchemaRestriction) value;
-            if (restriction != null && restriction.getChildren().length == 0)
-                restriction = null;
-            if (att.getType() instanceof SchemaSimpleType) {
-                SchemaSimpleType type = (SchemaSimpleType) att.getType();
-                type.setRestriction(restriction);
-                att.setType(type);
-            }
-        } else if (value instanceof String) {
-            String svalue = (String) value;
-            if (name.equals(P_VALUE))
-                att.setValue(svalue);
-            else if (name.equals(P_BASED_ON))
-                att.setBasedOn(svalue);
-            else if (name.equals(P_NAME))
-                att.setName(svalue);
-        }
-    }
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/CompositorPropertySource.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/CompositorPropertySource.java
deleted file mode 100644
index 71bfdec..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/CompositorPropertySource.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-
-import org.eclipse.pde.internal.core.schema.*;
-import org.eclipse.ui.views.properties.*;
-import org.eclipse.pde.internal.core.ischema.*;
-import org.eclipse.pde.internal.ui.*;
-
-public class CompositorPropertySource extends GrammarPropertySource {
-	public static final String P_KIND = "kind"; //$NON-NLS-1$
-	public CompositorPropertySource(ISchemaCompositor obj) {
-	super(obj);
-}
-public IPropertyDescriptor[] getPropertyDescriptors() {
-	if (descriptors == null) {
-		descriptors = super.getPropertyDescriptorsVector();
-		PropertyDescriptor cdesc =
-			createComboBoxPropertyDescriptor(P_KIND, PDEUIMessages.SchemaEditor_CompositorPR_kind, ISchemaCompositor.kindTable);
-		if (cdesc instanceof ComboBoxPropertyDescriptor)
-			((ComboBoxPropertyDescriptor) cdesc).setLabelProvider(
-				new ComboProvider(P_KIND, ISchemaCompositor.kindTable));
-		descriptors.addElement(cdesc);
-	}
-	return toDescriptorArray(descriptors);
-}
-public Object getPropertyValue(Object name) {
-	ISchemaCompositor compositor = (ISchemaCompositor)getSourceObject();
-	if (name.equals(P_KIND)) {
-		return new Integer(compositor.getKind());
-	}
-	return super.getPropertyValue(name);
-}
-public void setPropertyValue(String name, Object value) {
-	SchemaCompositor compositor = (SchemaCompositor)getSourceObject();
-	
-	if (name.equals(P_KIND)) {
-		compositor.setKind(((Integer)value).intValue());
-	}
-	else super.setPropertyValue(name, value);
-}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/DescriptionSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/DescriptionSection.java
deleted file mode 100644
index 2fda099..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/DescriptionSection.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.resource.*;
-import org.eclipse.jface.text.*;
-import org.eclipse.jface.text.rules.*;
-import org.eclipse.jface.text.source.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.internal.core.ischema.*;
-import org.eclipse.pde.internal.core.schema.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.editor.text.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.dnd.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.actions.*;
-import org.eclipse.ui.forms.*;
-import org.eclipse.ui.forms.widgets.*;
-
-public class DescriptionSection extends PDESection implements IPartSelectionListener {
-	private Button applyButton;
-	private Button resetButton;
-	private IDocument document;
-	private boolean editable = true;
-	private SourceViewerConfiguration sourceConfiguration;
-	private ISchemaObject element;
-	private SourceViewer sourceViewer;
-	private IDocumentPartitioner partitioner;
-	private ISchema schema;
-	private boolean ignoreChange = false;
-
-	public DescriptionSection(PDEFormPage page, Composite parent, IColorManager colorManager) {
-		super(page, parent, Section.DESCRIPTION);
-		getSection().setText(PDEUIMessages.SchemaEditor_DescriptionSection_title);
-		getSection().setDescription(PDEUIMessages.SchemaEditor_DescriptionSection_desc);
-		sourceConfiguration = new XMLConfiguration(colorManager);
-		document = new Document();
-		partitioner =
-			new FastPartitioner(
-				new XMLPartitionScanner(),
-				new String[] {
-					XMLPartitionScanner.XML_TAG,
-					XMLPartitionScanner.XML_COMMENT });
-		partitioner.connect(document);
-		document.setDocumentPartitioner(partitioner);
-		createClient(getSection(), page.getManagedForm().getToolkit());
-	}
-	private void checkForPendingChanges() {
-		if (applyButton.isEnabled())
-			handleApply();
-	}
-	public void commit(boolean onSave) {
-		handleApply();
-		if (onSave) {
-			resetButton.setEnabled(false);
-		}
-		super.commit(onSave);
-	}
-	public void createClient(
-		Section section,
-		FormToolkit toolkit) {
-		Composite container = toolkit.createComposite(section);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginWidth = 2;
-		container.setLayout(layout);
-		GridData gd;
-		int styles =
-			SWT.MULTI
-				| SWT.WRAP
-				| SWT.V_SCROLL
-				| SWT.H_SCROLL;
-		sourceViewer = new SourceViewer(container, null, styles);
-		sourceViewer.configure(sourceConfiguration);
-		sourceViewer.setDocument(document);
-		sourceViewer.setEditable(isEditable());
-		sourceViewer
-			.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				updateSelection(event.getSelection());
-			}
-		});
-		Control styledText = sourceViewer.getTextWidget();
-		styledText.setFont(
-			JFaceResources.getFontRegistry().get(JFaceResources.TEXT_FONT));
-		if (SWT.getPlatform().equals("motif") == false) //$NON-NLS-1$
-			toolkit.paintBordersFor(container);
-		styledText.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TEXT_BORDER);
-		Control[] children = container.getChildren();
-		Control control = children[children.length - 1];
-		gd = new GridData(GridData.FILL_BOTH);
-		gd.widthHint = 200;
-		gd.heightHint = 64;
-		control.setLayoutData(gd);
-		styledText.setMenu(getPage().getPDEEditor().getContextMenu());
-		styledText.addFocusListener(new FocusAdapter() {
-			public void focusGained(FocusEvent e) {
-				updateSelection(sourceViewer.getSelection());
-			}
-		});
-
-		Composite buttonContainer = toolkit.createComposite(container);
-		layout = new GridLayout();
-		layout.marginHeight = 0;
-		buttonContainer.setLayout(layout);
-		gd = new GridData(GridData.FILL_VERTICAL);
-		buttonContainer.setLayoutData(gd);
-
-		applyButton =
-			toolkit.createButton(
-				buttonContainer,
-				PDEUIMessages.Actions_apply_flabel,
-				SWT.PUSH);
-		applyButton.setEnabled(false);
-		gd =
-			new GridData(
-				GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-		applyButton.setLayoutData(gd);
-		applyButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleApply();
-			}
-		});
-
-		resetButton =
-			toolkit.createButton(
-				buttonContainer,
-				PDEUIMessages.Actions_reset_flabel,
-				SWT.PUSH);
-		resetButton.setEnabled(false);
-		gd =
-			new GridData(
-				GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-		resetButton.setLayoutData(gd);
-		resetButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleReset();
-			}
-		});
-		section.setClient(container);
-		initialize();
-	}
-
-	private void updateSelection(ISelection selection) {
-		getPage().getPDEEditor().setSelection(selection);
-	}
-
-	public boolean doGlobalAction(String actionId) {
-		if (actionId.equals(ActionFactory.CUT.getId())) {
-			sourceViewer.doOperation(SourceViewer.CUT);
-			return true;
-		} else if (
-			actionId.equals(ActionFactory.COPY.getId())) {
-			sourceViewer.doOperation(SourceViewer.COPY);
-			return true;
-		} else if (
-			actionId.equals(ActionFactory.PASTE.getId())) {
-			sourceViewer.doOperation(SourceViewer.PASTE);
-			return true;
-		} else if (
-			actionId.equals(ActionFactory.SELECT_ALL.getId())) {
-			sourceViewer.doOperation(SourceViewer.SELECT_ALL);
-			return true;
-		} else if (
-			actionId.equals(ActionFactory.DELETE.getId())) {
-			sourceViewer.doOperation(SourceViewer.DELETE);
-			return true;
-		} else if (
-			actionId.equals(ActionFactory.UNDO.getId())) {
-			sourceViewer.doOperation(SourceViewer.UNDO);
-			return true;
-		} else if (
-			actionId.equals(ActionFactory.REDO.getId())) {
-			sourceViewer.doOperation(SourceViewer.REDO);
-			return true;
-		}
-		return false;
-	}
-	protected void fillContextMenu(IMenuManager manager) {
-		getPage().getPDEEditor().getContributor().contextMenuAboutToShow(
-			manager);
-	}
-	private void handleApply() {
-		if (element != null) {
-			if (element == schema) {
-				((Schema)schema).setDescription(document.get());
-			}
-			else {
-			 ((SchemaObject) element).setDescription(document.get());
-			}
-		}
-		applyButton.setEnabled(false);
-		resetButton.setEnabled(false);
-	}
-	private void handleReset() {
-		updateDocument();
-	}
-	public void initialize() {
-		schema = (ISchema) getPage().getModel();
-		element = schema;
-		updateDocument();
-		document.addDocumentListener(new IDocumentListener() {
-			public void documentChanged(DocumentEvent e) {
-				if (!ignoreChange && schema instanceof IEditable) {
-					markDirty();
-				}
-				applyButton.setEnabled(true);
-				resetButton.setEnabled(true);
-			}
-			public void documentAboutToBeChanged(DocumentEvent e) {
-			}
-		});
-	}
-	public boolean isEditable() {
-		return editable;
-	}
-	public void selectionChanged(IFormPart part, ISelection selection) {
-		checkForPendingChanges();
-		if (!(part instanceof ElementSection))
-			return;
-		Object changeObject = ((IStructuredSelection)selection).getFirstElement();
-		element = (ISchemaObject) changeObject;
-		if (element == null)
-			element = schema;
-		updateDocument();
-	}
-	public void setFocus() {
-		sourceViewer.getTextWidget().setFocus();
-	}
-	public void setEditable(boolean newEditable) {
-		editable = newEditable;
-	}
-	public void updateDocument() {
-		ignoreChange = true;
-		String text = element.getDescription();
-		if (text == null)
-			text = ""; //$NON-NLS-1$
-		/*
-		else
-			text = TextUtil.createMultiLine(text, 60, false);
-		*/
-		document.set(text);
-		resetButton.setEnabled(false);
-		applyButton.setEnabled(false);
-		ignoreChange = false;
-//		ISchemaObject eobj = element;
-//		if (element instanceof ISchemaAttribute) {
-//			eobj = element.getParent();
-//		}
-		//sourceViewer.setEditable(eobj.getName().equals("extension")==false);
-	}
-
-	public boolean canPaste(Clipboard clipboard) {
-		return sourceViewer.canDoOperation(SourceViewer.PASTE);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/DocSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/DocSection.java
deleted file mode 100644
index 94801a0..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/DocSection.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.resource.*;
-import org.eclipse.jface.text.*;
-import org.eclipse.jface.text.rules.*;
-import org.eclipse.jface.text.source.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.internal.core.ischema.*;
-import org.eclipse.pde.internal.core.schema.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.editor.text.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.custom.*;
-import org.eclipse.swt.dnd.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.actions.*;
-import org.eclipse.ui.forms.*;
-import org.eclipse.ui.forms.widgets.*;
-
-public class DocSection extends PDESection {
-	private IDocument document;
-	private IDocumentPartitioner partitioner;
-	private SourceViewerConfiguration sourceConfiguration;
-	private SourceViewer sourceViewer;
-	private CTabFolder tabFolder;
-	private ISchema schema;
-	private Button applyButton;
-	private Button resetButton;
-	private Object element;
-	private boolean ignoreChange;
-
-	public DocSection(PDEFormPage page, Composite parent, IColorManager colorManager) {
-		super(page, parent, Section.DESCRIPTION|Section.NO_TITLE, false);
-		String description = PDEUIMessages.SchemaEditor_DocSection_desc;
-		getSection().setDescription(description);
-		sourceConfiguration = new XMLConfiguration(colorManager);
-		document = new Document();
-		partitioner =
-			new FastPartitioner(
-				new XMLPartitionScanner(),
-				new String[] {
-					XMLPartitionScanner.XML_TAG,
-					XMLPartitionScanner.XML_COMMENT });
-		partitioner.connect(document);
-		document.setDocumentPartitioner(partitioner);
-		//getSection().clientVerticalSpacing = 3;
-		createClient(getSection(), page.getManagedForm().getToolkit());
-	}
-	public void commit(boolean onSave) {
-		handleApply();
-		if (onSave) {
-			resetButton.setEnabled(false);
-		}
-		super.commit(onSave);
-	}
-	public void createClient(
-		Section section,
-		FormToolkit toolkit) {
-		Composite container = toolkit.createComposite(section);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginWidth = 2;
-		layout.marginHeight = 5;
-		layout.verticalSpacing = 8;
-		container.setLayout(layout);
-		GridData gd;
-
-		schema = (ISchema) getPage().getModel();
-		
-		tabFolder = new CTabFolder(container, SWT.FLAT|SWT.TOP);
-		toolkit.adapt(tabFolder, true, true);
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gd.horizontalSpan = 2;
-		gd.heightHint = 2;
-		tabFolder.setLayoutData(gd);
-		toolkit.getColors().initializeSectionToolBarColors();
-		Color selectedColor1 = toolkit.getColors().getColor(FormColors.TB_BG);
-		Color selectedColor2 = toolkit.getColors().getColor(FormColors.TB_GBG);
-		tabFolder.setSelectionBackground(new Color[] {selectedColor1, selectedColor2, toolkit.getColors().getBackground()}, new int[] {50, 100}, true);
-
-		tabFolder.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				updateTabSelection();
-			}
-		});
-
-		int styles =
-			SWT.MULTI | SWT.WRAP | SWT.V_SCROLL | SWT.H_SCROLL;
-		sourceViewer = new SourceViewer(container, null, styles);
-		sourceViewer.configure(sourceConfiguration);
-		sourceViewer.setDocument(document);
-		sourceViewer
-			.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				updateSelection(event.getSelection());
-			}
-		});
-		StyledText styledText = sourceViewer.getTextWidget();
-		styledText.setFont(JFaceResources.getTextFont());
-		styledText.setMenu(getPage().getPDEEditor().getContextMenu());
-		styledText.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TEXT_BORDER);
-
-		if (SWT.getPlatform().equals("motif") == false) //$NON-NLS-1$
-			toolkit.paintBordersFor(container);
-		Control[] children = container.getChildren();
-		Control control = children[children.length - 1];
-		gd = new GridData(GridData.FILL_BOTH);
-		gd.widthHint = 50;
-		gd.heightHint = 50;
-		control.setLayoutData(gd);
-		Composite buttonContainer = toolkit.createComposite(container);
-		layout = new GridLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		buttonContainer.setLayout(layout);
-		gd = new GridData(GridData.FILL_VERTICAL);
-		buttonContainer.setLayoutData(gd);
-
-		applyButton =
-			toolkit.createButton(
-				buttonContainer,
-				PDEUIMessages.Actions_apply_flabel,
-				SWT.PUSH);
-		applyButton.setEnabled(false);
-		gd =
-			new GridData(
-				GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-		applyButton.setLayoutData(gd);
-		applyButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleApply();
-			}
-		});
-
-		resetButton =
-			toolkit.createButton(
-				buttonContainer,
-				PDEUIMessages.Actions_reset_flabel,
-				SWT.PUSH);
-		resetButton.setEnabled(false);
-		gd =
-			new GridData(
-				GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-		resetButton.setLayoutData(gd);
-		resetButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleReset();
-			}
-		});
-		createTabs();
-		section.setClient(container);
-		initialize();
-		if (tabFolder.getItemCount()>0) {
-			tabFolder.setSelection(0);		
-			updateTabSelection();
-		}
-	}
-	public boolean doGlobalAction(String actionId) {
-		if (actionId.equals(ActionFactory.CUT.getId())) {
-			sourceViewer.doOperation(SourceViewer.CUT);
-			return true;
-		} else if (
-			actionId.equals(ActionFactory.COPY.getId())) {
-			sourceViewer.doOperation(SourceViewer.COPY);
-			return true;
-		} else if (
-			actionId.equals(ActionFactory.PASTE.getId())) {
-			sourceViewer.doOperation(SourceViewer.PASTE);
-			return true;
-		} else if (
-			actionId.equals(ActionFactory.SELECT_ALL.getId())) {
-			sourceViewer.doOperation(SourceViewer.SELECT_ALL);
-			return true;
-		} else if (
-			actionId.equals(ActionFactory.DELETE.getId())) {
-			sourceViewer.doOperation(SourceViewer.DELETE);
-			return true;
-		} else if (
-			actionId.equals(ActionFactory.UNDO.getId())) {
-			sourceViewer.doOperation(SourceViewer.UNDO);
-			return true;
-		} else if (
-			actionId.equals(ActionFactory.REDO.getId())) {
-			sourceViewer.doOperation(SourceViewer.REDO);
-			return true;
-		}
-		return false;
-	}
-
-	protected void fillContextMenu(IMenuManager manager) {
-		getPage().getPDEEditor().getContributor().contextMenuAboutToShow(
-			manager);
-	}
-	public boolean setFormInput(Object input) {
-		int index = -1;
-		if (input instanceof ISchema) {
-			index = 0;
-		} else if (input instanceof IDocumentSection) {
-			IDocumentSection[] sections = schema.getDocumentSections();
-			for (int i = 0; i < sections.length; i++) {
-				IDocumentSection section = sections[i];
-				if (section.equals(input)) {
-					index = i + 1;
-					break;
-				}
-			}
-		}
-		if (index != -1)
-			tabFolder.setSelection(index);
-		updateEditorInput(input);
-		return true;
-	}
-	
-	private String getTopicName(Object object) {
-		if (object instanceof ISchema) {
-			return PDEUIMessages.SchemaEditor_topic_overview;
-		} else if (object instanceof IDocumentSection) {
-			IDocumentSection section = (IDocumentSection) object;
-			String sectionId = section.getSectionId();
-			if (sectionId.equals(IDocumentSection.EXAMPLES))
-				return PDEUIMessages.SchemaEditor_topic_examples;
-			if (sectionId.equals(IDocumentSection.SINCE))
-				return PDEUIMessages.SchemaEditor_topic_since;
-			if (sectionId.equals(IDocumentSection.IMPLEMENTATION))
-				return PDEUIMessages.SchemaEditor_topic_implementation;
-			if (sectionId.equals(IDocumentSection.API_INFO))
-				return PDEUIMessages.SchemaEditor_topic_api;
-			if (sectionId.equals(IDocumentSection.COPYRIGHT))
-				return PDEUIMessages.SchemaEditor_topic_copyright;
-		}
-		return "?"; //$NON-NLS-1$
-	}
-
-	private void handleApply() {
-		if (element != null) {
-			if (element instanceof ISchema)
-				 ((Schema) element).setDescription(document.get());
-			else
-				 ((SchemaObject) element).setDescription(document.get());
-			updateTabImage(tabFolder.getSelection());
-		}
-		applyButton.setEnabled(false);
-		resetButton.setEnabled(false);
-	}
-	private void handleReset() {
-		updateEditorInput(element);
-		updateTabImage(tabFolder.getSelection());		
-	}
-	public void initialize() {
-		sourceViewer.setEditable(schema.isEditable());
-		document.addDocumentListener(new IDocumentListener() {
-			public void documentChanged(DocumentEvent e) {
-				if (!ignoreChange && schema.isEditable()) {
-					markDirty();
-				}
-				applyButton.setEnabled(true);
-				resetButton.setEnabled(true);
-			}
-			public void documentAboutToBeChanged(DocumentEvent e) {
-			}
-		});
-		updateEditorInput(schema);
-		schema.addModelChangedListener(this);
-	}
-
-	public void dispose() {
-		schema.removeModelChangedListener(this);
-		super.dispose();
-	}
-
-	private void createTabs() {
-		IDocumentSection[] sections = schema.getDocumentSections();
-		addTab(schema);
-		for (int i = 0; i < sections.length; i++) {
-			IDocumentSection section = sections[i];
-			addTab(section);
-		}
-	}
-	
-	public void checkForPendingChanges() {
-		if (applyButton.isEnabled()) 
-			handleApply();
-	}
-	
-	private void addTab(ISchemaObject section) {
-		String label = getTopicName(section);
-		CTabItem item = new CTabItem(tabFolder, SWT.NULL);
-		item.setText(label);
-		item.setData(section);
-		updateTabImage(item);
-	}
-
-	private void updateTabImage(CTabItem item) {
-		if (item==null) return;
-		ISchemaObject section = (ISchemaObject)item.getData();
-		if (section==null) return;
-		item.setImage(PDEPlugin.getDefault().getLabelProvider().getImage(section));
-	}
-
-	private void updateTabSelection() {
-		int index = tabFolder.getSelectionIndex();
-		if (schema.isEditable() && isDirty()) {
-			handleApply();
-		}
-		if (index == 0)
-			updateEditorInput(schema);
-		else {
-			IDocumentSection[] sections = schema.getDocumentSections();
-			updateEditorInput(sections[index - 1]);
-		}
-	}
-
-	/*private String resolveObjectName(Object object) {
-		if (object instanceof ISchemaObject) {
-			return ((ISchemaObject) object).getName();
-		}
-		return object.toString();
-	}*/
-	
-	public void setFocus() {
-		sourceViewer.getTextWidget().setFocus();
-		updateSelection(sourceViewer.getSelection());
-	}
-
-	private void updateSelection(ISelection selection) {
-		getPage().getPDEEditor().setSelection(selection);
-	}
-
-	public void updateEditorInput(Object input) {
-		ignoreChange = true;
-		String text = ""; //$NON-NLS-1$
-		if (input instanceof ISchemaObject) {
-			text = ((ISchemaObject) input).getDescription();
-		}
-		if (text == null)
-			text = ""; //$NON-NLS-1$
-		/*
-		else
-			text = TextUtil.createMultiLine(text, 60, false);
-		*/
-
-		document.set(text);
-		applyButton.setEnabled(false);
-		resetButton.setEnabled(false);
-		element = input;
-		ignoreChange = false;
-	}
-
-	public void modelChanged(IModelChangedEvent e) {
-		if (e.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			markStale();
-		}
-	}
-
-	public void refresh() {
-		int itemCount = tabFolder.getItemCount();
-		IDocumentSection[] sections = schema.getDocumentSections();
-		if (itemCount != sections.length+1) {
-			// sections added or removed - reload combo
-			disposeAllTabs();
-			createTabs();
-			getPage().getManagedForm().getForm().reflow(true);
-			updateEditorInput(schema);
-		}
-		else {
-			int index = tabFolder.getSelectionIndex();
-			if (index == 0)
-				updateEditorInput(schema);
-			else {
-				updateEditorInput(sections[index - 1]);
-			}
-		}
-		super.refresh();
-	}
-
-	private void disposeAllTabs() {
-		CTabItem [] items = tabFolder.getItems();
-		for (int i=0; i<items.length; i++) 
-			items[i].dispose();
-	}
-
-	public boolean canPaste(Clipboard clipboard) {
-		return sourceViewer.canDoOperation(SourceViewer.PASTE);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ElementPropertySource.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ElementPropertySource.java
deleted file mode 100644
index 46f8f88..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ElementPropertySource.java
+++ /dev/null

@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.internal.core.schema.*;
-import java.util.*;
-import org.eclipse.pde.internal.core.ischema.*;
-import org.eclipse.ui.views.properties.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.internal.ui.*;
-
-public class ElementPropertySource extends SchemaObjectPropertySource {
-	public static final String P_LABEL_ATTRIBUTE = "labelAttribute"; //$NON-NLS-1$
-
-	public static final String P_ICON = "icon"; //$NON-NLS-1$
-
-	public static final String P_NAME = "name"; //$NON-NLS-1$
-    public static final String P_TRANSLATABLE = "translatable"; //$NON-NLS-1$
-    public static final String P_DEPRECATED = "deprecated"; //$NON-NLS-1$
-
-	private Vector descriptors;
-	
-    private static final String[] booleanTable = { "false", "true" }; //$NON-NLS-1$ //$NON-NLS-2$
-
-	class LabelAttributeValidator implements ICellEditorValidator {
-		public String isValid(Object value) {
-			String svalue = value.toString();
-			if (isValidAttribute(svalue) == false) {
-				return NLS.bind(PDEUIMessages.SchemaEditor_ElementPR_invalid, svalue);
-			}
-			return null;
-		}
-	}
-
-	public ElementPropertySource(ISchemaElement extension) {
-		super(extension);
-	}
-
-	private void fixReferences(SchemaElement element) {
-		((Schema) element.getSchema()).updateReferencesFor(element);
-	}
-
-	public Object getEditableValue() {
-		return null;
-	}
-
-	public IPropertyDescriptor[] getPropertyDescriptors() {
-		if (descriptors == null) {
-			descriptors = new Vector();
-			PropertyDescriptor desc = createTextPropertyDescriptor(
-					P_LABEL_ATTRIBUTE, PDEUIMessages.SchemaEditor_ElementPR_labelAttribute);
-			desc.setValidator(new LabelAttributeValidator());
-			descriptors.addElement(desc);
-			
-			desc = createTextPropertyDescriptor(P_ICON, PDEUIMessages.SchemaEditor_ElementPR_icon);
-			descriptors.addElement(desc);
-			
-			desc = createTextPropertyDescriptor(P_NAME, PDEUIMessages.SchemaEditor_ElementPR_name);
-			descriptors.addElement(desc);
-			
-            desc = createComboBoxPropertyDescriptor(P_TRANSLATABLE, PDEUIMessages.ElementPropertySource_translatable, booleanTable); 
-            if (desc instanceof ComboBoxPropertyDescriptor)
-                ((ComboBoxPropertyDescriptor) desc).setLabelProvider(new ComboProvider(
-                        P_TRANSLATABLE, booleanTable));
-            descriptors.addElement(desc);
-
-            desc = createComboBoxPropertyDescriptor(P_DEPRECATED, PDEUIMessages.ElementPropertySource_deprecated, booleanTable); 
-            if (desc instanceof ComboBoxPropertyDescriptor)
-                ((ComboBoxPropertyDescriptor) desc).setLabelProvider(new ComboProvider(
-                        P_DEPRECATED, booleanTable));
-            descriptors.addElement(desc);
-
- 		}
-		return toDescriptorArray(descriptors);
-	}
-
-	public Object getPropertyValue(Object name) {
-		ISchemaElement element = (ISchemaElement) getSourceObject();
-        if (name.equals(P_DEPRECATED))
-        	return element.isDeprecated() ? new Integer(1) : new Integer(0);
-        	
-        if (name.equals(P_TRANSLATABLE))
-        	return element.hasTranslatableContent() ? new Integer(1) : new Integer(0);
-        	
-		if (name.equals(P_LABEL_ATTRIBUTE))
-			return getNonzeroValue(element.getLabelProperty());
-		if (name.equals(P_ICON))
-			return getNonzeroValue(element.getIconProperty());
-		if (name.equals(P_NAME))
-			return getNonzeroValue(element.getName());
-		return ""; //$NON-NLS-1$
-	}
-
-	public boolean isPropertySet(Object property) {
-		return false;
-	}
-
-	private boolean isValidAttribute(String name) {
-		if (name == null || name.length() == 0)
-			return true;
-		ISchemaElement element = (ISchemaElement) getSourceObject();
-		return element.getAttribute(name) != null;
-	}
-
-	public void resetPropertyValue(Object property) {
-	}
-
-	public void setPropertyValue(Object name, Object value) {
-		SchemaElement element = (SchemaElement) getSourceObject();
-	    if (value instanceof Integer) {
-            int index = ((Integer) value).intValue();
-            if (name.equals(P_TRANSLATABLE)) {
-            	element.setTranslatableProperty(index == 1);
-            } else if (name.equals(P_DEPRECATED)) {
-            	element.setDeprecatedProperty(index == 1);
-            }	    
-        } else {
-			String svalue = (String) value;
-			if (name.equals(P_LABEL_ATTRIBUTE))
-				element.setLabelProperty(svalue);
-			else if (name.equals(P_ICON))
-				element.setIconProperty(svalue);
-			else if (name.equals(P_NAME)) {
-				element.setName(svalue);
-				fixReferences(element);
-			}
-	    }
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ElementSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ElementSection.java
deleted file mode 100644
index 4597bf5..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ElementSection.java
+++ /dev/null

@@ -1,411 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-
-import java.util.Iterator;
-
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.ischema.*;
-import org.eclipse.pde.internal.core.ischema.ISchemaElement;
-import org.eclipse.pde.internal.core.schema.*;
-import org.eclipse.pde.internal.core.schema.Schema;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.editor.ModelDataTransfer;
-import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
-import org.eclipse.pde.internal.ui.parts.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.*;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.forms.widgets.*;
-import org.eclipse.ui.forms.widgets.Section;
-
-public class ElementSection extends TreeSection {
-	private TreeViewer treeViewer;
-	private Schema schema;
-	private NewElementAction newElementAction = new NewElementAction();
-	private NewAttributeAction newAttributeAction = new NewAttributeAction();
-	private Clipboard clipboard;
-	private PropertiesAction propertiesAction;
-
-	class ContentProvider
-		extends DefaultContentProvider
-		implements ITreeContentProvider {
-		public Object[] getElements(Object object) {
-			Schema schema = (Schema) object;
-			return schema.getElements();
-		}
-		public Object[] getChildren(Object parent) {
-			if (parent instanceof ISchemaElement) {
-				return ((ISchemaElement) parent).getAttributes();
-			}
-			return new Object[0];
-		}
-		public Object getParent(Object child) {
-			if (child instanceof ISchemaObject) {
-				return ((ISchemaObject) child).getParent();
-			}
-			return null;
-		}
-		public boolean hasChildren(Object parent) {
-			return getChildren(parent).length > 0;
-		}
-	}
-
-	public ElementSection(PDEFormPage page, Composite parent) {
-		super(
-			page,
-			parent,
-			Section.DESCRIPTION,
-			new String[] {
-				PDEUIMessages.SchemaEditor_ElementSection_newElement,
-				PDEUIMessages.SchemaEditor_ElementSection_newAttribute});
-		getSection().setText(PDEUIMessages.SchemaEditor_ElementSection_title);
-		getSection().setDescription(PDEUIMessages.SchemaEditor_ElementSection_desc);
-	}
-	public void createClient(
-		Section section,
-		FormToolkit toolkit) {
-		Composite container = createClientContainer(section, 2, toolkit);
-		createTree(container, toolkit);
-		toolkit.paintBordersFor(container);
-		propertiesAction = new PropertiesAction(getPage().getPDEEditor());
-		section.setClient(container);
-		initialize();
-	}
-
-	private void createTree(Composite container, FormToolkit toolkit) {
-		TreePart treePart = getTreePart();
-		createViewerPartControl(container, SWT.MULTI, 2, toolkit);
-		treeViewer = treePart.getTreeViewer();
-		treeViewer.setAutoExpandLevel(TreeViewer.ALL_LEVELS);
-		treeViewer.setContentProvider(new ContentProvider());
-		treeViewer.setLabelProvider(PDEPlugin.getDefault().getLabelProvider());
-		initDragAndDrop();
-	}
-	
-	private void initDragAndDrop() {
-		clipboard = new Clipboard(treeViewer.getControl().getDisplay());
-		int ops = DND.DROP_COPY | DND.DROP_MOVE;
-		Transfer[] transfers =
-			new Transfer[] {
-				ModelDataTransfer.getInstance(),
-				TextTransfer.getInstance()};
-		treeViewer.addDragSupport(
-			ops,
-			transfers,
-			new ElementSectionDragAdapter(treeViewer, this));
-		treeViewer.addDropSupport(
-			ops | DND.DROP_DEFAULT,
-			transfers,
-			new ElementSectionDropAdapter(this));
-	}
-	
-	TreeViewer getTreeViewer() {
-		return treeViewer;
-	}
-
-	protected void buttonSelected(int index) {
-		if (index == 0)
-			handleNewElement();
-		else if (index == 1)
-			handleNewAttribute();
-	}
-
-	public void dispose() {
-		schema.removeModelChangedListener(this);
-		if (clipboard!=null) {
-			clipboard.dispose();
-			clipboard = null;
-		}
-		super.dispose();
-	}
-
-	public boolean doGlobalAction(String actionId) {
-		if (actionId.equals(ActionFactory.DELETE.getId())) {
-			ISelection sel = treeViewer.getSelection();
-			Object obj = ((IStructuredSelection) sel).getFirstElement();
-			if (obj != null)
-				handleDelete(obj);
-			return true;
-		}
-		if (actionId.equals(ActionFactory.CUT.getId())) {
-			// delete here and let the editor transfer
-			// the selection to the clipboard
-			ISelection sel = treeViewer.getSelection();
-			Object obj = ((IStructuredSelection) sel).getFirstElement();
-			if (obj != null)
-				handleDelete(obj);
-			return false;
-		}
-		if (actionId.equals(ActionFactory.PASTE.getId())) {
-			doPaste();
-			return true;
-		}
-		return false;
-	}
-	public boolean setFormInput(Object object) {
-		if (object instanceof ISchemaElement
-			|| object instanceof ISchemaAttribute) {
-			treeViewer.setSelection(new StructuredSelection(object), true);
-			return true;
-		}
-		return false;
-	}
-	
-	protected void fillContextMenu(IMenuManager manager) {
-		final ISelection selection = treeViewer.getSelection();
-		final Object object =
-			((IStructuredSelection) selection).getFirstElement();
-
-		MenuManager submenu =
-			new MenuManager(PDEUIMessages.Menus_new_label);
-		if (object == null || object instanceof SchemaElement) {
-			newElementAction.setSchema(schema);
-			newElementAction.setEnabled(schema.isEditable());
-			submenu.add(newElementAction);
-		}
-		if (object != null) {
-			SchemaElement element;
-			if (object instanceof SchemaElement)
-				element = (SchemaElement) object;
-			else
-				element =
-					(SchemaElement) ((SchemaAttribute) object).getParent();
-			if (element.getName().equals("extension") == false) { //$NON-NLS-1$
-				newAttributeAction.setElement(element);
-				newAttributeAction.setEnabled(schema.isEditable());
-				submenu.add(newAttributeAction);
-			}
-		}
-		manager.add(submenu);
-		if (!selection.isEmpty()) {
-			if (!(object instanceof SchemaElement)
-				|| ((SchemaElement) object).getName().equals("extension") //$NON-NLS-1$
-					== false) {
-				manager.add(new Separator());
-				Action deleteAction = new Action() {
-					public void run() {
-						handleDelete((IStructuredSelection) selection);
-					}
-				};
-				deleteAction.setText(PDEUIMessages.Actions_delete_label);
-				deleteAction.setEnabled(schema.isEditable());
-				manager.add(deleteAction);
-			}
-		}
-		getPage().getPDEEditor().getContributor().contextMenuAboutToShow(
-			manager);
-		manager.add(new Separator());
-		manager.add(propertiesAction);
-	}
-
-	private void handleDelete(IStructuredSelection selection) {
-		for (Iterator iter = selection.iterator(); iter.hasNext();) {
-			handleDelete(iter.next());
-		}
-	}
-
-	void handleDelete(Object object) {
-		ISchemaObject sobject = (ISchemaObject) object;
-		ISchemaObject parent = sobject.getParent();
-
-		if (sobject instanceof ISchemaElement) {
-			Schema schema = (Schema) parent;
-			schema.removeElement((ISchemaElement) sobject);
-			schema.updateReferencesFor((ISchemaElement)sobject, ISchema.REFRESH_DELETE);
-		} else if (sobject instanceof ISchemaAttribute) {
-			SchemaElement element = (SchemaElement) parent;
-			SchemaComplexType type = (SchemaComplexType) element.getType();
-			type.removeAttribute((ISchemaAttribute) sobject);
-		}
-	}
-
-	private void handleNewAttribute() {
-		Object object =
-			((IStructuredSelection) treeViewer.getSelection())
-				.getFirstElement();
-
-		if (object != null) {
-			SchemaElement element;
-			if (object instanceof SchemaElement)
-				element = (SchemaElement) object;
-			else
-				element =
-					(SchemaElement) ((SchemaAttribute) object).getParent();
-			if (element.getName().equals("extension") == false) { //$NON-NLS-1$
-				newAttributeAction.setElement(element);
-				newAttributeAction.run();
-			}
-		}
-	}
-
-	private void handleNewElement() {
-		newElementAction.setSchema(schema);
-		newElementAction.run();
-	}
-	public void initialize() {
-		this.schema = (Schema) getPage().getModel();
-		treeViewer.setInput(schema);
-		schema.addModelChangedListener(this);
-		getTreePart().setButtonEnabled(0, schema.isEditable());
-		getTreePart().setButtonEnabled(1, false);
-	}
-
-	public void modelChanged(IModelChangedEvent e) {
-		if (e.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			markStale();
-			return;
-		}
-		Object obj = e.getChangedObjects()[0];
-		if (obj instanceof ISchemaObjectReference)
-			return;
-		if (obj instanceof ISchemaElement || obj instanceof ISchemaAttribute) {
-			if (e.getChangeType() == IModelChangedEvent.CHANGE) {
-				treeViewer.update(obj, null);
-			} else {
-				if (e.getChangeType() == IModelChangedEvent.INSERT) {
-					ISchemaObject sobj = (ISchemaObject) obj;
-					ISchemaObject parent = sobj.getParent();
-					treeViewer.add(parent, sobj);
-					treeViewer.setSelection(new StructuredSelection(obj), true);
-				} else if (e.getChangeType() == IModelChangedEvent.REMOVE) {
-					ISchemaObject sobj = (ISchemaObject) obj;
-					ISchemaObject parent = sobj.getParent();
-					treeViewer.remove(obj);
-					treeViewer.setSelection(
-						new StructuredSelection(parent),
-						true);
-				}
-			}
-		}
-	}
-	
-	public void refresh() {
-		treeViewer.refresh();
-		super.refresh();
-	}
-	
-	protected void selectionChanged(IStructuredSelection selection) {
-		getPage().getManagedForm().fireSelectionChanged(this, selection);
-		getPage().getPDEEditor().setSelection(selection);
-		updateButtons();
-	}
-
-	public void setFocus() {
-		treeViewer.getTree().setFocus();
-		getPage().getPDEEditor().setSelection(treeViewer.getSelection());
-	}
-	private void updateButtons() {
-		if (schema.isEditable() == false)
-			return;
-		Object object =
-			((IStructuredSelection) treeViewer.getSelection())
-				.getFirstElement();
-		ISchemaObject sobject = (ISchemaObject) object;
-
-		boolean canAddAttribute = false;
-		if (sobject != null) {
-			String name = sobject.getName();
-			if (sobject instanceof ISchemaElement) {
-				if (name.equals("extension") == false) //$NON-NLS-1$
-					canAddAttribute = true;
-			} else if (sobject instanceof ISchemaAttribute) {
-				ISchemaElement element = (ISchemaElement) (sobject.getParent());
-				if (element.getName().equals("extension") == false) //$NON-NLS-1$
-					canAddAttribute = true;
-			}
-		}
-		getTreePart().setButtonEnabled(1, canAddAttribute);
-	}
-
-	public void doPaste(Object target, Object[] objects) {
-		for (int i = 0; i < objects.length; i++) {
-			Object object = objects[i];
-			Object realTarget = getRealTarget(target, object);
-			Object sibling = getSibling(target, object);
-			if (realTarget == null)
-				continue;
-			doPaste(realTarget, sibling, object);
-		}
-	}
-	
-	private Object getSibling(Object target, Object object) {
-		if (target instanceof ISchemaElement && object instanceof ISchemaElement)
-			return target;
-		if (target instanceof ISchemaAttribute && object instanceof ISchemaAttribute)
-			return target;
-		return null;
-	}
-
-	private Object getRealTarget(Object target, Object object) {
-		if (object instanceof ISchemaElement) {
-			return schema;
-		}
-		if (object instanceof ISchemaAttribute) {
-			if (target instanceof ISchemaAttribute) {
-				// add it to the parent of the selected attribute
-				return ((ISchemaAttribute) target).getParent();
-			}
-			if (target instanceof ISchemaElement)
-				return target;
-		}
-		return null;
-	}
-
-	private void doPaste(Object realTarget, Object sibling, Object object) {
-		if (object instanceof ISchemaElement) {
-			SchemaElement element = (SchemaElement) object;
-			element.setParent(schema);
-			schema.addElement(element, (ISchemaElement)sibling);
-			schema.updateReferencesFor(element, ISchema.REFRESH_ADD);
-		} else if (object instanceof ISchemaAttribute) {
-			SchemaElement element = (SchemaElement) realTarget;
-			SchemaAttribute attribute = (SchemaAttribute) object;
-			attribute.setParent(element);
-			ISchemaType type = element.getType();
-			SchemaComplexType complexType = null;
-			if (!(type instanceof ISchemaComplexType)) {
-				complexType = new SchemaComplexType(element.getSchema());
-				element.setType(complexType);
-			} else {
-				complexType = (SchemaComplexType) type;
-			}
-			complexType.addAttribute(attribute, (ISchemaAttribute)sibling);
-		}
-	}
-
-	protected boolean canPaste(Object target, Object[] objects) {
-		for (int i = 0; i < objects.length; i++) {
-			Object obj = objects[i];
-			// Attributes can only paste into elements
-			if (obj instanceof ISchemaAttribute) {
-				if (target instanceof ISchemaAttribute
-					|| target instanceof ISchemaElement)
-					continue;
-			} else if (obj instanceof ISchemaElement) {
-				continue;
-			}
-			return false;
-		}
-		return true;
-	}
-	protected void handleDoubleClick(IStructuredSelection selection) {
-		propertiesAction.run();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ElementSectionDragAdapter.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ElementSectionDragAdapter.java
deleted file mode 100644
index b603cfe..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ElementSectionDragAdapter.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-
-import java.util.*;
-
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.internal.core.ischema.ISchemaObject;
-import org.eclipse.pde.internal.ui.editor.ModelDataTransfer;
-import org.eclipse.swt.dnd.*;
-import org.eclipse.swt.widgets.Control;
-
-public class ElementSectionDragAdapter extends DragSourceAdapter {
-	ISelectionProvider selectionProvider;
-	Object dragData;
-	ElementSection section;
-
-	/**
-	 * NavigatorDragAction constructor comment.
-	 */
-	public ElementSectionDragAdapter(ISelectionProvider provider, ElementSection section) {
-		selectionProvider = provider;
-		this.section = section;
-	}
-
-	/**
-	 * Returns the data to be transferred in a drag and drop
-	 * operation.
-	 */
-	public void dragSetData(DragSourceEvent event) {
-		if (event.doit == false)
-			return;
-		if (ModelDataTransfer.getInstance().isSupportedType(event.dataType)) {
-			event.data = getSelectedModelObjects();
-			dragData = event.data;
-			return;
-		}
-		if (TextTransfer.getInstance().isSupportedType(event.dataType)) {
-			event.data =
-				createTextualRepresentation(
-					(IStructuredSelection) selectionProvider.getSelection());
-			dragData = null;
-			return;
-		}
-	}
-
-	static String createTextualRepresentation(IStructuredSelection sel) {
-		StringBuffer buf = new StringBuffer();
-		for (Iterator iter = sel.iterator(); iter.hasNext();) {
-			String name = iter.next().toString();
-			buf.append(name);
-			buf.append(" "); //$NON-NLS-1$
-		}
-		return buf.toString();
-	}
-	/**
-	 * All selection must be named model objects.
-	 */
-	public void dragStart(DragSourceEvent event) {
-
-		// Workaround for 1GEUS9V
-		DragSource dragSource = (DragSource) event.widget;
-		Control control = dragSource.getControl();
-		if (control != control.getDisplay().getFocusControl()) {
-			event.doit = false;
-			return;
-		}
-
-		event.doit = canDrag();
-	}
-
-	public void dragFinished(DragSourceEvent event) {
-		if (event.doit == false || dragData == null)
-			return;
-		if (event.detail == DND.DROP_MOVE) {
-			ISchemaObject[] objects = (ISchemaObject[]) dragData;
-
-			for (int i = 0; i < objects.length; i++) {
-				ISchemaObject obj = objects[i];
-				section.handleDelete(obj);
-			}
-		}
-		dragData = null;
-	}
-
-	private boolean canDrag() {
-		return canCopy((IStructuredSelection) selectionProvider.getSelection());
-	}
-
-	static boolean canCopy(IStructuredSelection selection) {
-		Object prev = null;
-		for (Iterator iter = selection.iterator(); iter.hasNext();) {
-			Object obj = iter.next();
-			if (!(obj instanceof ISchemaObject))
-				return false;
-			if (prev != null) {
-				if (prev.getClass().equals(obj.getClass()) == false)
-					return false;
-			} else
-				prev = obj;
-		}
-		return true;
-	}
-
-	private ISchemaObject[] getSelectedModelObjects() {
-		return createObjectRepresentation(
-			(IStructuredSelection) selectionProvider.getSelection());
-	}
-
-	static ISchemaObject[] createObjectRepresentation(IStructuredSelection selection) {
-		ArrayList objects = new ArrayList();
-		for (Iterator iter = selection.iterator(); iter.hasNext();) {
-			Object obj = iter.next();
-			if (obj instanceof ISchemaObject)
-				objects.add(obj);
-			else
-				return new ISchemaObject[0];
-		}
-		return (ISchemaObject[]) objects.toArray(
-			new ISchemaObject[objects.size()]);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ElementSectionDropAdapter.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ElementSectionDropAdapter.java
deleted file mode 100644
index ae5d08c..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ElementSectionDropAdapter.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-
-import org.eclipse.jface.viewers.ViewerDropAdapter;
-import org.eclipse.pde.internal.core.ischema.*;
-import org.eclipse.pde.internal.ui.editor.ModelDataTransfer;
-import org.eclipse.swt.dnd.TransferData;
-
-public class ElementSectionDropAdapter extends ViewerDropAdapter {
-	private TransferData currentTransfer;
-	private ElementSection section;
-
-	public ElementSectionDropAdapter(ElementSection section) {
-		super(section.getTreeViewer());
-		this.section = section;
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ViewerDropAdapter#performDrop(java.lang.Object)
-	 */
-	public boolean performDrop(Object data) {
-		if (data instanceof Object[]) {
-			section.doPaste(getCurrentTarget(), (Object[])data);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ViewerDropAdapter#validateDrop(java.lang.Object, int, org.eclipse.swt.dnd.TransferData)
-	 */
-	public boolean validateDrop(
-		Object target,
-		int operation,
-		TransferData transferType) {
-		currentTransfer = transferType;
-		if (currentTransfer != null
-			&& ModelDataTransfer.getInstance().isSupportedType(
-				currentTransfer)) {
-			return validateTarget();
-		}
-		return false;
-	}
-
-	private boolean validateTarget() {
-		Object target = getCurrentTarget();
-		return (target == null || target instanceof ISchemaObject);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/EnumerationRestrictionPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/EnumerationRestrictionPage.java
deleted file mode 100644
index 087b431..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/EnumerationRestrictionPage.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-
-import java.util.Vector;
-import org.eclipse.pde.internal.core.schema.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.*;
-import org.eclipse.pde.internal.core.ischema.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.util.SWTUtil;
-
-public class EnumerationRestrictionPage implements IRestrictionPage {
-	private List choiceList;
-	private Button addButton;
-	private Button deleteButton;
-	private Text text;
-	private Control control;
-
-	public Control createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NULL);
-		container.setLayout(new GridLayout());
-
-		Composite top = new Composite(container, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		layout.numColumns = 2;
-		top.setLayout(layout);
-		top.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		
-		Label label = new Label(top, SWT.NULL);
-		label.setText(PDEUIMessages.RestrictionDialog_newChoice);
-		GridData gd = new GridData();
-		gd.horizontalSpan = 2;
-		label.setLayoutData(gd);
-		
-		text = new Text(top, SWT.SINGLE | SWT.BORDER);
-		text.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		addButton = new Button(top, SWT.PUSH);
-		addButton.setText(PDEUIMessages.RestrictionDialog_add);
-		addButton.setEnabled(false);
-		addButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleAdd();
-			}
-		});
-		addButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-		SWTUtil.setButtonDimensionHint(addButton);
-		
-
-		Composite bottom = new Composite(container, SWT.NULL);
-		bottom.setLayoutData(new GridData(GridData.FILL_BOTH));
-		layout = new GridLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		layout.numColumns = 2;
-		bottom.setLayout(layout);
-
-		label = new Label(bottom, SWT.NULL);
-		gd = new GridData();
-		gd.horizontalSpan = 2;
-		label.setLayoutData(gd);
-		label.setText(PDEUIMessages.RestrictionDialog_choices);
-		
-		choiceList = new List(bottom, SWT.MULTI | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
-		choiceList.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		deleteButton = new Button(bottom, SWT.PUSH);
-		deleteButton.setText(PDEUIMessages.RestrictionDialog_remove);
-		deleteButton.setEnabled(false);
-		deleteButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleDelete();
-			}
-		});
-		deleteButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-		SWTUtil.setButtonDimensionHint(deleteButton);
-
-		text.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				String item = text.getText();
-				boolean canAdd = true;
-				if (item.length() == 0 || choiceList.indexOf(item) != -1)
-					canAdd = false;
-				addButton.setEnabled(canAdd);
-			}
-		});
-		text.addListener(SWT.Traverse, new Listener() {
-			public void handleEvent(Event e) {
-				handleAdd();
-				e.doit = false;
-			}
-		});
-
-		choiceList.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				deleteButton.setEnabled(choiceList.getSelectionCount() > 0);
-				if (choiceList.getSelectionCount() == 1) {
-					text.setText(choiceList.getSelection()[0]);
-				}
-			}
-		});
-		this.control = container;
-		return container;
-	}
-	public Class getCompatibleRestrictionClass() {
-		return ChoiceRestriction.class;
-	}
-	public org.eclipse.swt.widgets.Control getControl() {
-		return control;
-	}
-	public ISchemaRestriction getRestriction() {
-		ChoiceRestriction restriction = new ChoiceRestriction((ISchema) null);
-		String[] items = choiceList.getItems();
-		if (items.length > 0) {
-			Vector enums = new Vector();
-			for (int i = 0; i < items.length; i++) {
-				enums.addElement(new SchemaEnumeration(restriction, items[i]));
-			}
-			restriction.setChildren(enums);
-		}
-		return restriction;
-	}
-	private void handleAdd() {
-		String item = text.getText().trim();
-		if (item.length()==0) return;
-		choiceList.add(item);
-		choiceList.setSelection(new String[] { item });
-		text.setText(""); //$NON-NLS-1$
-		deleteButton.setEnabled(true);
-	}
-
-	private void handleDelete() {
-		String[] selection = choiceList.getSelection();
-		choiceList.setRedraw(false);
-		for (int i = 0; i < selection.length; i++) {
-			choiceList.remove(selection[i]);
-		}
-		choiceList.setRedraw(true);
-		deleteButton.setEnabled(false);
-	}
-	
-	public void initialize(ISchemaRestriction restriction) {
-		if (restriction != null) {
-			Object[] children = restriction.getChildren();
-			for (int i = 0; i < children.length; i++) {
-				Object child = children[i];
-				if (child instanceof ISchemaEnumeration) {
-					choiceList.add(child.toString());
-				}
-			}
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/GrammarPropertySource.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/GrammarPropertySource.java
deleted file mode 100644
index 26efdfa..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/GrammarPropertySource.java
+++ /dev/null

@@ -1,137 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-
-import org.eclipse.pde.internal.core.schema.*;
-import org.eclipse.ui.views.properties.*;
-import java.util.*;
-import org.eclipse.pde.internal.core.ischema.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.internal.ui.*;
-
-public class GrammarPropertySource extends SchemaObjectPropertySource {
-	public static final String P_MIN_OCCURS = "minOccurs"; //$NON-NLS-1$
-	public static final String P_MAX_OCCURS = "maxOccurs"; //$NON-NLS-1$
-	protected Vector descriptors;
-
-	class MinValidator implements ICellEditorValidator {
-		public String isValid(Object value) {
-			String svalue = value.toString();
-			try {
-				int ivalue = Integer.parseInt(svalue);
-				return isMinOccursValid(ivalue);
-			} catch (NumberFormatException e) {
-				return PDEUIMessages.GrammarPropertySource_minOccursFormat; 
-			}
-		}
-	}
-	class MaxValidator implements ICellEditorValidator {
-		public String isValid(Object value) {
-			String svalue = value.toString();
-			if (svalue.equals("unbounded")) //$NON-NLS-1$
-				return isMaxOccursValid(Integer.MAX_VALUE);
-			try {
-				int ivalue = Integer.parseInt(svalue);
-				return isMaxOccursValid(ivalue);
-			} catch (NumberFormatException e) {
-				return PDEUIMessages.GrammarPropertySource_maxOccursFormat; 
-			}
-		}
-	}
-	
-	protected String isMinOccursValid(int ivalue) {
-		if (ivalue < 0)
-			return PDEUIMessages.GrammarPropertySource_minOccursValue; 
-		return null;
-	}
-	
-	protected String isMaxOccursValid(int ivalue) {
-		if (ivalue < 0)
-			return PDEUIMessages.GrammarPropertySource_maxOccursValue; 
-		return null;
-	}
-
-	public GrammarPropertySource(ISchemaRepeatable obj) {
-		super(obj);
-	}
-	public Object getEditableValue() {
-		return null;
-	}
-	protected String getMaxOccurs(ISchemaRepeatable obj) {
-		if (obj.getMaxOccurs() == Integer.MAX_VALUE)
-			return "unbounded"; //$NON-NLS-1$
-		return Integer.toString(obj.getMaxOccurs());
-	}
-	protected String getMinOccurs(ISchemaRepeatable obj) {
-		return Integer.toString(obj.getMinOccurs());
-	}
-	public IPropertyDescriptor[] getPropertyDescriptors() {
-		if (descriptors == null) {
-			descriptors = getPropertyDescriptorsVector();
-		}
-		return toDescriptorArray(descriptors);
-	}
-	protected Vector getPropertyDescriptorsVector() {
-		Vector result = new Vector();
-		PropertyDescriptor desc =
-			createTextPropertyDescriptor(P_MIN_OCCURS, "minOccurs"); //$NON-NLS-1$
-		desc.setValidator(new MinValidator());
-		result.addElement(desc);
-		desc = createTextPropertyDescriptor(P_MAX_OCCURS, "maxOccurs"); //$NON-NLS-1$
-		desc.setValidator(new MaxValidator());
-		result.addElement(desc);
-		return result;
-	}
-	public Object getPropertyValue(Object name) {
-		ISchemaRepeatable obj = (ISchemaRepeatable) getSourceObject();
-		if (name.equals(P_MIN_OCCURS))
-			return getMinOccurs(obj);
-		if (name.equals(P_MAX_OCCURS))
-			return getMaxOccurs(obj);
-		return null;
-	}
-	public boolean isPropertySet(Object property) {
-		return false;
-	}
-	public int parseValue(Object value) {
-		String svalue = (String) value;
-		if (svalue.equals("unbounded")) //$NON-NLS-1$
-			return Integer.MAX_VALUE;
-		try {
-			return Integer.parseInt(svalue.toString());
-
-		} catch (NumberFormatException e) {
-			PDEPlugin.logException(e);
-		}
-		return 1;
-	}
-	public void resetPropertyValue(Object property) {
-	}
-	public void setPropertyValue(Object name, Object value) {
-		ISchemaRepeatable obj = (ISchemaRepeatable) getSourceObject();
-
-		if (name.equals(P_MIN_OCCURS)) {
-			int ivalue = parseValue(value);
-			if (obj instanceof RepeatableSchemaObject) {
-				((RepeatableSchemaObject) obj).setMinOccurs(ivalue);
-			} else if (obj instanceof SchemaElementReference) {
-				((SchemaElementReference) obj).setMinOccurs(ivalue);
-			}
-		} else if (name.equals(P_MAX_OCCURS)) {
-			int ivalue = parseValue(value);
-			if (obj instanceof RepeatableSchemaObject) {
-				((RepeatableSchemaObject) obj).setMaxOccurs(ivalue);
-			} else if (obj instanceof SchemaElementReference) {
-				((SchemaElementReference) obj).setMaxOccurs(ivalue);
-			}
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/GrammarSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/GrammarSection.java
deleted file mode 100644
index 64ffde9..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/GrammarSection.java
+++ /dev/null

@@ -1,375 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.ischema.*;
-import org.eclipse.pde.internal.core.schema.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.forms.*;
-import org.eclipse.ui.forms.FormColors;
-import org.eclipse.ui.forms.widgets.*;
-
-public class GrammarSection extends PDESection implements IPartSelectionListener {
-	private TreeViewer treeViewer;
-	private Text dtdLabel;
-	private PropertiesAction propertiesAction;
-	class GrammarContentProvider
-		extends DefaultContentProvider
-		implements ITreeContentProvider {
-		public Object[] getChildren(Object parent) {
-			Object[] children = null;
-			if (parent instanceof ISchemaElement
-				&& !(parent instanceof SchemaElementReference)) {
-				ISchemaType type = ((ISchemaElement) parent).getType();
-				if (type instanceof ISchemaComplexType) {
-					Object compositor =
-						((ISchemaComplexType) type).getCompositor();
-					if (compositor != null) {
-						children = new Object[1];
-						children[0] = compositor;
-					}
-				}
-			} else if (parent instanceof ISchemaCompositor) {
-				children = ((ISchemaCompositor) parent).getChildren();
-			}
-			if (children == null)
-				children = new Object[0];
-			return children;
-		}
-		public boolean hasChildren(Object parent) {
-			return getChildren(parent).length > 0;
-		}
-		public Object getParent(Object child) {
-			return null;
-		}
-		public Object[] getElements(Object parent) {
-			return getChildren(parent);
-		}
-	}
-	class GrammarLabelProvider extends LabelProvider {
-		public String getText(Object o) {
-			return PDEPlugin.getDefault().getLabelProvider().getText(o);
-		}
-		public Image getImage(Object o) {
-			if (o instanceof ISchemaObjectReference) {
-				ISchemaObjectReference ref = (ISchemaObjectReference) o;
-				int flags =
-					ref.getReferencedObject() == null
-						? PDELabelProvider.F_ERROR
-						: 0;
-				return PDEPlugin.getDefault().getLabelProvider().get(
-					PDEPluginImages.DESC_ELREF_SC_OBJ,
-					flags);
-			}
-			return PDEPlugin.getDefault().getLabelProvider().getImage(o);
-		}
-	}
-
-	public GrammarSection(PDEFormPage page, Composite parent) {
-		super(page, parent, Section.DESCRIPTION);
-		getSection().setText(PDEUIMessages.SchemaEditor_GrammarSection_title);
-		getSection().setDescription(PDEUIMessages.SchemaEditor_GrammarSection_desc);
-		createClient(getSection(), page.getManagedForm().getToolkit());
-	}
-	
-	public void createClient(
-		Section section,
-		FormToolkit toolkit) {
-		Composite container = toolkit.createComposite(section);
-		GridLayout layout = new GridLayout();
-		layout.marginWidth = layout.marginHeight = 2;
-		layout.verticalSpacing = toolkit.getBorderStyle()==SWT.BORDER?0:1;
-		container.setLayout(layout);
-		
-		SashForm sash = new SashForm(container, SWT.VERTICAL);
-		toolkit.adapt(sash, false, false);
-		GridData gd = new GridData(GridData.FILL_BOTH);		
-		sash.setLayoutData(gd);
-
-		Composite sashCell = sash;
-		if (toolkit.getBorderStyle()==SWT.NULL)
-			sashCell = createSashCell(sash, toolkit, 1);
-		createTree(sashCell, toolkit);
-		
-		sashCell = sash;
-		if (toolkit.getBorderStyle()==SWT.NULL)
-			sashCell = createSashCell(sash, toolkit, 2);
-		dtdLabel =
-			toolkit.createText(
-				sashCell,
-				"", //$NON-NLS-1$
-				SWT.WRAP | SWT.V_SCROLL | SWT.MULTI);
-		//dtdLabel.setData(
-			//FormToolkit.KEY_DRAW_BORDER,
-			//FormToolkit.TREE_BORDER);
-		dtdLabel.setEditable(false);
-		dtdLabel.setForeground(
-			toolkit.getColors().getColor(FormColors.TITLE));
-		//gd = new GridData(GridData.FILL_BOTH);
-		//dtdLabel.setLayoutData(gd);
-		updateDTDLabel(null);
-		
-		sash.setWeights(new int[] {3, 1});	
-
-		toolkit.paintBordersFor(container);
-		section.setClient(container);
-		propertiesAction = new PropertiesAction(getPage().getPDEEditor());		
-		initialize();
-	}
-
-	private Composite createSashCell(Composite parent, FormToolkit toolkit, int marginHeight) {
-		Composite cell = toolkit.createComposite(parent);
-		FillLayout layout = new FillLayout();
-		layout.marginHeight = marginHeight;
-		layout.marginWidth = 1;
-		cell.setLayout(layout);
-		toolkit.paintBordersFor(cell);
-		return cell;
-	}
-	
-	private Control createTree(Composite parent, FormToolkit toolkit) {
-		Tree tree = toolkit.createTree(parent, SWT.SINGLE);
-
-		treeViewer = new TreeViewer(tree);
-		treeViewer.setLabelProvider(new GrammarLabelProvider());
-		treeViewer.setContentProvider(new GrammarContentProvider());
-		treeViewer.setAutoExpandLevel(999);
-		treeViewer
-			.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent e) {
-				getPage().getPDEEditor().setSelection(e.getSelection());
-			}
-		});
-		MenuManager popupMenuManager = new MenuManager();
-		IMenuListener listener = new IMenuListener() {
-			public void menuAboutToShow(IMenuManager mng) {
-				fillContextMenu(mng);
-			}
-		};
-		popupMenuManager.setRemoveAllWhenShown(true);
-		popupMenuManager.addMenuListener(listener);
-		Menu menu = popupMenuManager.createContextMenu(tree);
-		tree.setMenu(menu);
-		treeViewer.addDoubleClickListener(new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent event) {
-				propertiesAction.run();
-			}
-		});
-		return tree;
-	}
-	public void dispose() {
-		ISchema schema = (ISchema) getPage().getModel();
-		if (schema!= null) schema.removeModelChangedListener(this);
-		super.dispose();
-	}
-	
-	public boolean doGlobalAction(String actionId) {
-		if (actionId.equals(ActionFactory.DELETE.getId())) {
-			ISelection sel = treeViewer.getSelection();
-			Object obj = ((IStructuredSelection) sel).getFirstElement();
-			if (obj != null)
-				handleDelete(obj);
-			return true;
-		}
-		return false;
-	}
-	protected void fillContextMenu(IMenuManager manager) {
-		ISelection selection = treeViewer.getSelection();
-		final Object object =
-			((IStructuredSelection) selection).getFirstElement();
-		ISchemaElement sourceElement = (ISchemaElement) treeViewer.getInput();
-
-		if (sourceElement != null) {
-			ISchema schema = sourceElement.getSchema();
-
-			MenuManager submenu =
-				new MenuManager(PDEUIMessages.Menus_new_label);
-			MenuManager cmenu =
-				new MenuManager(
-					PDEUIMessages.SchemaEditor_GrammarSection_compositor);
-
-			cmenu.add(
-				new NewCompositorAction(
-					sourceElement,
-					object,
-					ISchemaCompositor.ALL));
-			cmenu.add(
-				new NewCompositorAction(
-					sourceElement,
-					object,
-					ISchemaCompositor.CHOICE));
-			cmenu.add(
-				new NewCompositorAction(
-					sourceElement,
-					object,
-					ISchemaCompositor.SEQUENCE));
-			cmenu.add(
-				new NewCompositorAction(
-					sourceElement,
-					object,
-					ISchemaCompositor.GROUP));
-			submenu.add(cmenu);
-
-			if (schema.getResolvedElementCount() > 1
-				&& object != null
-				&& object instanceof SchemaCompositor) {
-				MenuManager refMenu =
-					new MenuManager(
-						PDEUIMessages.SchemaEditor_GrammarSection_reference);
-				ISchemaElement[] elements = schema.getResolvedElements();
-				for (int i = 0; i < elements.length; i++) {
-					ISchemaElement element = elements[i];
-					//if (element == sourceElement)
-					//continue;
-					refMenu.add(
-						new NewReferenceAction(sourceElement, object, element));
-				}
-				submenu.add(refMenu);
-			}
-			if (object == null || object instanceof SchemaCompositor) {
-				manager.add(submenu);
-			}
-
-			if (object != null) {
-				manager.add(new Separator());
-				Action deleteAction = new Action() {
-					public void run() {
-						handleDelete(object);
-					}
-				};
-				deleteAction.setText(PDEUIMessages.Actions_delete_label);
-				deleteAction.setEnabled(schema.isEditable());
-				manager.add(deleteAction);
-			}
-		}
-		getPage().getPDEEditor().getContributor().contextMenuAboutToShow(
-			manager);
-		manager.add(new Separator());
-		manager.add(propertiesAction);
-	}
-	private void handleDelete(Object object) {
-		if (object instanceof SchemaCompositor) {
-			SchemaCompositor compositor = (SchemaCompositor) object;
-			ISchemaObject parent = compositor.getParent();
-			if (parent instanceof ISchemaElement) {
-				// root
-				SchemaElement element = (SchemaElement) parent;
-				SchemaComplexType complexType =
-					(SchemaComplexType) element.getType();
-				if (complexType.getAttributeCount() == 0)
-					element.setType(
-						new SchemaSimpleType(element.getSchema(), "string")); //$NON-NLS-1$
-				else
-					complexType.setCompositor(null);
-			} else if (parent instanceof SchemaCompositor) {
-				((SchemaCompositor) parent).removeChild(compositor);
-			}
-		} else if (object instanceof SchemaElementReference) {
-			SchemaCompositor compositor =
-				(SchemaCompositor) ((SchemaElementReference) object)
-					.getCompositor();
-			compositor.removeChild((SchemaElementReference) object);
-		}
-	}
-	public void initialize() {
-		ISchema schema = (ISchema) getPage().getModel();
-		schema.addModelChangedListener(this);
-	}
-	public void modelChanged(IModelChangedEvent e) {
-		if (e.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			markStale();
-			return;
-		}
-		Object obj = e.getChangedObjects()[0];
-		if (obj instanceof ISchemaCompositor
-			|| obj instanceof ISchemaObjectReference) {
-			final ISchemaObject sobj = (ISchemaObject) obj;
-			ISchemaObject parent = sobj.getParent();
-			if (e.getChangeType() == IModelChangedEvent.CHANGE) {
-				treeViewer.update(sobj, null);
-			} else if (e.getChangeType() == IModelChangedEvent.INSERT) {
-				treeViewer.add(parent, sobj);
-				treeViewer.getTree().getDisplay().asyncExec(new Runnable() {
-					public void run() {
-						treeViewer.setSelection(
-							new StructuredSelection(sobj),
-							true);
-					}
-				});
-
-			} else if (e.getChangeType() == IModelChangedEvent.REMOVE) {
-				treeViewer.remove(sobj);
-				treeViewer.setSelection(new StructuredSelection(parent), true);
-			}
-		} else if (obj instanceof ISchemaComplexType) {
-			// first compositor added/removed
-			treeViewer.refresh();
-			if (e.getChangeType() == IModelChangedEvent.INSERT) {
-				ISchemaComplexType type = (ISchemaComplexType) obj;
-				final ISchemaCompositor compositor = type.getCompositor();
-				treeViewer.getTree().getDisplay().asyncExec(new Runnable() {
-					public void run() {
-						treeViewer.setSelection(
-							new StructuredSelection(compositor),
-							true);
-					}
-				});
-			}
-		} else if (obj instanceof ISchemaElement) {
-			if (e.getChangeType() == IModelChangedEvent.CHANGE
-				&& e.getChangedProperty() == SchemaElement.P_TYPE) {
-				treeViewer.refresh();
-			}
-		}
-
-		updateDTDLabel((ISchemaObject) treeViewer.getInput());
-	}
-	public void refresh() {
-		treeViewer.refresh();
-		super.refresh();
-	}
-	public void selectionChanged(IFormPart part, ISelection selection) {
-		if (!(part instanceof ElementSection))
-			return;
-		Object changeObject = ((IStructuredSelection)selection).getFirstElement();
-		if (changeObject instanceof ISchemaAttribute) {
-			changeObject = ((ISchemaAttribute) changeObject).getParent();
-		}
-		if (changeObject == treeViewer.getInput())
-			return;
-		ISchemaObject element = (ISchemaObject) changeObject;
-		updateDTDLabel(element);
-		treeViewer.setInput(changeObject);
-	}
-	private void updateDTDLabel(ISchemaObject object) {
-		String prefix = PDEUIMessages.SchemaEditor_GrammarSection_dtd + "\n"; //$NON-NLS-1$
-		String text = ""; //$NON-NLS-1$
-		if (object != null) {
-			ISchemaElement element = (ISchemaElement) object;
-			text = element.getDTDRepresentation(false);
-		}
-		dtdLabel.setText(prefix + text);
-	}
-	protected void handleDoubleClick(IStructuredSelection selection) {
-		propertiesAction.run();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ICloneablePropertySource.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ICloneablePropertySource.java
deleted file mode 100644
index 56d80f1..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ICloneablePropertySource.java
+++ /dev/null

@@ -1,16 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-
-public interface ICloneablePropertySource {
-	public Object doClone();
-	boolean isCloneable();
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/IRestrictionPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/IRestrictionPage.java
deleted file mode 100644
index e1e1735..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/IRestrictionPage.java
+++ /dev/null

@@ -1,22 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-
-import org.eclipse.pde.internal.core.ischema.*;
-import org.eclipse.swt.widgets.*;
-
-public interface IRestrictionPage {
-	public Control createControl(Composite parent);
-	public Class getCompatibleRestrictionClass();
-	public Control getControl();
-	public ISchemaRestriction getRestriction();
-	public void initialize(ISchemaRestriction restriction);
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/NewAttributeAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/NewAttributeAction.java
deleted file mode 100644
index cab9b18..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/NewAttributeAction.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-
-import java.util.*;
-
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.internal.core.schema.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.pde.internal.core.ischema.*;
-import org.eclipse.pde.internal.ui.*;
-
-public class NewAttributeAction extends Action {
-	private SchemaElement element;
-	private static final String NAME_COUNTER_KEY = "__schema_attribute_name"; //$NON-NLS-1$
-	public NewAttributeAction() {
-	setText(PDEUIMessages.SchemaEditor_NewAttribute_label);
-	setImageDescriptor(PDEPluginImages.DESC_ATT_IMPL_OBJ);
-	setToolTipText(PDEUIMessages.SchemaEditor_NewAttribute_tooltip);
-}
-public org.eclipse.pde.internal.core.schema.SchemaElement getElement() {
-	return element;
-}
-private String getInitialName() {
-	Hashtable counters = PDEPlugin.getDefault().getDefaultNameCounters();
-	Integer counter = (Integer)counters.get(NAME_COUNTER_KEY);
-	if (counter==null) {
-		counter = new Integer(1);
-	}
-	else {
-		counter = new Integer(counter.intValue()+1);
-	}
-	counters.put(NAME_COUNTER_KEY, counter);
-	return NLS.bind(PDEUIMessages.SchemaEditor_NewAttribute_initialName, counter.intValue()+""); //$NON-NLS-1$
-}
-public void run() {
-	String name = getInitialName();
-	SchemaAttribute att = new SchemaAttribute(element, name);
-	att.setType(new SchemaSimpleType(element.getSchema(), "string")); //$NON-NLS-1$
-	ISchemaType type = element.getType();
-	SchemaComplexType complexType=null;
-	if (!(type instanceof ISchemaComplexType)) {
-		complexType = new SchemaComplexType(element.getSchema());
-		element.setType(complexType);
-	}
-	else {
-		complexType = (SchemaComplexType)type;
-	}
-	complexType.addAttribute(att);
-}
-public void setElement(org.eclipse.pde.internal.core.schema.SchemaElement newElement) {
-	element = newElement;
-}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/NewCompositorAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/NewCompositorAction.java
deleted file mode 100644
index b70d4a0..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/NewCompositorAction.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.internal.core.schema.*;
-import org.eclipse.pde.internal.core.ischema.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.jface.resource.*;
-
-public class NewCompositorAction extends Action {
-	private ISchemaElement source;
-	private Object object;
-	private int kind;
-
-public NewCompositorAction(ISchemaElement source, Object object, int kind) {
-	this.source = source;
-	this.object = object;
-	this.kind = kind;
-	setText("&"+ISchemaCompositor.kindTable[kind]); //$NON-NLS-1$
-	setToolTipText(NLS.bind(PDEUIMessages.SchemaEditor_NewCompositor_tooltip, ISchemaCompositor.kindTable[kind]));
-	ImageDescriptor desc = null;
-
-	switch (kind) {
-		case ISchemaCompositor.ALL :
-			desc = PDEPluginImages.DESC_ALL_SC_OBJ;
-			break;
-		case ISchemaCompositor.GROUP :
-			desc = PDEPluginImages.DESC_GROUP_SC_OBJ;
-			break;
-		case ISchemaCompositor.SEQUENCE :
-			desc = PDEPluginImages.DESC_SEQ_SC_OBJ;
-			break;
-		case ISchemaCompositor.CHOICE :
-			desc = PDEPluginImages.DESC_CHOICE_SC_OBJ;
-			break;
-
-	}
-	setImageDescriptor(desc);
-	setEnabled(source.getSchema().isEditable());
-}
-public void run() {
-	SchemaCompositor compositor = new SchemaCompositor(source, kind);
-
-	if (object == null) {
-		// first time
-		SchemaComplexType type = null;
-		SchemaElement element = (SchemaElement) source;
-		if (element.getType() instanceof SchemaComplexType) {
-			type = (SchemaComplexType) element.getType();
-			type.setCompositor(compositor);
-		} else {
-			type = new SchemaComplexType(source.getSchema());
-			type.setCompositor(compositor);
-			((SchemaElement) source).setType(type);
-		}
-	} else
-		if (object instanceof SchemaCompositor) {
-			((SchemaCompositor) object).addChild(compositor);
-		} else
-			if (object instanceof SchemaElementReference) {
-				ISchemaCompositor comp = ((SchemaElementReference) object).getCompositor();
-				((SchemaCompositor) comp).addChild(compositor);
-			}
-}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/NewElementAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/NewElementAction.java
deleted file mode 100644
index 1fcdaa5..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/NewElementAction.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-
-import java.util.*;
-
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.internal.core.schema.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.pde.internal.ui.*;
-
-public class NewElementAction extends Action {
-	private Schema schema;
-	private static final String NAME_COUNTER_KEY = "__schema_element_name"; //$NON-NLS-1$
-	public NewElementAction() {
-		setText(PDEUIMessages.SchemaEditor_NewElement_label);
-		setImageDescriptor(PDEPluginImages.DESC_GEL_SC_OBJ);
-		setToolTipText(PDEUIMessages.SchemaEditor_NewElement_tooltip);
-	}
-	private String getInitialName() {
-		Hashtable counters = PDEPlugin.getDefault().getDefaultNameCounters();
-		Integer counter = (Integer) counters.get(NAME_COUNTER_KEY);
-		if (counter == null) {
-			counter = new Integer(1);
-		} else {
-			counter = new Integer(counter.intValue() + 1);
-		}
-		counters.put(NAME_COUNTER_KEY, counter);
-		return NLS.bind(PDEUIMessages.SchemaEditor_NewElement_initialName, counter.intValue() + ""); //$NON-NLS-1$
-	}
-	public org.eclipse.pde.internal.core.schema.Schema getSchema() {
-		return schema;
-	}
-	public void run() {
-		String name = getInitialName();
-		SchemaElement element = new SchemaElement(schema, name);
-		element.setType(new SchemaSimpleType(schema, "string")); //$NON-NLS-1$
-		schema.addElement(element);
-		schema.updateReferencesFor(element, Schema.REFRESH_ADD);
-	}
-	public void setSchema(Schema newSchema) {
-		schema = newSchema;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/NewReferenceAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/NewReferenceAction.java
deleted file mode 100644
index 2c791ee..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/NewReferenceAction.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-
-import org.eclipse.pde.internal.core.schema.*;
-import org.eclipse.pde.internal.core.ischema.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.jface.resource.*;
-
-public class NewReferenceAction extends Action {
-	private Object object;
-	private ISchemaElement referencedElement;
-
-public NewReferenceAction(
-	ISchemaElement source,
-	Object object,
-	ISchemaElement referencedElement) {
-	this.object = object;
-	this.referencedElement = referencedElement;
-	setText(referencedElement.getName());
-	ImageDescriptor desc = PDEPluginImages.DESC_ELREF_SC_OBJ;
-	setImageDescriptor(desc);
-	setEnabled(source.getSchema().isEditable());
-}
-public void run() {
-	if (object != null && object instanceof SchemaCompositor) {
-		SchemaCompositor parent = (SchemaCompositor) object;
-		SchemaElementReference reference =
-			new SchemaElementReference(parent, referencedElement.getName());
-		reference.setReferencedObject(referencedElement);
-		parent.addChild(reference);
-	}
-}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/NoRestrictionPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/NoRestrictionPage.java
deleted file mode 100644
index e191af3..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/NoRestrictionPage.java
+++ /dev/null

@@ -1,36 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-
-import org.eclipse.pde.internal.core.schema.*;
-import org.eclipse.pde.internal.core.ischema.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.*;
-
-public class NoRestrictionPage implements IRestrictionPage {
-	private Control control;
-
-public Control createControl(Composite parent) {
-	control = new Composite(parent, SWT.NULL);
-	return control;
-}
-public Class getCompatibleRestrictionClass() {
-	return null;
-}
-public org.eclipse.swt.widgets.Control getControl() {
-	return control;
-}
-public ISchemaRestriction getRestriction() {
-	return new ChoiceRestriction((ISchema)null);
-}
-public void initialize(ISchemaRestriction restriction) {
-}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ReferencePropertySource.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ReferencePropertySource.java
deleted file mode 100644
index f48e161..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/ReferencePropertySource.java
+++ /dev/null

@@ -1,51 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-
-import org.eclipse.pde.internal.core.ischema.*;
-import org.eclipse.pde.internal.core.schema.SchemaElementReference;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-
-public class ReferencePropertySource extends GrammarPropertySource {
-
-	public ReferencePropertySource(SchemaElementReference obj) {
-		super(obj);
-	}
-
-	protected String isMinOccursValid(int ivalue) {
-		String status = super.isMinOccursValid(ivalue);
-		if (status==null && isInAll()) {
-			if (ivalue!=0 && ivalue!=1) {
-				return PDEUIMessages.ReferencePropertySource_minOccurs_value; 
-			}
-		}
-		return status;
-	}
-
-	protected String isMaxOccursValid(int ivalue) {
-		String status = super.isMaxOccursValid(ivalue);
-		if (status==null && isInAll()) {
-			if (ivalue!=1) {
-				return PDEUIMessages.ReferencePropertySource_maxOccurs_value; 
-			}
-		}
-		return status;
-	}
-	
-	private boolean isInAll() {
-		ISchemaCompositor compositor = getReference().getCompositor();
-		return (compositor!=null && compositor.getKind()==ISchemaCompositor.ALL);
-	}
-	
-	protected SchemaElementReference getReference() {
-		return (SchemaElementReference)getSourceObject();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaAdapterFactory.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaAdapterFactory.java
deleted file mode 100644
index 8f26618..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaAdapterFactory.java
+++ /dev/null

@@ -1,61 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.pde.internal.core.schema.SchemaElementReference;
-import org.eclipse.pde.internal.core.ischema.*;
-import org.eclipse.ui.views.properties.IPropertySource;
-
-public class SchemaAdapterFactory implements IAdapterFactory {
-	private ElementPropertySource elementPropertySource;
-	private AttributePropertySource attributePropertySource;
-
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
-		if (adapterType.equals(IPropertySource.class))
-			return getProperties(adaptableObject);
-		return null;
-	}
-	public java.lang.Class[] getAdapterList() {
-		return new Class[] { IPropertySource.class };
-	}
-	protected AttributePropertySource getAttributeProperties(ISchemaAttribute att) {
-		if (attributePropertySource == null)
-			attributePropertySource = new AttributePropertySource(att);
-		else
-			attributePropertySource.setSourceObject(att);
-		return attributePropertySource;
-	}
-	protected ElementPropertySource getElementProperties(ISchemaElement element) {
-		if (elementPropertySource == null)
-			elementPropertySource = new ElementPropertySource(element);
-		else
-			elementPropertySource.setSourceObject(element);
-		return elementPropertySource;
-	}
-	private IPropertySource getProperties(Object object) {
-		if (object instanceof ISchemaElement
-			&& !(object instanceof ISchemaObjectReference))
-			return getElementProperties((ISchemaElement) object);
-		if (object instanceof ISchemaAttribute)
-			return getAttributeProperties((ISchemaAttribute) object);
-		if (object instanceof ISchemaRepeatable)
-			return getRepeatableProperties((ISchemaRepeatable) object);
-		return null;
-	}
-	protected GrammarPropertySource getRepeatableProperties(ISchemaRepeatable obj) {
-		if (obj instanceof ISchemaCompositor)
-			return new CompositorPropertySource((ISchemaCompositor) obj);
-		if (obj instanceof SchemaElementReference)
-			return new ReferencePropertySource((SchemaElementReference)obj);
-		return null;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaContentProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaContentProvider.java
deleted file mode 100644
index 000a7f6..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaContentProvider.java
+++ /dev/null

@@ -1,37 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-
-import org.eclipse.jface.viewers.*;
-
-public class SchemaContentProvider implements ITreeContentProvider {
-
-public SchemaContentProvider() {
-	super();
-}
-public void dispose() {}
-public Object[] getChildren(Object element) {
-	return new Object[0];
-}
-public Object[] getElements(Object element) {
-	return new Object[0];
-}
-public Object getParent(Object element) {
-	return null;
-}
-public boolean hasChildren(Object element) {
-	return false;
-}
-public void inputChanged(org.eclipse.jface.viewers.Viewer viewer, java.lang.Object oldInput, java.lang.Object newInput) {}
-public boolean isDeleted(java.lang.Object element) {
-	return false;
-}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaDocPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaDocPage.java
deleted file mode 100644
index 7b0833c..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaDocPage.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.text.ColorManager;
-import org.eclipse.pde.internal.ui.editor.text.IColorManager;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-
-public class SchemaDocPage extends PDEFormPage {
-	
-	public static final String PAGE_ID = "doc"; //$NON-NLS-1$
-	private IColorManager colorManager = ColorManager.getDefault();
-	private DocSection docSection;
-	public SchemaDocPage(PDEFormEditor editor) {
-		super(editor, PAGE_ID, PDEUIMessages.SchemaEditor_DocPage_title);
-	}
-	
-	/**
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormPage#becomesInvisible(IFormPage)
-	 */
-	public void setActive(boolean active) {
-		if (!active)
-			getManagedForm().commit(false);
-		super.setActive(active);
-	}
-	protected void createFormContent(IManagedForm managedForm) {
-		super.createFormContent(managedForm);
-		ScrolledForm form = managedForm.getForm();
-		GridLayout layout = new GridLayout();
-		layout.marginWidth = 10;
-		layout.horizontalSpacing=15;
-		//layout.setMarginWidth 
-		form.getBody().setLayout(layout);
-
-		GridData gd;
-
-		docSection = new DocSection(this, form.getBody(), colorManager);
-		gd = new GridData(GridData.FILL_BOTH);
-		docSection.getSection().setLayoutData(gd);
-
-		managedForm.addPart(docSection);
-		
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.SCHEMA_EDITOR_DOC);
-		form.setText(PDEUIMessages.SchemaEditor_DocForm_title);		
-	}
-	
-	public void dispose() {
-		colorManager.dispose();
-		super.dispose();
-	}
-
-	public void updateEditorInput(Object obj) {
-		docSection.updateEditorInput(obj);
-	}	
-
-	public boolean selectReveal(Object object) {
-		docSection.checkForPendingChanges();
-		return super.selectReveal(object);
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaDoubleClickStrategy.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaDoubleClickStrategy.java
deleted file mode 100644
index 51483ea..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaDoubleClickStrategy.java
+++ /dev/null

@@ -1,126 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-
-import org.eclipse.jface.text.*;
-
-
-public class SchemaDoubleClickStrategy implements ITextDoubleClickStrategy {
-	protected ITextViewer fText;
-	protected int fPos;
-	protected int fStartPos;
-	protected int fEndPos;
-	protected static char[] fgBrackets = { '(', ')', '"', '"' };
-   
-	public SchemaDoubleClickStrategy() {
-		super();
-	}
-public void doubleClicked(ITextViewer part) {
-	fPos = part.getSelectedRange().x;
-
-	if (fPos < 0)
-		return;
-
-	fText = part;
-
-	if (!selectComment())
-		selectWord();
-}
-protected boolean matchComment() {
-	IDocument doc = fText.getDocument();
-
-	try {
-		int pos = fPos;
-		char c = ' ';
-
-		while (pos >= 0) {
-			c = doc.getChar(pos);
-			if (Character.isWhitespace(c) || c == '\"')
-				break;
-			--pos;
-		}
-
-		if (c != '\"')
-			return false;
-
-		fStartPos = pos;
-
-		pos = fPos;
-		int length = doc.getLength();
-		c = ' ';
-
-		while (pos < length) {
-			c = doc.getChar(pos);
-			if (Character.isWhitespace(c) || c == '\"')
-				break;
-			++pos;
-		}
-		if (c != '\"')
-			return false;
-
-		fEndPos = pos;
-
-		return true;
-
-	} catch (BadLocationException x) {
-	}
-
-	return false;
-}
-	protected boolean matchWord() {
-
-		IDocument doc = fText.getDocument();
-
-		try {
-
-			int pos = fPos;
-			char c;
-
-			while (pos >= 0) {
-				c = doc.getChar(pos);
-				if (!Character.isJavaIdentifierPart(c))
-					break;
-				--pos;
-			}
-
-			fStartPos = pos;
-
-			pos = fPos;
-			int length = doc.getLength();
-
-			while (pos < length) {
-				c = doc.getChar(pos);
-				if (!Character.isJavaIdentifierPart(c))
-					break;
-				++pos;
-			}
-
-			fEndPos = pos;
-
-			return true;
-
-		} catch (BadLocationException x) {
-		}
-
-		return false;
-	}
-	protected boolean selectComment() {
-		if (matchComment()) {
-			fText.setSelectedRange(fStartPos + 1, fEndPos);
-			return true;
-		}
-		return false;
-	}
-	protected void selectWord() {
-		if (matchWord())
-			fText.setSelectedRange(fStartPos + 1, fEndPos);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaEditor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaEditor.java
deleted file mode 100644
index 5f4c2d4..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaEditor.java
+++ /dev/null

@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.internal.core.ischema.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.editor.context.*;
-import org.eclipse.pde.internal.ui.search.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.dnd.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.forms.editor.*;
-import org.eclipse.ui.part.*;
-
-public class SchemaEditor extends MultiSourceEditor {
-	private ShowDescriptionAction previewAction;
-	
-	protected void createResourceContexts(InputContextManager manager,
-			IFileEditorInput input) {
-		IFile file = input.getFile();
-		IFileEditorInput in = new FileEditorInput(file);
-		manager.putContext(in, new SchemaInputContext(this, in, true));
-		manager.monitorFile(file);		
-	}
-	
-	protected InputContextManager createInputContextManager() {
-		SchemaInputContextManager contextManager = new SchemaInputContextManager(this);
-		//contextManager.setUndoManager(new SchemaUndoManager(this));
-		return contextManager;
-	}
-	
-	public boolean canCopy(ISelection selection) {
-		return true;
-	}	
-	
-	protected boolean hasKnownTypes() {
-		try {
-			TransferData[] types = getClipboard().getAvailableTypes();
-			Transfer[] transfers =
-				new Transfer[] { TextTransfer.getInstance(), RTFTransfer.getInstance()};
-			for (int i = 0; i < types.length; i++) {
-				for (int j = 0; j < transfers.length; j++) {
-					if (transfers[j].isSupportedType(types[i]))
-						return true;
-				}
-			}
-		} catch (SWTError e) {
-		}
-		return false;
-	}
-
-	public void monitoredFileAdded(IFile file) {
-		/*
-		String name = file.getName();
-		if (name.equalsIgnoreCase("site.xml")) {
-			IEditorInput in = new FileEditorInput(file);
-			inputContextManager.putContext(in, new SiteInputContext(this, in, false));
-		}
-		*/
-	}
-
-	public boolean monitoredFileRemoved(IFile file) {
-		/*
-		//TODO may need to check with the user if there
-		//are unsaved changes in the model for the
-		//file that just got removed under us.
-		 * */
-		return true;
-	}
-
-	public void contextAdded(InputContext context) {
-		addSourcePage(context.getId());
-	}
-	public void contextRemoved(InputContext context) {
-		if (context.isPrimary()) {
-			close(true);
-			return;
-		}
-		IFormPage page = findPage(context.getId());
-		if (page!=null)
-			removePage(context.getId());
-	}
-
-	protected void createSystemFileContexts(InputContextManager manager,
-			SystemFileEditorInput input) {
-		manager.putContext(input, new SchemaInputContext(this, input,
-					true));
-	}
-
-	protected void createStorageContexts(InputContextManager manager,
-			IStorageEditorInput input) {
-		manager.putContext(input,
-							new SchemaInputContext(this, input, true));
-	}
-	
-	protected void contextMenuAboutToShow(IMenuManager manager) {
-		super.contextMenuAboutToShow(manager);
-	}
-	
-	void previewReferenceDocument() {
-		ISchema schema = (ISchema) getAggregateModel();
-		if (previewAction==null)
-			previewAction = new ShowDescriptionAction(schema);
-		else
-			previewAction.setSchema(schema);
-		previewAction.run();
-	}	
-
-	protected void addPages() {
-		try {
-			addPage(new SchemaFormPage(this));
-			addPage(new SchemaDocPage(this));
-		} catch (PartInitException e) {
-			PDEPlugin.logException(e);
-		}
-		addSourcePage(SchemaInputContext.CONTEXT_ID);
-	}
-
-
-	protected String computeInitialPageId() {
-		String firstPageId = super.computeInitialPageId();
-		if (firstPageId == null) {
-			InputContext primary = inputContextManager.getPrimaryContext();
-			if (primary.getId().equals(SchemaInputContext.CONTEXT_ID))
-				firstPageId = SchemaFormPage.PAGE_ID;
-			if (firstPageId == null)
-				firstPageId = SchemaFormPage.PAGE_ID;
-		}
-		return firstPageId;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.MultiSourceEditor#createXMLSourcePage(org.eclipse.pde.internal.ui.neweditor.PDEFormEditor, java.lang.String, java.lang.String)
-	 */
-	protected PDESourcePage createSourcePage(PDEFormEditor editor, String title, String name, String contextId) {
-		return new SchemaSourcePage(editor, title, name);
-	}
-	
-	protected ISortableContentOutlinePage createContentOutline() {
-		return new SchemaFormOutlinePage(this);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#getInputContext(java.lang.Object)
-	 */
-	protected InputContext getInputContext(Object object) {
-		InputContext context = null;
-		if (object instanceof ISchemaObject) {
-			context = inputContextManager.findContext(SchemaInputContext.CONTEXT_ID);
-		}		
-		return context;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaEditorContributor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaEditorContributor.java
deleted file mode 100644
index 50159ba..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaEditorContributor.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.action.Action;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.util.SWTUtil;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.dnd.Clipboard;
-
-public class SchemaEditorContributor extends PDEFormEditorContributor {
-	private PreviewAction previewAction;
-
-	class PreviewAction extends Action {
-		public PreviewAction() {
-		}
-		public void run() {
-			if (getEditor() != null) {
-				final SchemaEditor schemaEditor = (SchemaEditor) getEditor();
-				BusyIndicator
-					.showWhile(SWTUtil.getStandardDisplay(), new Runnable() {
-					public void run() {
-						schemaEditor.previewReferenceDocument();
-					}
-				});
-			}
-		}
-	}
-
-	public SchemaEditorContributor() {
-		super("&Schema"); //$NON-NLS-1$
-	}
-
-	protected boolean hasKnownTypes(Clipboard clipboard) {
-		return true;
-	}
-
-	public void contextMenuAboutToShow(IMenuManager mm, boolean addClipboard) {
-		super.contextMenuAboutToShow(mm, addClipboard);
-		mm.add(new Separator());
-		mm.add(previewAction);
-	}
-	
-	public Action getPreviewAction() {
-		return previewAction;
-	}
-
-	protected void makeActions() {
-		super.makeActions();
-		previewAction = new PreviewAction();
-		previewAction.setText(
-			PDEUIMessages.SchemaEditorContributor_previewAction); 
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaFormOutlinePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaFormOutlinePage.java
deleted file mode 100644
index d72e912..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaFormOutlinePage.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.ischema.*;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.swt.graphics.Image;
-
-
-public class SchemaFormOutlinePage extends FormOutlinePage {
-	private Object[] topics;
-	public Object[] getChildren(Object parent) {
-		ISchema schema = (ISchema) editor.getAggregateModel();
-		if (schema.isValid()) {
-			if (parent instanceof SchemaFormPage) {
-				return getMarkup();
-			}
-			if (parent instanceof ISchemaElement) {
-				return getAttributes((ISchemaElement) parent);
-			}
-			if (parent instanceof SchemaDocPage) {
-				return getTopics();
-			}
-		}
-		return super.getChildren(parent);
-	}
-	class OutlineLabelProvider extends BasicLabelProvider {
-		public String getText(Object obj) {
-			String label = getObjectLabel(obj);
-			if (label != null)
-				return label;
-			return super.getText(obj);
-		}
-		public Image getImage(Object obj) {
-			Image image = PDEPlugin.getDefault().getLabelProvider().getImage(
-					obj);
-			if (image != null)
-				return image;
-			return super.getImage(obj);
-		}
-	}
-	public SchemaFormOutlinePage(PDEFormEditor editor) {
-		super(editor);
-	}
-	protected Object[] createTopics() {
-		ISchema schema = (ISchema) editor.getAggregateModel();
-		IDocumentSection[] sections = schema.getDocumentSections();
-		Object[] result = new Object[sections.length + 1];
-		result[0] = schema;
-		for (int i = 1; i <= sections.length; i++) {
-			result[i] = sections[i - 1];
-		}
-		return result;
-	}
-	Object[] getAttributes(ISchemaElement element) {
-		ISchemaType type = element.getType();
-		if (type instanceof ISchemaComplexType) {
-			return ((ISchemaComplexType) type).getAttributes();
-		}
-		return new Object[0];
-	}
-	Object[] getMarkup() {
-		ISchema schema = (ISchema) editor.getAggregateModel();
-		return schema.getElements();
-	}
-	String getObjectLabel(Object obj) {
-		if (obj instanceof ISchema) {
-			return PDEUIMessages.SchemaEditor_topic_overview;
-		}
-		if (obj instanceof IDocumentSection) {
-			IDocumentSection section = (IDocumentSection) obj;
-			String sectionId = section.getSectionId();
-			if (sectionId.equals(IDocumentSection.EXAMPLES))
-				return PDEUIMessages.SchemaEditor_topic_examples;
-			if (sectionId.equals(IDocumentSection.SINCE))
-				return PDEUIMessages.SchemaEditor_topic_since;
-			if (sectionId.equals(IDocumentSection.IMPLEMENTATION))
-				return PDEUIMessages.SchemaEditor_topic_implementation;
-			if (sectionId.equals(IDocumentSection.API_INFO))
-				return PDEUIMessages.SchemaEditor_topic_api;
-			if (sectionId.equals(IDocumentSection.COPYRIGHT))
-				return PDEUIMessages.SchemaEditor_topic_copyright;
-		}
-		return null;
-	}
-	Object[] getTopics() {
-		if (topics == null) {
-			topics = createTopics();
-		}
-		return topics;
-	}
-	protected String getParentPageId(Object item) {
-		if (item instanceof ISchemaElement || item instanceof ISchemaAttribute)
-			return SchemaFormPage.PAGE_ID;
-		if (item instanceof IDocumentSection || item instanceof ISchema)
-			return SchemaDocPage.PAGE_ID;
-		return super.getParentPageId(item);
-	}
-	public void modelChanged(IModelChangedEvent event) {
-		if (event.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			topics = null;
-			treeViewer.refresh();
-			return;
-		}
-		Object object = event.getChangedObjects()[0];
-		if (event.getChangeType() == IModelChangedEvent.CHANGE) {
-			treeViewer.update(object, null);
-		} else {
-			// find the parent
-			Object parent = null;
-			if (object instanceof ISchemaObject) {
-				parent = ((ISchemaObject) object).getParent();
-			}
-			if (parent != null) {
-				if (parent instanceof ISchema) {
-					//parent =
-					// formPage.getEditor().getPage(SchemaEditor.DEFINITION_PAGE);
-				}
-				treeViewer.refresh(parent);
-				treeViewer.expandToLevel(parent, 2);
-			} else {
-				treeViewer.refresh();
-				treeViewer.expandAll();
-			}
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaFormPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaFormPage.java
deleted file mode 100644
index 5a303e8..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaFormPage.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.core.IModelChangedListener;
-import org.eclipse.pde.internal.core.ischema.ISchema;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.text.ColorManager;
-import org.eclipse.pde.internal.ui.editor.text.IColorManager;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-/**
- * 
- */
-public class SchemaFormPage extends PDEFormPage implements IModelChangedListener {
-	public static final String PAGE_ID = "form"; //$NON-NLS-1$
-	private SchemaSpecSection schemaSpecSection;
-	private ElementSection elementSection;
-	private DescriptionSection descriptionSection;
-	private GrammarSection grammarSection;
-	private SchemaPropertySheet propertySheetPage;
-	private IColorManager colorManager= ColorManager.getDefault();	
-
-	public SchemaFormPage(PDEFormEditor editor) {
-		super(editor, PAGE_ID, PDEUIMessages.SchemaEditor_FormPage_title);
-	}
-	protected void createFormContent(IManagedForm managedForm) {
-		super.createFormContent(managedForm);
-		ScrolledForm form = managedForm.getForm();
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		//layout.marginWidth = 10;
-		layout.horizontalSpacing=15;
-		form.getBody().setLayout(layout);
-
-		GridData gd;
-		
-		schemaSpecSection = new SchemaSpecSection(this, form.getBody());
-		gd = new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-		schemaSpecSection.getSection().setLayoutData(gd);
-
-		grammarSection = new GrammarSection(this, form.getBody());
-		gd = new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL);
-		gd.verticalSpan = 2;
-		grammarSection.getSection().setLayoutData(gd);
-		
-		elementSection = new ElementSection(this, form.getBody());
-		gd = new GridData(GridData.FILL_BOTH);
-		elementSection.getSection().setLayoutData(gd);
-
-		descriptionSection = new DescriptionSection(this, form.getBody(), colorManager);
-		gd = new GridData(GridData.FILL_HORIZONTAL
-		                            | GridData.VERTICAL_ALIGN_BEGINNING);
-		gd.horizontalSpan = 2;
-		gd.heightHint = 150;
-		descriptionSection.getSection().setLayoutData(gd);
-
-		managedForm.addPart(schemaSpecSection);
-		managedForm.addPart(elementSection);
-		managedForm.addPart(grammarSection);
-		managedForm.addPart(descriptionSection);
-		
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.SCHEMA_EDITOR_MAIN);
-		initialize();
-	}
-	public void initialize() {
-		ISchema schema = (ISchema)getModel();
-		getManagedForm().getForm().setText(schema.getName());
-		schema.addModelChangedListener(this);
-	}
-	public void dispose() {
-		ISchema schema = (ISchema) getModel();
-		colorManager.dispose();
-		if (schema!=null) schema.removeModelChangedListener(this);
-		super.dispose();
-	}
-
-	public IPropertySheetPage getPropertySheetPage() {
-		if (propertySheetPage==null)
-			propertySheetPage = new SchemaPropertySheet();
-		return propertySheetPage;
-	}
-	public void modelChanged(IModelChangedEvent event) {
-		if (event.getChangeType() == IModelChangedEvent.WORLD_CHANGED) {
-			ISchema schema = (ISchema) getModel();
-			getManagedForm().getForm().setText(schema.getName());
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaInputContext.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaInputContext.java
deleted file mode 100644
index 98826e2..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaInputContext.java
+++ /dev/null

@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-
-import java.io.*;
-import java.io.File;
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.internal.core.ischema.ISchema;
-import org.eclipse.pde.internal.core.schema.*;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.editor.SystemFileEditorInput;
-import org.eclipse.pde.internal.ui.editor.context.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.IEditorInput;
-
-/**
- *
- */
-public class SchemaInputContext extends XMLInputContext {
-	public static final String CONTEXT_ID="schema-context"; //$NON-NLS-1$
-	/**
-	 * @param editor
-	 * @param input
-	 * @param primary
-	 */
-	public SchemaInputContext(PDEFormEditor editor, IEditorInput input,
-			boolean primary) {
-		super(editor, input, primary);
-		create();
-	}	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.context.InputContext#getId()
-	 */
-	public String getId() {
-		return CONTEXT_ID;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.context.InputContext#createModel(org.eclipse.ui.IEditorInput)
-	 */
-	protected IBaseModel createModel(IEditorInput input) throws CoreException {
-		if (input instanceof SystemFileEditorInput)
-			return createExternalModel((SystemFileEditorInput)input);
-
-		if (!(input instanceof IFileEditorInput)) {
-			if (input instanceof IStorageEditorInput)
-				return createStorageModel((IStorageEditorInput)input);
-			return null;
-		}
-
-		IFile file = ((IFileEditorInput)input).getFile();
-		SchemaDescriptor sd = new SchemaDescriptor(file, true);
-		ISchema schema = sd.getSchema(false);
-		if (schema.isValid() == false)
-			return null;
-		if (schema instanceof EditableSchema) {
-			((EditableSchema) schema).setNotificationEnabled(true);
-		}
-		return schema;
-	}
-		
-	private IBaseModel createExternalModel(SystemFileEditorInput input) {
-		File file = (File)input.getAdapter(File.class);
-		SchemaDescriptor sd = new SchemaDescriptor(file); 
-
-		ISchema schema = sd.getSchema(false);
-		if (schema.isValid() == false)
-			return null;
-		if (schema instanceof EditableSchema) {
-			((EditableSchema) schema).setNotificationEnabled(true);
-		}
-		return schema;
-	}
-		
-	private IBaseModel createStorageModel(IStorageEditorInput input) {
-		try {
-			IStorage storage = input.getStorage();
-			StorageSchemaDescriptor sd = new StorageSchemaDescriptor(storage);
-			ISchema schema = sd.getSchema(false);
-			if (schema.isValid()==false)
-				return null;
-			return schema;
-		}
-		catch (CoreException e) {
-			PDEPlugin.logException(e);
-			return null;
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.context.InputContext#addTextEditOperation(java.util.ArrayList, org.eclipse.pde.core.IModelChangedEvent)
-	 */
-	protected void addTextEditOperation(ArrayList ops, IModelChangedEvent event) {
-	}
-	protected void flushModel(IDocument doc) {
-		// if model is dirty, flush its content into
-		// the document so that the source editor will
-		// pick up the changes.
-		if (!(getModel() instanceof IEditable))
-			return;
-		IEditable editableModel = (IEditable) getModel();
-		if (editableModel.isDirty() == false)
-			return;
-		try {
-			StringWriter swriter = new StringWriter();
-			PrintWriter writer = new PrintWriter(swriter);
-			editableModel.save(writer);
-			writer.flush();
-			swriter.close();
-			doc.set(swriter.toString());
-		} catch (IOException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-	
-	protected boolean synchronizeModel(IDocument doc) {
-		Schema schema = (Schema) getModel();
-		if (schema == null)
-			return false;
-		String text = doc.get();
-		try {
-			InputStream stream =
-				new ByteArrayInputStream(text.getBytes("UTF8")); //$NON-NLS-1$
-			schema.reload(stream);
-			if (schema instanceof IEditable)
-			   ((IEditable)schema).setDirty(false);
-			try {
-				stream.close();
-			} catch (IOException e) {
-			}
-		} catch (UnsupportedEncodingException e) {
-			PDEPlugin.logException(e);
-			return false;
-		}
-		return true;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.context.XMLInputContext#reorderInsertEdits(java.util.ArrayList)
-	 */
-	protected void reorderInsertEdits(ArrayList ops) {
-	}
-	protected String getPartitionName() {
-		return "___schema_partition"; //$NON-NLS-1$
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaInputContextManager.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaInputContextManager.java
deleted file mode 100644
index 50cf203..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaInputContextManager.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-
-import org.eclipse.pde.core.IBaseModel;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.pde.internal.ui.editor.context.*;
-
-public class SchemaInputContextManager extends InputContextManager {
-	/**
-	 * 
-	 */
-	public SchemaInputContextManager(PDEFormEditor editor) {
-		super(editor);
-	}
-
-	public IBaseModel getAggregateModel() {
-		return findSchema();
-	}
-
-	private IBaseModel findSchema() {
-		InputContext scontext = findContext(SchemaInputContext.CONTEXT_ID);
-		return (scontext != null) ? scontext.getModel() : null;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaObjectPropertySource.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaObjectPropertySource.java
deleted file mode 100644
index 02654aa..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaObjectPropertySource.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-
-import java.util.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.core.ischema.*;
-import org.eclipse.ui.views.properties.*;
-import org.eclipse.jface.viewers.*;
-
-public abstract class SchemaObjectPropertySource implements IPropertySource {
-    private Object sourceObject;
-    protected boolean isSchemaObject = false;
-    class ComboProvider extends LabelProvider {
-        private String property;
-        private String[] table;
-
-        public ComboProvider(String property, String[] table) {
-            this.property = property;
-            this.table = table;
-        }
-
-        public String getText(Object obj) {
-        	isSchemaObject = true;
-        	Integer index = (Integer) getPropertyValue(property);
-        	return table[index.intValue()];
-        }
-    }
-
-    public SchemaObjectPropertySource(Object object) {
-        this.sourceObject = object;
-    }
-
-    protected PropertyDescriptor createComboBoxPropertyDescriptor(String id, String name,
-            String[] choices) {
-        if (isEditable())
-            return new ComboBoxPropertyDescriptor(id, name, choices);
-        return new PropertyDescriptor(id, name);
-    }
-
-    protected PropertyDescriptor createTextPropertyDescriptor(String id, String name) {
-        if (isEditable())
-            return new ModifiedTextPropertyDescriptor(id, name);
-        return new PropertyDescriptor(id, name);
-    }
-
-    protected Object getNonzeroValue(Object value) {
-        if (value != null)
-            return value;
-        return ""; //$NON-NLS-1$
-    }
-
-    public java.lang.Object getSourceObject() {
-        return sourceObject;
-    }
-
-    public boolean isEditable() {
-        ISchemaObject schemaObject = (ISchemaObject) getSourceObject();
-        ISchema schema = schemaObject.getSchema();
-        return schema != null ? schema.isEditable() : false;
-    }
-
-    public void setSourceObject(java.lang.Object newSourceObject) {
-        sourceObject = newSourceObject;
-    }
-
-    protected IPropertyDescriptor[] toDescriptorArray(Vector result) {
-        IPropertyDescriptor[] array = new IPropertyDescriptor[result.size()];
-        result.copyInto(array);
-        return array;
-    }
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaPropertySheet.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaPropertySheet.java
deleted file mode 100644
index 746c8f4..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaPropertySheet.java
+++ /dev/null

@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.ui.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.ui.views.properties.*;
-import org.eclipse.pde.internal.ui.*;
-
-
-public class SchemaPropertySheet extends PropertySheetPage {
-	private Action cloneAction;
-	protected ISelection currentSelection;
-	private IWorkbenchPart part;
-	public SchemaPropertySheet() {
-		makeSchemaActions();
-	}
-	public void disableActions() {
-		cloneAction.setEnabled(false);
-	}
-	public void fillLocalToolBar(IToolBarManager toolBarManager) {
-		toolBarManager.add(new Separator());
-		toolBarManager.add(cloneAction);
-	}
-	public IPropertySheetEntry getSelectedEntry() {
-		if(!currentSelection.isEmpty() && currentSelection instanceof IStructuredSelection)
-			return (IPropertySheetEntry) ((IStructuredSelection)currentSelection).getFirstElement();
-		return null;
-	}
-	protected void handleClone() {
-		Object input = null;
-		if (currentSelection instanceof IStructuredSelection) {
-			input = ((IStructuredSelection) currentSelection).getFirstElement();
-		}
-		IPropertySource source = null;
-		if (input instanceof IAdaptable) {
-			source = (IPropertySource) ((IAdaptable) input)
-					.getAdapter(IPropertySource.class);
-		}
-		if (source instanceof ICloneablePropertySource) {
-			Object newInput = ((ICloneablePropertySource) source).doClone();
-			if (newInput != null) {
-				selectionChanged(part, new StructuredSelection(newInput));
-			}
-		}
-	}
-	public void makeContributions(IMenuManager menuManager,
-			IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
-		super.makeContributions(menuManager, toolBarManager, statusLineManager);
-		fillLocalToolBar(toolBarManager);
-	}
-	protected void makeSchemaActions() {
-		cloneAction = new Action(PDEUIMessages.SchemaPropertySheet_clone_label) {
-			public void run() {
-				handleClone();
-			}
-		};
-		cloneAction.setImageDescriptor(PDEPluginImages.DESC_CLONE_ATT);
-		cloneAction
-				.setDisabledImageDescriptor(PDEPluginImages.DESC_CLONE_ATT_DISABLED);
-		cloneAction.setToolTipText(PDEUIMessages.SchemaPropertySheet_clone_tooltip);
-		cloneAction.setEnabled(false);
-	}
-	public void selectionChanged(IWorkbenchPart part, ISelection sel) {
-		super.selectionChanged(part, sel);
-		this.part = part;
-		currentSelection = sel;
-		updateActions();
-	}
-	protected void updateActions() {
-		Object input = null;
-		if (currentSelection instanceof IStructuredSelection) {
-			input = ((IStructuredSelection) currentSelection).getFirstElement();
-		}
-		IPropertySource source = null;
-		if (input instanceof IAdaptable) {
-			source = (IPropertySource) ((IAdaptable) input)
-					.getAdapter(IPropertySource.class);
-		}
-		updateActions(source);
-	}
-	protected void updateActions(IPropertySource source) {
-		if (source instanceof ICloneablePropertySource) {
-			cloneAction.setEnabled(((ICloneablePropertySource) source)
-					.isCloneable());
-		} else
-			cloneAction.setEnabled(false);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaSourcePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaSourcePage.java
deleted file mode 100644
index 2d3dadf..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaSourcePage.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.ui.views.contentoutline.*;
-
-public class SchemaSourcePage extends XMLSourcePage {
-	public SchemaSourcePage(PDEFormEditor editor, String id, String title) {
-		super(editor, id, title);
-	}
-	public IContentOutlinePage createContentOutlinePage() {
-		return null;
-		/*
-		 * return new SchemaSourceOutlinePage( getEditorInput(),
-		 * getDocumentProvider(), this);
-		 */
-	}
-	protected void editorContextMenuAboutToShow(IMenuManager menu) {
-		super.editorContextMenuAboutToShow(menu);
-		menu.add(new Separator());
-		SchemaEditorContributor contributor = (SchemaEditorContributor) ((PDEFormEditor) getEditor())
-				.getContributor();
-		menu.add(contributor.getPreviewAction());
-	}
-	protected ILabelProvider createOutlineLabelProvider() {
-		return null;
-	}
-	protected ITreeContentProvider createOutlineContentProvider() {
-		return null;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESourcePage#createOutlineSorter()
-	 */
-	protected ViewerSorter createOutlineSorter() {
-		return null;
-	}
-	protected void outlineSelectionChanged(SelectionChangedEvent e) {
-	}
-	protected ISortableContentOutlinePage createOutlinePage() {
-		//TODO remove this method when the above three stubs
-		// are implemented
-		return null;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaSpecSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaSpecSection.java
deleted file mode 100644
index 4101324..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/SchemaSpecSection.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-import org.eclipse.pde.core.IEditable;
-import org.eclipse.pde.internal.core.ischema.ISchema;
-import org.eclipse.pde.internal.core.schema.Schema;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.parts.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.widgets.*;
-/**
- *
- */
-public class SchemaSpecSection extends PDESection {
-	private FormEntry pluginText;
-	private FormEntry pointText;
-	private FormEntry nameText;
-	public SchemaSpecSection(SchemaFormPage page, Composite parent) {
-		super(page, parent, Section.DESCRIPTION | Section.TWISTIE);
-		getSection().setText(PDEUIMessages.SchemaEditor_SpecSection_title);
-		getSection().setDescription(PDEUIMessages.SchemaEditor_SpecSection_desc);
-		createClient(getSection(), page.getManagedForm().getToolkit());
-	}
-	public void commit(boolean onSave) {
-		pluginText.commit();
-		pointText.commit();
-		nameText.commit();
-		super.commit(onSave);
-	}
-	
-	public void cancelEdit() {
-		pluginText.cancelEdit();
-		pointText.cancelEdit();
-		nameText.cancelEdit();
-		super.cancelEdit();
-	}
-	public void createClient(Section section, FormToolkit toolkit) {
-		Composite container = toolkit.createComposite(section);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.verticalSpacing = 9;
-		layout.horizontalSpacing = 6;
-		container.setLayout(layout);
-		final Schema schema = (Schema) getPage().getModel();
-		pluginText = new FormEntry(container, toolkit, PDEUIMessages.SchemaEditor_SpecSection_plugin, null, false);
-		pluginText.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry text) {
-				schema.setPluginId(text.getValue());
-			}
-		});
-		pointText = new FormEntry(container, toolkit, PDEUIMessages.SchemaEditor_SpecSection_point, null, false);
-		pointText.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry text) {
-				schema.setPointId(text.getValue());
-			}
-		});
-		nameText = new FormEntry(container, toolkit, PDEUIMessages.SchemaEditor_SpecSection_name, null, false);
-		nameText.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry text) {
-				schema.setName(text.getValue());
-				getPage().getManagedForm().getForm().setText(schema.getName());
-			}
-		});
-		GridData gd = (GridData) pointText.getText().getLayoutData();
-		gd.widthHint = 150;
-		toolkit.paintBordersFor(container);
-		section.setClient(container);
-		initialize();
-	}
-	public void dispose() {
-		ISchema schema = (ISchema) getPage().getModel();
-		if (schema!=null)
-			schema.removeModelChangedListener(this);
-		super.dispose();
-	}
-	public void initialize() {
-		ISchema schema = (ISchema) getPage().getModel();
-		refresh();
-		if (!(schema instanceof IEditable)) {
-			pluginText.getText().setEnabled(false);
-			pointText.getText().setEnabled(false);
-			nameText.getText().setEnabled(false);
-		}
-		schema.addModelChangedListener(this);
-	}
-
-	public void setFocus() {
-		if (pointText != null)
-			pointText.getText().setFocus();
-	}
-	private void setIfDefined(FormEntry formText, String value) {
-		if (value != null) {
-			formText.setValue(value, true);
-		}
-	}
-
-	public void refresh() {
-		ISchema schema = (ISchema)getPage().getModel();
-		setIfDefined(pluginText, schema.getPluginId());
-		setIfDefined(pointText, schema.getPointId());
-		setIfDefined(nameText, schema.getName());
-		getPage().getManagedForm().getForm().setText(schema.getName());
-		super.refresh();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/TypeRestrictionCellEditor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/TypeRestrictionCellEditor.java
deleted file mode 100644
index 76e670c..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/TypeRestrictionCellEditor.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-
-import org.eclipse.pde.internal.core.ischema.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.swt.*;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.util.SWTUtil;
-
-public class TypeRestrictionCellEditor extends DialogCellEditor {
-	private Label label;
-	protected TypeRestrictionCellEditor(Composite parent) {
-	super(parent);
-}
-protected Control createContents(Composite cell) {
-	label = new Label(cell, SWT.LEFT);
-	label.setFont(cell.getFont());
-	label.setBackground(cell.getBackground());
-	return label;
-}
-protected Object openDialogBox(Control cellEditorWindow) {
-	Object value = getValue();
-	TypeRestrictionDialog dialog =
-		new TypeRestrictionDialog(
-			cellEditorWindow.getShell(),
-			(ISchemaRestriction) value);
-	dialog.create();
-	SWTUtil.setDialogSize(dialog, 300, 350);
-	dialog.getShell().setText(PDEUIMessages.RestrictionDialog_wtitle);
-	int result = dialog.open();
-	if (result == TypeRestrictionDialog.OK) {
-		value = dialog.getValue();
-	}
-	return value;
-}
-protected void updateContents(Object value) {
-	if (value != null)
-		label.setText(value.toString());
-	else
-		label.setText(""); //$NON-NLS-1$
-}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/TypeRestrictionDescriptor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/TypeRestrictionDescriptor.java
deleted file mode 100644
index 1b160f3..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/TypeRestrictionDescriptor.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-
-import org.eclipse.jface.viewers.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.views.properties.*;
-
-public class TypeRestrictionDescriptor extends PropertyDescriptor {
-	private boolean readOnly=false;
-
-public TypeRestrictionDescriptor(String name, String displayName, boolean readOnly) {
-	super(name, displayName);
-	this.readOnly = readOnly;
-}
-public CellEditor createPropertyEditor(Composite parent) {
-	if (readOnly) return null;
-	return new TypeRestrictionCellEditor(parent);
-}
-public boolean isCompatibleWith(IPropertyDescriptor anotherProperty) {
-	if (getAlwaysIncompatible())
-		return false;
-	if (anotherProperty instanceof TypeRestrictionDescriptor) {
-		TypeRestrictionDescriptor spd = (TypeRestrictionDescriptor) anotherProperty;
-
-		// Compare Name
-		if (!spd.getId().equals(getId()))
-			return false;
-
-		// Compare DisplayName
-		if (!spd.getDisplayName().equals(getDisplayName()))
-			return false;
-
-		// Compare Category
-		if (getCategory() == null) {
-			if (spd.getCategory() != null)
-				return false;
-		} else {
-			if (!getCategory().equals(spd.getCategory()))
-				return false;
-		}
-
-		// Nothing was different.
-		return true;
-	}
-	return false;
-}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/TypeRestrictionDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/TypeRestrictionDialog.java
deleted file mode 100644
index 55c3cad..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/schema/TypeRestrictionDialog.java
+++ /dev/null

@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.schema;
-
-import java.util.Hashtable;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.pde.internal.core.ischema.ISchemaRestriction;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-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.Combo;
-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.ui.PlatformUI;
-import org.eclipse.ui.part.PageBook;
-
-public class TypeRestrictionDialog extends Dialog {
-	private static final String T_ENUMERATION = "enumeration"; //$NON-NLS-1$
-	private static final String T_NONE = "none"; //$NON-NLS-1$
-	
-	private String [] typeChoices = { T_NONE, T_ENUMERATION };
-	private Combo typeCombo;
-	private Hashtable pages = new Hashtable();
-	private ISchemaRestriction restriction;
-	private PageBook pageBook;
-
-public TypeRestrictionDialog(Shell shell, ISchemaRestriction restriction) {
-	super(shell);
-	if (restriction!=null && restriction.getChildren().length>0)
-		this.restriction = restriction;
-}
-protected void createButtonsForButtonBar(Composite parent) {
-	// create OK and Cancel buttons by default
-	createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-	createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
-}
-protected Control createDialogArea(Composite parent) {
-	Composite container = new Composite(parent, SWT.NULL);
-	GridLayout layout = new GridLayout();
-	layout.numColumns = 2;
-	container.setLayout(layout);
-	GridData gd = new GridData(GridData.FILL_BOTH);
-	container.setLayoutData(gd);
-
-	Label label = new Label(container, SWT.NULL);
-	label.setText(PDEUIMessages.RestrictionDialog_type);
-	gd = new GridData();
-	label.setLayoutData(gd);
-	typeCombo = new Combo(container, SWT.DROP_DOWN | SWT.READ_ONLY);
-	initializeTypeCombo();
-	typeCombo.addSelectionListener(new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			handleTypeSelection();
-		}
-	});
-	gd = new GridData(GridData.FILL_HORIZONTAL);
-	typeCombo.setLayoutData(gd);
-
-	gd = new GridData(GridData.FILL_HORIZONTAL);
-	gd.horizontalSpan = 2;
-	label = new Label(container, SWT.SEPARATOR | SWT.HORIZONTAL | SWT.SHADOW_OUT);
-	label.setLayoutData(gd);
-	
-	gd = new GridData(GridData.FILL_BOTH);
-	gd.horizontalSpan = 2;
-
-	pageBook = new PageBook(container, SWT.NULL);
-	pageBook.setLayoutData(gd);
-	initializePages();
-	PlatformUI.getWorkbench().getHelpSystem().setHelp(container, IHelpContextIds.SCHEMA_TYPE_RESTRICTION);
-	return container;
-}
-public Object getValue() {
-	return restriction;
-}
-private void handleTypeSelection() {
-	String selection = typeCombo.getItem(typeCombo.getSelectionIndex());
-	IRestrictionPage page = (IRestrictionPage)pages.get(selection);
-	pageBook.showPage(page.getControl());
-}
-protected void initializePages() {
-	IRestrictionPage page;
-	IRestrictionPage pageToShow = null;
-	String typeToShow = null;
-
-	page = new NoRestrictionPage();
-	page.createControl(pageBook);
-	pages.put(T_NONE, page);
-	if (restriction == null) {
-		pageToShow = page;
-		typeToShow = T_NONE;
-	}
-
-	page = new EnumerationRestrictionPage();
-	page.createControl(pageBook);
-	pages.put(T_ENUMERATION, page);
-	if (restriction != null
-		&& page.getCompatibleRestrictionClass().isInstance(restriction)) {
-		pageToShow = page;
-		typeToShow = T_ENUMERATION;
-	}
-	pageToShow.initialize(restriction);
-	typeCombo.setText(typeToShow);
-	pageBook.showPage(pageToShow.getControl());
-}
-protected void initializeTypeCombo() {
-	typeCombo.setItems(typeChoices);
-}
-protected void okPressed() {
-	String selectedRestriction = typeChoices[typeCombo.getSelectionIndex()];
-	IRestrictionPage page = (IRestrictionPage)pages.get(selectedRestriction);
-	restriction = page.getRestriction();
-	super.okPressed();
-}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/ArchivePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/ArchivePage.java
deleted file mode 100644
index e57346e..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/ArchivePage.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.site;
-
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.*;
-
-/**
- * 
- * Features page.
- */
-public class ArchivePage extends PDEFormPage {
-	public static final String PAGE_ID = "archives"; //$NON-NLS-1$
-	private DescriptionSection fDescSection;
-	private MirrorsSection fMirrorsSection;
-	private ArchiveSection fArchiveSection;
-	
-	public ArchivePage(PDEFormEditor editor) {
-		super(editor, PAGE_ID, PDEUIMessages.ArchivePage_name);  
-	}
-	protected void createFormContent(IManagedForm mform) {
-		ScrolledForm form = mform.getForm();
-		GridLayout layout = new GridLayout();
-		layout.verticalSpacing = 10;
-		form.getBody().setLayout(layout);
-		
-		fDescSection = new DescriptionSection(this, form.getBody());
-		fDescSection.getSection().setLayoutData(new GridData(GridData.FILL_BOTH));
-		
-		fArchiveSection = new ArchiveSection(this, form.getBody());
-		fArchiveSection.getSection().setLayoutData(new GridData(GridData.FILL_BOTH));
-		
-		fMirrorsSection = new MirrorsSection(this, form.getBody());
-		fMirrorsSection.getSection().setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		mform.addPart(fDescSection);
-		mform.addPart(fMirrorsSection);
-		mform.addPart(fArchiveSection);
-		
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.MANIFEST_SITE_ARCHIVES);
-		form.setText(PDEUIMessages.ArchivePage_title); 
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/ArchiveSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/ArchiveSection.java
deleted file mode 100644
index d77b7bd..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/ArchiveSection.java
+++ /dev/null

@@ -1,312 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Sep 29, 2003
- */
-package org.eclipse.pde.internal.ui.editor.site;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.CoreException;
-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.jface.viewers.ColumnWeightData;
-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.StructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.isite.ISite;
-import org.eclipse.pde.internal.core.isite.ISiteArchive;
-import org.eclipse.pde.internal.core.isite.ISiteModel;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditorContributor;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.PDESection;
-import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
-import org.eclipse.pde.internal.ui.util.SWTUtil;
-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.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.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-/**
- * 
- */
-public class ArchiveSection extends PDESection {
-	private Table fTable;
-	private TableViewer fViewer;
-	private ISiteModel fModel;
-	private Button fAddButton;
-	private Button fEditButton;
-	private Button fRemoveButton;
-
-	class FolderProvider extends WorkbenchContentProvider {
-		public boolean hasChildren(Object element) {
-			Object[] children = getChildren(element);
-			for (int i = 0; i < children.length; i++) {
-				if (children[i] instanceof IFolder) {
-					return true;
-				}
-			}
-			return false;
-		}
-	}
-	class ContentProvider extends DefaultContentProvider
-			implements
-				IStructuredContentProvider {
-		public Object[] getElements(Object parent) {
-			ISiteModel model = (ISiteModel) parent;
-			return model.getSite().getArchives();
-		}
-	}
-	class ArchiveLabelProvider extends LabelProvider
-			implements
-				ITableLabelProvider {
-		public String getColumnText(Object obj, int index) {
-			ISiteArchive archive = (ISiteArchive) obj;
-			switch (index) {
-				case 0 :
-					return archive.getPath();
-				case 1 :
-					return archive.getURL();
-			}
-			return ""; //$NON-NLS-1$
-		}
-		public Image getColumnImage(Object obj, int index) {
-			return null;
-		}
-	}
-	/**
-	 * @param formPage
-	 */
-	public ArchiveSection(PDEFormPage formPage, Composite parent) {
-		super(formPage, parent, Section.DESCRIPTION);
-		getSection()
-				.setText(
-						PDEUIMessages.SiteEditor_ArchiveSection_header); 
-		getSection().setDescription(
-				PDEUIMessages.SiteEditor_ArchiveSection_instruction); 
-		createClient(getSection(), formPage.getManagedForm().getToolkit());
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.update.ui.forms.internal.FormSection#createClient(org.eclipse.swt.widgets.Composite,
-	 *      org.eclipse.update.ui.forms.internal.FormWidgetFactory)
-	 */
-	public void createClient(Section section, FormToolkit toolkit) {
-		fModel = (ISiteModel) getPage().getModel();
-		fModel.addModelChangedListener(this);
-		Composite container = toolkit.createComposite(section);
-		GridLayout layout = new GridLayout();
-		layout.horizontalSpacing = 9;
-		layout.numColumns = 2;
-		container.setLayout(layout);
-
-		container.setLayoutData(new GridData(GridData.FILL_BOTH));
-		createTable(container, toolkit);
-		createTableViewer();
-		createButtons(container, toolkit);
-		toolkit.paintBordersFor(container);
-		section.setClient(container);
-		initialize();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#dispose()
-	 */
-	public void dispose() {
-		fModel.removeModelChangedListener(this);
-		super.dispose();
-	}
-	private void createButtons(Composite parent, FormToolkit toolkit) {
-		Composite container = toolkit.createComposite(parent);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = 10;
-		container.setLayout(layout);
-		container
-				.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-		fAddButton = toolkit.createButton(container, PDEUIMessages.SiteEditor_add, SWT.PUSH); 
-		fAddButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fAddButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				showDialog(null);
-			}
-		});
-		fAddButton.setEnabled(isEditable());
-		fEditButton = toolkit.createButton(container, PDEUIMessages.SiteEditor_edit, SWT.PUSH); 
-		fEditButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fEditButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				IStructuredSelection ssel = (IStructuredSelection) fViewer
-						.getSelection();
-				if (ssel != null && ssel.size() == 1)
-					showDialog((ISiteArchive) ssel.getFirstElement());
-			}
-		});
-		fRemoveButton = toolkit.createButton(container, PDEUIMessages.SiteEditor_remove, SWT.PUSH); 
-		fRemoveButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fRemoveButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleDelete();
-			}
-		});
-		fRemoveButton.setEnabled(false);
-		fEditButton.setEnabled(false);
-		toolkit.paintBordersFor(container);
-	}
-	private void createTable(Composite container, FormToolkit toolkit) {
-		fTable = toolkit.createTable(container, SWT.FULL_SELECTION);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.heightHint = 100;
-		fTable.setLayoutData(gd);
-		TableColumn col1 = new TableColumn(fTable, SWT.NULL);
-		col1.setText(PDEUIMessages.SiteEditor_ArchiveSection_col1); 
-		TableColumn col2 = new TableColumn(fTable, SWT.NULL);
-		col2.setText(PDEUIMessages.SiteEditor_ArchiveSection_col2); 
-		TableLayout tlayout = new TableLayout();
-		tlayout.addColumnData(new ColumnWeightData(50, 200));
-		tlayout.addColumnData(new ColumnWeightData(50, 200));
-		fTable.setLayout(tlayout);
-		fTable.setHeaderVisible(true);
-		createContextMenu(fTable);
-	}
-	private void createTableViewer() {
-		fViewer = new TableViewer(fTable);
-		fViewer.setContentProvider(new ContentProvider());
-		fViewer.setLabelProvider(new ArchiveLabelProvider());
-		fViewer.setInput(getPage().getModel());
-		fViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				handleSelectionChanged();
-			}
-		});
-	}
-	private void handleSelectionChanged() {
-		ISelection selection = fViewer.getSelection();
-		getManagedForm().fireSelectionChanged(this, selection);
-		getPage().getPDEEditor().setSelection(selection);
-		if (!isEditable()) {
-			return;
-		}
-		if (selection != null && selection instanceof IStructuredSelection) {
-			IStructuredSelection ssel = (IStructuredSelection) selection;
-			fRemoveButton.setEnabled(ssel.size() > 0);
-			fEditButton.setEnabled(ssel.size() == 1);
-		} else {
-			fRemoveButton.setEnabled(false);
-			fEditButton.setEnabled(false);
-		}
-	}
-	private void showDialog(final ISiteArchive archive) {
-		final ISiteModel model = (ISiteModel) getPage().getModel();
-		BusyIndicator.showWhile(fTable.getDisplay(), new Runnable() {
-			public void run() {
-				NewArchiveDialog dialog = new NewArchiveDialog(fTable
-						.getShell(), model, archive);
-				dialog.create();
-				SWTUtil.setDialogSize(dialog, 400, -1);
-				dialog.open();
-			}
-		});
-	}
-	private void handleDelete() {
-		try {
-			ISelection selection = fViewer.getSelection();
-			if (selection != null && selection instanceof IStructuredSelection) {
-				IStructuredSelection ssel = (IStructuredSelection) selection;
-				if (ssel.size() > 0) {
-					ISiteArchive[] array = (ISiteArchive[]) ssel.toList()
-							.toArray(new ISiteArchive[ssel.size()]);
-					ISite site = ((ISiteModel) getPage().getModel()).getSite();
-					site.removeArchives(array);
-				}
-			}
-		} catch (CoreException e) {
-		}
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.update.ui.forms.internal.FormSection#doGlobalAction(java.lang.String)
-	 */
-	public boolean doGlobalAction(String actionId) {
-		if (actionId.equals(ActionFactory.DELETE.getId())) {
-			BusyIndicator.showWhile(fTable.getDisplay(), new Runnable() {
-				public void run() {
-					handleDelete();
-				}
-			});
-			return true;
-		}
-		return false;
-	}
-	public void refresh() {
-		fViewer.refresh();
-		super.refresh();
-	}
-	public void initialize() {
-		refresh();
-	}
-	public void modelChanged(IModelChangedEvent e) {
-		markStale();
-	}
-	private void createContextMenu(Control control) {
-		MenuManager popupMenuManager = new MenuManager();
-		IMenuListener listener = new IMenuListener() {
-			public void menuAboutToShow(IMenuManager mng) {
-				Action removeAction = new Action(PDEUIMessages.SiteEditor_remove) { 
-					public void run() {
-						doGlobalAction(ActionFactory.DELETE.getId());
-					}
-				};
-				removeAction.setEnabled(isEditable());
-				mng.add(removeAction);
-				mng.add(new Separator());
-				PDEFormEditorContributor contributor = getPage().getPDEEditor()
-						.getContributor();
-				contributor.contextMenuAboutToShow(mng);
-			}
-		};
-		popupMenuManager.addMenuListener(listener);
-		popupMenuManager.setRemoveAllWhenShown(true);
-		control.setMenu(popupMenuManager.createContextMenu(control));
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#setFormInput(java.lang.Object)
-	 */
-	public boolean setFormInput(Object input) {
-		if (input instanceof ISiteArchive){
-			fViewer.setSelection(new StructuredSelection(input), true);
-			return true;
-		}
-		return super.setFormInput(input);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/CategoryDetailsSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/CategoryDetailsSection.java
deleted file mode 100644
index 716384a..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/CategoryDetailsSection.java
+++ /dev/null

@@ -1,310 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.site;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.isite.ISiteCategory;
-import org.eclipse.pde.internal.core.isite.ISiteCategoryDefinition;
-import org.eclipse.pde.internal.core.isite.ISiteDescription;
-import org.eclipse.pde.internal.core.isite.ISiteFeature;
-import org.eclipse.pde.internal.core.isite.ISiteModel;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.PDESection;
-import org.eclipse.pde.internal.ui.parts.FormEntry;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.RTFTransfer;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IFormPart;
-import org.eclipse.ui.forms.IPartSelectionListener;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-public class CategoryDetailsSection extends PDESection implements IFormPart,
-		IPartSelectionListener {
-
-	private static final String PROPERTY_DESC = "desc"; //$NON-NLS-1$
-
-	private static final String PROPERTY_NAME = "url"; //$NON-NLS-1$
-
-	private static final String PROPERTY_TYPE = "type"; //$NON-NLS-1$
-
-	private ISiteCategoryDefinition fCurrentCategoryDefinition;
-
-	private FormEntry fDescriptionText;
-
-	private FormEntry fLabelText;
-
-	private FormEntry fNameText;
-
-	public CategoryDetailsSection(PDEFormPage page, Composite parent) {
-		this(page, parent, PDEUIMessages.CategoryDetails_title,
-				PDEUIMessages.CategoryDetails_sectionDescription, SWT.NULL);
-		getSection().setLayoutData(new GridData(GridData.FILL_BOTH));
-
-	}
-
-	public CategoryDetailsSection(PDEFormPage page, Composite parent,
-			String title, String desc, int toggleStyle) {
-		super(page, parent, Section.DESCRIPTION | toggleStyle);
-		getSection().setText(title);
-		getSection().setDescription(desc);
-		createClient(getSection(), page.getManagedForm().getToolkit());
-	}
-
-	private boolean alreadyExists(String name) {
-		ISiteCategoryDefinition[] defs = fCurrentCategoryDefinition.getModel()
-				.getSite().getCategoryDefinitions();
-		for (int i = 0; i < defs.length; i++) {
-			ISiteCategoryDefinition def = defs[i];
-			if (def == fCurrentCategoryDefinition)
-				continue;
-			String dname = def.getName();
-			if (dname != null && dname.equals(name))
-				return true;
-		}
-		return false;
-	}
-
-	private void applyValue(String property, String value) throws CoreException {
-		if (fCurrentCategoryDefinition == null)
-			return;
-		if (property.equals(PROPERTY_NAME)){
-			String oldName = fCurrentCategoryDefinition.getName();
-			fCurrentCategoryDefinition.setName(value);
-			bringFeatures(oldName);
-		} else if (property.equals(PROPERTY_TYPE))
-			fCurrentCategoryDefinition.setLabel(value);
-		else if (property.equals(PROPERTY_DESC)) {
-			if (value == null || value.length() == 0) {
-				fCurrentCategoryDefinition.setDescription(null);
-			} else {
-				ISiteDescription siteDesc = fCurrentCategoryDefinition
-						.getDescription();
-				if (siteDesc == null) {
-					siteDesc = fCurrentCategoryDefinition.getModel()
-							.getFactory().createDescription(
-									fCurrentCategoryDefinition);
-					siteDesc.setText(value);
-					fCurrentCategoryDefinition.setDescription(siteDesc);
-				} else {
-					siteDesc.setText(value);
-				}
-			}
-		}
-	}
-
-	public void cancelEdit() {
-		fNameText.cancelEdit();
-		fLabelText.cancelEdit();
-		fDescriptionText.cancelEdit();
-		super.cancelEdit();
-	}
-
-	public boolean canPaste(Clipboard clipboard) {
-		TransferData[] types = clipboard.getAvailableTypes();
-		Transfer[] transfers = new Transfer[] { TextTransfer.getInstance(),
-				RTFTransfer.getInstance() };
-		for (int i = 0; i < types.length; i++) {
-			for (int j = 0; j < transfers.length; j++) {
-				if (transfers[j].isSupportedType(types[i]))
-					return true;
-			}
-		}
-		return false;
-	}
-
-	private void clearField(String property) {
-		if (property.equals(PROPERTY_NAME))
-			fNameText.setValue(null, true);
-		else if (property.equals(PROPERTY_TYPE))
-			fLabelText.setValue(null, true);
-		else if (property.equals(PROPERTY_DESC))
-			fDescriptionText.setValue(null, true);
-	}
-
-	private void clearFields() {
-		fNameText.setValue(null, true);
-		fLabelText.setValue(null, true);
-		fDescriptionText.setValue(null, true);
-	}
-
-	public void commit(boolean onSave) {
-		fNameText.commit();
-		fLabelText.commit();
-		fDescriptionText.commit();
-
-		super.commit(onSave);
-	}
-
-	public void createClient(Section section, FormToolkit toolkit) {
-		Composite container = toolkit.createComposite(section);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.verticalSpacing = 9;
-		layout.horizontalSpacing = 6;
-		container.setLayout(layout);
-		
-		fNameText = new FormEntry(container, toolkit, PDEUIMessages.CategoryDetails_name, null, false);
-		fNameText.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry text) {
-				try {
-					if (text.getValue().length() <= 0
-							|| alreadyExists(text.getValue())) {
-						setValue(PROPERTY_NAME);
-						String message = PDEUIMessages.CategoryDetails_alreadyExists; 
-						MessageDialog
-								.openError(
-										PDEPlugin.getActiveWorkbenchShell(),
-										PDEUIMessages.CategoryDetails_alreadyExists_title, 
-										message);
-					} else {
-						applyValue(PROPERTY_NAME, text.getValue());
-					}
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		});
-		limitTextWidth(fNameText);
-		fNameText.setEditable(isEditable());
-
-		fLabelText = new FormEntry(container, toolkit, PDEUIMessages.CategoryDetails_label, null, false);
-		fLabelText.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry text) {
-				try {
-					applyValue(PROPERTY_TYPE, text.getValue());
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		});
-		limitTextWidth(fLabelText);
-		fLabelText.setEditable(isEditable());
-
-		fDescriptionText = new FormEntry(container, toolkit, PDEUIMessages.CategoryDetails_desc, SWT.WRAP | SWT.MULTI);
-		fDescriptionText.getText().setLayoutData(
-				new GridData(GridData.FILL_BOTH));
-
-		fDescriptionText.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry text) {
-				try {
-					applyValue(PROPERTY_DESC, text.getValue());
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		});
-		limitTextWidth(fDescriptionText);
-		fDescriptionText.setEditable(isEditable());
-		toolkit.paintBordersFor(container);
-		section.setClient(container);
-
-		ISiteModel model = (ISiteModel) getPage().getModel();
-		if (model != null)
-			model.addModelChangedListener(this);
-	}
-
-	public void dispose() {
-		ISiteModel model = (ISiteModel) getPage().getModel();
-		if (model != null)
-			model.removeModelChangedListener(this);
-		super.dispose();
-	}
-
-	private void limitTextWidth(FormEntry entry) {
-		GridData gd = (GridData) entry.getText().getLayoutData();
-		gd.widthHint = 30;
-	}
-
-	public void modelChanged(IModelChangedEvent e) {
-		markStale();
-	}
-
-	private void bringFeatures(String oldCategory){
-		ISiteFeature[] siteFeatures = fCurrentCategoryDefinition.getModel()
-				.getSite().getFeatures();
-		for (int i = 0; i < siteFeatures.length; i++) {
-			ISiteCategory[] categories = siteFeatures[i].getCategories();
-			for (int c = 0; c < categories.length; c++) {
-				if (oldCategory.equals(categories[c].getName())) {
-					try {
-						categories[c].setName(fCurrentCategoryDefinition
-								.getName());
-					} catch (CoreException ce) {
-					}
-				}
-			}
-		}
-	}
-	public void refresh() {
-		if (fCurrentCategoryDefinition == null) {
-			clearFields();
-			super.refresh();
-			return;
-		}
-		setValue(PROPERTY_NAME);
-		setValue(PROPERTY_TYPE);
-		setValue(PROPERTY_DESC);
-		super.refresh();
-	}
-
-	public void selectionChanged(IFormPart part, ISelection selection) {
-		if (selection instanceof IStructuredSelection && !selection.isEmpty()) {
-			Object o = ((IStructuredSelection) selection).getFirstElement();
-			if (o instanceof ISiteCategoryDefinition) {
-				fCurrentCategoryDefinition = (ISiteCategoryDefinition) o;
-			} else {
-				fCurrentCategoryDefinition = null;
-			}
-		} else
-			fCurrentCategoryDefinition = null;
-		refresh();
-	}
-
-	public void setFocus() {
-		if (fNameText != null)
-			fNameText.getText().setFocus();
-	}
-
-	private void setValue(String property) {
-		if (fCurrentCategoryDefinition == null) {
-			clearField(property);
-		} else {
-			if (property.equals(PROPERTY_NAME))
-				fNameText.setValue(fCurrentCategoryDefinition.getName(), true);
-			else if (property.equals(PROPERTY_TYPE))
-				fLabelText.setValue(fCurrentCategoryDefinition.getLabel(), true);
-			else if (property.equals(PROPERTY_DESC)) {
-				ISiteDescription siteDesc = fCurrentCategoryDefinition
-						.getDescription();
-				if (siteDesc == null) {
-					clearField(property);
-				} else {
-					fDescriptionText.setValue(siteDesc.getText(), true);
-				}
-
-			}
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/CategorySection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/CategorySection.java
deleted file mode 100644
index b70dec3..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/CategorySection.java
+++ /dev/null

@@ -1,896 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.site;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashSet;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.ViewerDropAdapter;
-import org.eclipse.jface.window.Window;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.FeatureModelManager;
-import org.eclipse.pde.internal.core.IFeatureModelDelta;
-import org.eclipse.pde.internal.core.IFeatureModelListener;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.ifeature.IFeature;
-import org.eclipse.pde.internal.core.ifeature.IFeatureImport;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.core.isite.ISiteCategory;
-import org.eclipse.pde.internal.core.isite.ISiteCategoryDefinition;
-import org.eclipse.pde.internal.core.isite.ISiteFeature;
-import org.eclipse.pde.internal.core.isite.ISiteModel;
-import org.eclipse.pde.internal.core.site.*;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.build.BuildSiteJob;
-import org.eclipse.pde.internal.ui.editor.ModelDataTransfer;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.TreeSection;
-import org.eclipse.pde.internal.ui.editor.feature.FeatureEditor;
-import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
-import org.eclipse.pde.internal.ui.parts.TreePart;
-import org.eclipse.pde.internal.ui.wizards.FeatureSelectionDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.DragSourceEvent;
-import org.eclipse.swt.dnd.DragSourceListener;
-import org.eclipse.swt.dnd.DropTargetEvent;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.dnd.TransferData;
-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.Item;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-public class CategorySection extends TreeSection implements
-		IFeatureModelListener {
-	private static final int BUTTON_ADD_CATEGORY = 0;
-
-	private static final int BUTTON_ADD_FEATURE = 1;
-
-	private static final int BUTTON_IMPORT_ENVIRONMENT = 3;
-	
-	private static final int BUTTON_BUILD_FEATURE = 5;
-
-	private static final int BUTTON_BUILD_ALL = 6;
-	
-	private static int newCategoryCounter;
-
-	private ISiteModel fModel;
-
-	private TreePart fCategoryTreePart;
-
-	private TreeViewer fCategoryViewer;
-	
-	private LabelProvider fSiteLabelProvider;
-
-	class CategoryContentProvider extends DefaultContentProvider implements
-			ITreeContentProvider {
-		public Object[] getElements(Object inputElement) {
-			// model = (ISite) inputElement;
-			ArrayList result = new ArrayList();
-			ISiteCategoryDefinition[] catDefs = fModel.getSite()
-					.getCategoryDefinitions();
-			for (int i = 0; i < catDefs.length; i++) {
-				result.add(catDefs[i]);
-			}
-			ISiteFeature[] features = fModel.getSite().getFeatures();
-			for (int i = 0; i < features.length; i++) {
-				if (features[i].getCategories().length == 0)
-					result.add(new SiteFeatureAdapter(null, features[i]));
-			}
-			return result.toArray();
-		}
-
-		public Object[] getChildren(Object parent) {
-			if (parent instanceof ISiteCategoryDefinition) {
-				ISiteCategoryDefinition catDef = (ISiteCategoryDefinition) parent;
-				ISiteFeature[] features = fModel.getSite().getFeatures();
-				HashSet result = new HashSet();
-				for (int i = 0; i < features.length; i++) {
-					ISiteCategory[] cats = features[i].getCategories();
-					for (int j = 0; j < cats.length; j++) {
-						if (cats[j].getDefinition() != null
-								&& cats[j].getDefinition().equals(catDef)) {
-							result.add(new SiteFeatureAdapter(
-									cats[j].getName(), features[i]));
-						}
-					}
-				}
-				return result.toArray();
-			}
-			return new Object[0];
-		}
-
-		public Object getParent(Object element) {
-			return null;
-		}
-
-		public boolean hasChildren(Object element) {
-			if (element instanceof ISiteCategoryDefinition) {
-				ISiteCategoryDefinition catDef = (ISiteCategoryDefinition) element;
-				ISiteFeature[] features = fModel.getSite().getFeatures();
-				for (int i = 0; i < features.length; i++) {
-					ISiteCategory[] cats = features[i].getCategories();
-					for (int j = 0; j < cats.length; j++) {
-						if (cats[j].getDefinition() != null
-								&& cats[j].getDefinition().equals(catDef)) {
-							return true;
-						}
-					}
-				}
-			}
-			return false;
-		}
-	}
-
-	public CategorySection(PDEFormPage formPage, Composite parent) {
-		super(formPage, parent, Section.DESCRIPTION, new String[] {
-				PDEUIMessages.CategorySection_new, 
-				PDEUIMessages.CategorySection_add, 
-				null, PDEUIMessages.CategorySection_environment, 
-					null, PDEUIMessages.CategorySection_build, 
-				PDEUIMessages.CategorySection_buildAll }); 
-		getSection().setText(
-				PDEUIMessages.CategorySection_title); 
-		getSection().setDescription(
-				PDEUIMessages.CategorySection_desc); 
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.update.ui.forms.internal.FormSection#createClient(org.eclipse.swt.widgets.Composite,
-	 *      org.eclipse.update.ui.forms.internal.FormWidgetFactory)
-	 */
-	public void createClient(Section section, FormToolkit toolkit) {
-		fModel = (ISiteModel) getPage().getModel();
-		fModel.addModelChangedListener(this);
-
-		Composite container = createClientContainer(section, 2, toolkit);
-		createViewerPartControl(container, SWT.SINGLE, 2, toolkit);
-		fCategoryTreePart = getTreePart();
-		fCategoryViewer = fCategoryTreePart.getTreeViewer();
-		fCategoryViewer.setContentProvider(new CategoryContentProvider());
-		fSiteLabelProvider = new SiteLabelProvider();
-		fCategoryViewer.setLabelProvider(fSiteLabelProvider);
-
-		fCategoryViewer.setInput(fModel.getSite());
-		int ops = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_DEFAULT;
-		Transfer[] transfers = new Transfer[] { ModelDataTransfer.getInstance() };
-		if (isEditable()) {
-			fCategoryViewer.addDropSupport(ops, transfers,
-					new ViewerDropAdapter(fCategoryViewer) {
-						public void dragEnter(DropTargetEvent event) {
-							Object target = determineTarget(event);
-							if (target == null && event.detail == DND.DROP_COPY) {
-								event.detail = DND.DROP_MOVE;
-							}
-							super.dragEnter(event);
-						}
-
-						/*
-						 * (non-Javadoc)
-						 * 
-						 * @see org.eclipse.jface.viewers.ViewerDropAdapter#dragOperationChanged(org.eclipse.swt.dnd.DropTargetEvent)
-						 */
-						public void dragOperationChanged(DropTargetEvent event) {
-							Object target = determineTarget(event);
-							if (target == null && event.detail == DND.DROP_COPY) {
-								event.detail = DND.DROP_MOVE;
-							}
-							super.dragOperationChanged(event);
-						}
-
-						/*
-						 * (non-Javadoc)
-						 * 
-						 * @see org.eclipse.jface.viewers.ViewerDropAdapter#dragOver(org.eclipse.swt.dnd.DropTargetEvent)
-						 */
-						public void dragOver(DropTargetEvent event) {
-							Object target = determineTarget(event);
-							if (target == null && event.detail == DND.DROP_COPY) {
-								event.detail = DND.DROP_MOVE;
-							}
-							super.dragOver(event);
-						}
-
-						/**
-						 * Returns the position of the given event's coordinates
-						 * relative to its target. The position is determined to
-						 * be before, after, or on the item, based on some
-						 * threshold value.
-						 * 
-						 * @param event
-						 *            the event
-						 * @return one of the <code>LOCATION_* </code>
-						 *         constants defined in this class
-						 */
-						protected int determineLocation(DropTargetEvent event) {
-							if (!(event.item instanceof Item)) {
-								return LOCATION_NONE;
-							}
-							Item item = (Item) event.item;
-							Point coordinates = new Point(event.x, event.y);
-							coordinates = getViewer().getControl().toControl(
-									coordinates);
-							if (item != null) {
-								Rectangle bounds = getBounds(item);
-								if (bounds == null) {
-									return LOCATION_NONE;
-								}
-							}
-							return LOCATION_ON;
-						}
-
-						public boolean performDrop(Object data) {
-							if (!(data instanceof Object[]))
-								return false;
-							Object target = getCurrentTarget();
-
-							int op = getCurrentOperation();
-							Object[] objects = (Object[]) data;
-							if (objects.length > 0
-									&& objects[0] instanceof SiteFeatureAdapter) {
-								if (op == DND.DROP_COPY && target != null) {
-									copyFeature(
-											(SiteFeatureAdapter) objects[0],
-											target);
-								} else {
-									moveFeature(
-											(SiteFeatureAdapter) objects[0],
-											target);
-								}
-								return true;
-							}
-							return false;
-						}
-
-						public boolean validateDrop(Object target,
-								int operation, TransferData transferType) {
-							return (target instanceof ISiteCategoryDefinition || target == null);
-						}
-
-					});
-		}
-
-		fCategoryViewer.addDragSupport(DND.DROP_MOVE | DND.DROP_COPY,
-				transfers, new DragSourceListener() {
-					public void dragStart(DragSourceEvent event) {
-						IStructuredSelection ssel = (IStructuredSelection) fCategoryViewer
-								.getSelection();
-						if (ssel == null
-								|| ssel.isEmpty()
-								|| !(ssel.getFirstElement() instanceof SiteFeatureAdapter)) {
-							event.doit = false;
-						}
-					}
-
-					public void dragSetData(DragSourceEvent event) {
-						IStructuredSelection ssel = (IStructuredSelection) fCategoryViewer
-								.getSelection();
-						event.data = ssel.toArray();
-					}
-
-					public void dragFinished(DragSourceEvent event) {
-					}
-				});
-		
-		fCategoryTreePart.setButtonEnabled(BUTTON_ADD_CATEGORY, isEditable());
-		fCategoryTreePart.setButtonEnabled(BUTTON_ADD_FEATURE, isEditable());
-		fCategoryTreePart.setButtonEnabled(BUTTON_BUILD_FEATURE, isEditable());
-		fCategoryTreePart.setButtonEnabled(BUTTON_BUILD_ALL, isEditable());
-
-		// fCategoryViewer.expandAll();
-		toolkit.paintBordersFor(container);
-		section.setClient(container);
-		initialize();
-	}
-
-	private boolean categoryExists(String name) {
-		ISiteCategoryDefinition [] defs = fModel.getSite().getCategoryDefinitions();
-		for (int i=0; i<defs.length; i++) {
-			ISiteCategoryDefinition def = defs[i];
-			String dname = def.getName();
-			if (dname!=null && dname.equals(name))
-				return true;
-		}
-		return false;
-	}
-	
-	private void copyFeature(SiteFeatureAdapter adapter, Object target) {
-		ISiteFeature feature = findRealFeature(adapter);
-		if (feature == null) {
-			return;
-		}
-		/*
-		 * if (adapter.category == null) { moveFeature(adapter, target); } else
-		 */if (target != null && target instanceof ISiteCategoryDefinition) {
-			addCategory(feature, ((ISiteCategoryDefinition) target).getName());
-		}
-	}
-
-	private void addCategory(ISiteFeature aFeature, String catName) {
-		try {
-			if (aFeature == null)
-				return;
-			ISiteCategory[] cats = aFeature.getCategories();
-			for (int j = 0; j < cats.length; j++) {
-				if (cats[j].getName().equals(catName))
-					return;
-			}
-			ISiteCategory cat = fModel.getFactory().createCategory(aFeature);
-			cat.setName(catName);
-			expandCategory(catName);
-			aFeature.addCategories(new ISiteCategory[] { cat });
-		} catch (CoreException e) {
-		}
-	}
-
-	private void moveFeature(SiteFeatureAdapter adapter, Object target) {
-		ISiteFeature feature = findRealFeature(adapter);
-		if (feature == null) {
-			return;
-		}
-		if (adapter.category != null) {
-			removeCategory(feature, adapter.category);
-		}
-		if (target != null && target instanceof ISiteCategoryDefinition) {
-			addCategory(feature, ((ISiteCategoryDefinition) target).getName());
-		}
-	}
-
-	protected void buttonSelected(int index) {
-		switch (index) {
-		case BUTTON_ADD_CATEGORY:
-			handleAddCategoryDefinition();
-			break;
-		case BUTTON_ADD_FEATURE:
-			handleNewFeature();
-			break;
-		case BUTTON_BUILD_FEATURE:
-			handleBuild();
-			break;
-		case BUTTON_BUILD_ALL:
-			handleBuild(fModel.getSite().getFeatures());
-			break;
-		case BUTTON_IMPORT_ENVIRONMENT:
-			handleImportEnvironment();
-		}
-	}
-
-	protected void handleDoubleClick(IStructuredSelection ssel) {
-		Object selected = ssel.getFirstElement();
-		if (selected instanceof SiteFeatureAdapter) {
-			IFeature feature = findFeature(((SiteFeatureAdapter) selected).feature);
-			FeatureEditor.openFeatureEditor(feature);
-		}
-	}
-
-	protected void selectionChanged(IStructuredSelection selection) {
-		getPage().getPDEEditor().setSelection(selection);
-		updateButtons();
-	}
-
-	private void handleAddCategoryDefinition() {
-		String name = NLS.bind(PDEUIMessages.CategorySection_newCategoryName, Integer .toString(++newCategoryCounter));
-		while (categoryExists(name)) {
-			name = NLS.bind(PDEUIMessages.CategorySection_newCategoryName, Integer .toString(++newCategoryCounter));
-		}
-		String label = NLS.bind(PDEUIMessages.CategorySection_newCategoryLabel, Integer .toString(newCategoryCounter));
-		ISiteCategoryDefinition categoryDef = fModel.getFactory()
-				.createCategoryDefinition();
-		try {
-			categoryDef.setName(name);
-			categoryDef.setLabel(label);
-			fModel.getSite().addCategoryDefinitions(
-					new ISiteCategoryDefinition[] { categoryDef });
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-		fCategoryViewer.setSelection(new StructuredSelection(categoryDef), true);
-	}
-
-	private boolean handleRemove() {
-		IStructuredSelection ssel = (IStructuredSelection) fCategoryViewer
-				.getSelection();
-		Object object = ssel.getFirstElement();
-		if (object == null)
-			return true;
-		if (object instanceof ISiteCategoryDefinition) {
-			return handleRemoveCategoryDefinition((ISiteCategoryDefinition) object);
-		}
-		return handleRemoveSiteFeatureAdapter((SiteFeatureAdapter) object);
-	}
-
-	private boolean handleRemoveCategoryDefinition(
-			ISiteCategoryDefinition catDef) {
-		try {
-			Object[] children = ((CategoryContentProvider) fCategoryViewer
-					.getContentProvider()).getChildren(catDef);
-			for (int i = 0; i < children.length; i++) {
-				SiteFeatureAdapter adapter = (SiteFeatureAdapter) children[i];
-				ISiteCategory[] cats = adapter.feature.getCategories();
-				for (int j = 0; j < cats.length; j++) {
-					if (adapter.category.equals(cats[j].getName()))
-						adapter.feature
-								.removeCategories(new ISiteCategory[] { cats[j] });
-				}
-				if (adapter.feature.getCategories().length == 0) {
-					fModel.getSite().removeFeatures(
-							new ISiteFeature[] { adapter.feature });
-				}
-			}
-			fModel.getSite().removeCategoryDefinitions(
-					new ISiteCategoryDefinition[] { catDef });
-			return true;
-		} catch (CoreException e) {
-		}
-		return false;
-	}
-
-	private boolean handleRemoveSiteFeatureAdapter(SiteFeatureAdapter adapter) {
-		try {
-			ISiteFeature feature = adapter.feature;
-			if (adapter.category == null) {
-				fModel.getSite().removeFeatures(new ISiteFeature[] { feature });
-			} else {
-				removeCategory(feature, adapter.category);
-				if (feature.getCategories().length == 0)
-					fModel.getSite().removeFeatures(
-							new ISiteFeature[] { feature });
-			}
-			return true;
-		} catch (CoreException e) {
-		}
-		return false;
-	}
-
-	private void removeCategory(ISiteFeature aFeature, String catName) {
-		try {
-			if (aFeature == null)
-				return;
-			ISiteCategory[] cats = aFeature.getCategories();
-			for (int i = 0; i < cats.length; i++) {
-				if (catName.equals(cats[i].getName()))
-					aFeature.removeCategories(new ISiteCategory[] { cats[i] });
-			}
-		} catch (CoreException e) {
-		}
-	}
-
-	private ISiteFeature findRealFeature(SiteFeatureAdapter adapter) {
-		ISiteFeature featureCopy = adapter.feature;
-		ISiteFeature[] features = fModel.getSite().getFeatures();
-		for (int i = 0; i < features.length; i++) {
-			if (features[i].getId().equals(featureCopy.getId())
-					&& features[i].getVersion()
-							.equals(featureCopy.getVersion())) {
-				return features[i];
-			}
-		}
-		return null;
-	}
-
-	public void dispose() {
-		super.dispose();
-		FeatureModelManager mng = PDECore.getDefault().getFeatureModelManager();
-		mng.removeFeatureModelListener(this);
-		fModel.removeModelChangedListener(this);
-		if (fSiteLabelProvider != null)
-			fSiteLabelProvider.dispose();
-	}
-
-	protected void fillContextMenu(IMenuManager manager) {
-		Action removeAction = new Action(PDEUIMessages.CategorySection_remove) { 
-			public void run() {
-				doGlobalAction(ActionFactory.DELETE.getId());
-			}
-		};
-		removeAction.setEnabled(isEditable());
-		manager.add(removeAction);
-		getPage().getPDEEditor().getContributor().contextMenuAboutToShow(
-				manager);
-
-		ISelection selection = fCategoryViewer.getSelection();
-		if (!selection.isEmpty() && selection instanceof IStructuredSelection) {
-			Object o = ((IStructuredSelection) selection)
-					.getFirstElement();
-			if (o instanceof SiteFeatureAdapter) {
-				final SiteFeatureAdapter adapter = (SiteFeatureAdapter)o;
-				manager.add(new Separator());
-				
-				Action synchronizeAction = new SynchronizePropertiesAction(adapter.feature, fModel);
-				manager.add(synchronizeAction);
-				synchronizeAction.setEnabled(isEditable());
-
-				Action buildAction = new Action(PDEUIMessages.CategorySection_build) { 
-							public void run() {
-								handleBuild(new ISiteFeature[] { adapter.feature });
-							}
-						};
-				manager.add(buildAction);
-				buildAction.setEnabled(isEditable()&& findFeature(adapter.feature) != null );
-
-			}
-		}
-
-	}
-
-	public boolean doGlobalAction(String actionId) {
-		if (actionId.equals(ActionFactory.CUT.getId())) {
-			handleRemove();
-			return false;
-		}
-		if (actionId.equals(ActionFactory.PASTE.getId())) {
-			doPaste();
-			return true;
-		}
-		if (actionId.equals(ActionFactory.DELETE.getId())) {
-			return handleRemove();
-		}
-		return false;
-	}
-
-	public void refresh() {
-		fCategoryViewer.refresh();
-		updateButtons();
-		super.refresh();
-	}
-
-	private void updateButtons() {
-		if(!isEditable()){
-			return;
-		}
-		IStructuredSelection sel = (IStructuredSelection) fCategoryViewer
-				.getSelection();
-		fCategoryTreePart.setButtonEnabled(BUTTON_BUILD_FEATURE,
-				!sel.isEmpty()
-						&& sel.getFirstElement() instanceof SiteFeatureAdapter
-						&& findFeature(((SiteFeatureAdapter) sel
-								.getFirstElement()).feature) != null);
-		int featureCount = fModel.getSite().getFeatures().length;
-		fCategoryTreePart.setButtonEnabled(BUTTON_BUILD_ALL, featureCount > 0);
-		fCategoryTreePart.setButtonEnabled(BUTTON_IMPORT_ENVIRONMENT, featureCount > 0);
-	}
-
-	public void modelChanged(IModelChangedEvent e) {
-		markStale();
-	}
-
-	public void initialize() {
-		refresh();
-		FeatureModelManager mng = PDECore.getDefault().getFeatureModelManager();
-		mng.addFeatureModelListener(this);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#doPaste(java.lang.Object,
-	 *      java.lang.Object[])
-	 */
-	protected void doPaste(Object target, Object[] objects) {
-		try {
-			for (int i = 0; i < objects.length; i++) {
-				if (objects[i] instanceof SiteFeatureAdapter) {
-					copyFeature((SiteFeatureAdapter) objects[i], target);
-				} else if (objects[i] instanceof ISiteCategoryDefinition) {
-					fModel
-							.getSite()
-							.addCategoryDefinitions(
-									new ISiteCategoryDefinition[] { (ISiteCategoryDefinition) objects[i] });
-				}
-			}
-		} catch (CoreException e) {
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.editor.StructuredViewerSection#canPaste(java.lang.Object,
-	 *      java.lang.Object[])
-	 */
-	protected boolean canPaste(Object target, Object[] objects) {
-		if (target == null || target instanceof ISiteCategoryDefinition) {
-			for (int i = 0; i < objects.length; i++) {
-				if (objects[i] instanceof SiteFeatureAdapter)
-					return true;
-				if (objects[i] instanceof ISiteCategoryDefinition) {
-					String name = ((ISiteCategoryDefinition) objects[i])
-							.getName();
-					ISiteCategoryDefinition[] defs = fModel.getSite()
-							.getCategoryDefinitions();
-					for (int j = 0; j < defs.length; j++) {
-						ISiteCategoryDefinition def = defs[j];
-						String dname = def.getName();
-						if (dname != null && dname.equals(name))
-							return false;
-					}
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-	
-	private void handleBuild() {
-		IStructuredSelection sel = (IStructuredSelection) fCategoryViewer
-				.getSelection();
-		if (!sel.isEmpty()
-				&& sel.getFirstElement() instanceof SiteFeatureAdapter) {
-			ISiteFeature feature = ((SiteFeatureAdapter) sel.getFirstElement()).feature;
-			handleBuild(new ISiteFeature[] { feature });
-		}
-	}
-
-	private void handleBuild(ISiteFeature[] sFeatures) {
-		if (sFeatures.length == 0)
-			return;
-		IFeatureModel[] models = getFeatureModels(sFeatures);
-		if (models.length == 0)
-			return;
-		ensureContentSaved();
-		ISiteModel buildSiteModel = new WorkspaceSiteModel((IFile) fModel.getUnderlyingResource());
-		try {
-			buildSiteModel.load();
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-			return;
-		}
-
-		BuildSiteJob job = new BuildSiteJob(fCategoryViewer.getTree().getDisplay(), models, buildSiteModel);
-		job.setUser(true);
-		job.schedule();
-	}
-
-	/**
-	 * Finds a feature with the same id and version as a site feature. If
-	 * feature is not found, but feature with a M.m.m.qualifier exists it will
-	 * be returned.
-	 * 
-	 * @param siteFeature
-	 * @return IFeature or null
-	 */
-	public static IFeature findFeature(ISiteFeature siteFeature) {
-		IFeatureModel model = PDECore.getDefault().getFeatureModelManager()
-				.findFeatureModelRelaxed(siteFeature.getId(),
-						siteFeature.getVersion());
-		if (model != null)
-			return model.getFeature();
-		return null;
-	}
-
-	private IFeatureModel[] getFeatureModels(ISiteFeature[] sFeatures) {
-		ArrayList list = new ArrayList();
-		for (int i = 0; i < sFeatures.length; i++) {
-			IFeatureModel model = PDECore.getDefault().getFeatureModelManager()
-					.findFeatureModelRelaxed(sFeatures[i].getId(),
-							sFeatures[i].getVersion());
-			if (model != null)
-				list.add(model);
-		}
-		return (IFeatureModel[]) list.toArray(new IFeatureModel[list.size()]);
-	}
-
-	private void handleImportEnvironment() {
-		IStructuredSelection sel = (IStructuredSelection) fCategoryViewer
-				.getSelection();
-		ISiteFeature feature = null;
-		if (!sel.isEmpty()
-				&& sel.getFirstElement() instanceof SiteFeatureAdapter) {
-			feature = ((SiteFeatureAdapter) sel.getFirstElement()).feature;
-		}
-		final ISiteFeature selectedFeature = feature;
-		BusyIndicator.showWhile(fCategoryTreePart.getControl().getDisplay(),
-				new Runnable() {
-					public void run() {
-						new SynchronizePropertiesAction(selectedFeature,
-								getModel()).run();
-					}
-				});
-	}
-	
-	private void handleNewFeature() {
-		final Control control = fCategoryViewer.getControl();
-		BusyIndicator.showWhile(control.getDisplay(), new Runnable() {
-			public void run() {
-				IFeatureModel[] allModels = PDECore.getDefault()
-						.getFeatureModelManager().getModels();
-				ArrayList newModels = new ArrayList();
-				for (int i = 0; i < allModels.length; i++) {
-					if (canAdd(allModels[i]))
-						newModels.add(allModels[i]);
-				}
-				IFeatureModel[] candidateModels = (IFeatureModel[]) newModels
-						.toArray(new IFeatureModel[newModels.size()]);
-				FeatureSelectionDialog dialog = new FeatureSelectionDialog(
-						fCategoryViewer.getTree().getShell(), candidateModels,
-						true);
-				if (dialog.open() == Window.OK) {
-					Object[] models = dialog.getResult();
-					try {
-						doAdd(models);
-					} catch (CoreException e) {
-						PDECore.log(e);
-					}
-				}
-			}
-		});
-	}
-
-	private boolean canAdd(IFeatureModel candidate) {
-		ISiteFeature[] features = fModel.getSite().getFeatures();
-		IFeature cfeature = candidate.getFeature();
-
-		for (int i = 0; i < features.length; i++) {
-			ISiteFeature bfeature = features[i];
-			if (bfeature.getId().equals(cfeature.getId())
-					&& bfeature.getVersion().equals(cfeature.getVersion()))
-				return false;
-		}
-		return true;
-	}
-
-	public static ISiteFeature createSiteFeature(ISiteModel model,
-			IFeatureModel featureModel) throws CoreException {
-		IFeature feature = featureModel.getFeature();
-		ISiteFeature sfeature = model.getFactory().createFeature();
-		sfeature.setId(feature.getId());
-		sfeature.setVersion(feature.getVersion());
-		// sfeature.setURL(model.getBuildModel().getSiteBuild().getFeatureLocation()
-		// + "/" + feature.getId() + "_" + feature.getVersion() + ".jar");
-		// //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		sfeature
-				.setURL("features/" + feature.getId() + "_" + feature.getVersion() + ".jar"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		sfeature.setOS(feature.getOS());
-		sfeature.setWS(feature.getWS());
-		sfeature.setArch(feature.getArch());
-		sfeature.setNL(feature.getNL());
-		sfeature.setIsPatch(isFeaturePatch(feature));
-		return sfeature;
-	}
-
-	private static boolean isFeaturePatch(IFeature feature) {
-		IFeatureImport[] imports = feature.getImports();
-		for (int i = 0; i < imports.length; i++) {
-			if (imports[i].isPatch())
-				return true;
-		}
-		return false;
-	}
-
-	public ISiteModel getModel() {
-		return fModel;
-	}
-
-	/**
-	 * 
-	 * @param candidates
-	 *            Array of IFeatureModel
-	 * @param monitor
-	 * @throws CoreException
-	 */
-	public void doAdd(Object[] candidates)
-			throws CoreException {
-		// Category to add features to
-		String categoryName = null;
-		ISelection selection = fCategoryViewer.getSelection();
-		if (!selection.isEmpty() && selection instanceof IStructuredSelection) {
-			Object element = ((IStructuredSelection) selection)
-					.getFirstElement();
-			if (element instanceof ISiteCategoryDefinition) {
-				categoryName = ((ISiteCategoryDefinition) element).getName();
-			} else if (element instanceof SiteFeatureAdapter) {
-				categoryName = ((SiteFeatureAdapter) element).category;
-			}
-		}
-		//
-		ISiteFeature[] added = new ISiteFeature[candidates.length];
-		for (int i = 0; i < candidates.length; i++) {
-			IFeatureModel candidate = (IFeatureModel) candidates[i];
-			ISiteFeature child = createSiteFeature(fModel, candidate);
-			if (categoryName != null) {
-				addCategory(child, categoryName);
-			}
-			added[i] = child;
-		}
-
-		// Update model
-		fModel.getSite().addFeatures(added);
-		// Select last added feature
-		if (added.length > 0) {
-			if (categoryName != null) {
-				expandCategory(categoryName);
-			}
-			fCategoryViewer.setSelection(new StructuredSelection(
-					new SiteFeatureAdapter(categoryName, added[added.length-1])),
-					true);
-		}
-	}
-
-	private void ensureContentSaved() {
-		if (getPage().getEditor().isDirty()) {
-			try {
-				IRunnableWithProgress op = new IRunnableWithProgress() {
-					public void run(IProgressMonitor monitor) {
-						getPage().getEditor().doSave(monitor);
-					}
-				};
-				PlatformUI.getWorkbench().getProgressService().runInUI(
-						PDEPlugin.getActiveWorkbenchWindow(), op,
-						PDEPlugin.getWorkspace().getRoot());
-			} catch (InvocationTargetException e) {
-				PDEPlugin.logException(e);
-			} catch (InterruptedException e) {
-			}
-		}
-	}
-	void fireSelection() {
-		fCategoryViewer.setSelection(fCategoryViewer.getSelection());
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.forms.AbstractFormPart#setFormInput(java.lang.Object)
-	 */
-	public boolean setFormInput(Object input) {
-		if (input instanceof ISiteCategoryDefinition){
-			fCategoryViewer.setSelection(new StructuredSelection(input), true);
-			return true;
-		}
-		if (input instanceof SiteFeatureAdapter ) {
-			// first, expand the category, otherwise tree will not find the feature
-			String category = ((SiteFeatureAdapter)input).category;
-			if(category!=null){
-				expandCategory(category);
-			}
-			fCategoryViewer.setSelection(new StructuredSelection(input), true);
-			return true;
-		}
-		return super.setFormInput(input);
-	}
-	private void expandCategory(String category){
-		if(category!=null){
-			ISiteCategoryDefinition[] catDefs = fModel.getSite().getCategoryDefinitions();
-			for (int i = 0; i < catDefs.length; i++) {
-				if (category.equals(catDefs[i].getName())){
-					fCategoryViewer.expandToLevel(catDefs[i], 1);
-					break;
-				}
-			}
-		}
-		
-	}
-	public void modelsChanged(IFeatureModelDelta delta) {
-		markStale();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/DescriptionSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/DescriptionSection.java
deleted file mode 100644
index 6ab7d51..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/DescriptionSection.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.site;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.isite.*;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.pde.internal.ui.parts.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.widgets.*;
-
-/**
- * 
- */
-public class DescriptionSection extends PDESection {
-	private FormEntry fURLEntry;
-	private FormEntry fDescEntry;
-	public DescriptionSection(PDEFormPage page, Composite parent) {
-		super(page, parent, Section.DESCRIPTION);
-		getSection()
-				.setText(
-						PDEUIMessages.SiteEditor_DescriptionSection_header); 
-		getSection()
-				.setDescription(
-						PDEUIMessages.SiteEditor_DescriptionSection_desc); 
-		createClient(getSection(), page.getManagedForm().getToolkit());		
-	}
-	public void commit(boolean onSave) {
-		fURLEntry.commit();
-		fDescEntry.commit();
-		super.commit(onSave);
-	}
-	public void createClient(Section section, FormToolkit toolkit) {
-		Composite container = toolkit.createComposite(section);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.verticalSpacing = 10;
-		container.setLayout(layout);
-		fURLEntry = new FormEntry(container, toolkit, PDEUIMessages.SiteEditor_DescriptionSection_urlLabel, 
-				null, false);
-		fURLEntry.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry text) {
-				setDescriptionURL(text.getValue());
-			}
-		});
-		fURLEntry.setEditable(isEditable());
-
-		fDescEntry = new FormEntry(container, toolkit, PDEUIMessages.SiteEditor_DescriptionSection_descLabel, 
-				SWT.WRAP | SWT.MULTI);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.widthHint = 200;
-		gd.heightHint = 64;
-		fDescEntry.getText().setLayoutData(gd);
-		fDescEntry.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry text) {
-				setDescriptionText(text.getValue());
-			}
-		});
-		fDescEntry.setEditable(isEditable());
-
-		toolkit.paintBordersFor(container);
-		section.setClient(container);
-		initialize();
-	}
-	private void setDescriptionURL(String text) {
-		ISiteModel model = (ISiteModel) getPage().getModel();
-		ISite site = model.getSite();
-		ISiteDescription description = site.getDescription();
-		boolean defined = false;
-		if (description == null) {
-			description = model.getFactory().createDescription(null);
-			defined = true;
-		}
-		try {
-			description.setURL(text);
-			if (defined) {
-				site.setDescription(description);
-			}
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-	private void setDescriptionText(String text) {
-		ISiteModel model = (ISiteModel) getPage().getModel();
-		ISite site = model.getSite();
-		ISiteDescription description = site.getDescription();
-		boolean defined = false;
-		if (description == null) {
-			description = model.getFactory().createDescription(null);
-			defined = true;
-		}
-		try {
-			description.setText(text);
-			if (defined) {
-				site.setDescription(description);
-			}
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-	public void dispose() {
-		ISiteModel model = (ISiteModel) getPage().getModel();
-		if (model!=null)
-			model.removeModelChangedListener(this);
-		super.dispose();
-	}
-	public void initialize() {
-		ISiteModel model = (ISiteModel) getPage().getModel();
-		refresh();
-		model.addModelChangedListener(this);
-	}
-	public void modelChanged(IModelChangedEvent e) {
-		markStale();
-	}
-	public void setFocus() {
-		if (fURLEntry != null)
-			fURLEntry.getText().setFocus();
-	}
-	private void setIfDefined(FormEntry formText, String value) {
-		if (value != null) {
-			formText.setValue(value, true);
-		}
-	}
-	public void refresh() {
-		ISiteModel model = (ISiteModel) getPage().getModel();
-		ISite site = model.getSite();
-		setIfDefined(fURLEntry, site.getDescription() != null ? site
-				.getDescription().getURL() : null);
-		setIfDefined(fDescEntry, site.getDescription() != null ? site
-				.getDescription().getText() : null);
-		super.refresh();
-	}
-	public void cancelEdit() {
-		fURLEntry.cancelEdit();
-		fDescEntry.cancelEdit();
-		super.cancelEdit();
-	}
-	/**
-	 * @see org.eclipse.update.ui.forms.internal.FormSection#canPaste(Clipboard)
-	 */
-	public boolean canPaste(Clipboard clipboard) {
-		TransferData[] types = clipboard.getAvailableTypes();
-		Transfer[] transfers = new Transfer[]{TextTransfer.getInstance(),
-				RTFTransfer.getInstance()};
-		for (int i = 0; i < types.length; i++) {
-			for (int j = 0; j < transfers.length; j++) {
-				if (transfers[j].isSupportedType(types[i]))
-					return true;
-			}
-		}
-		return false;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/FeatureDetailsSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/FeatureDetailsSection.java
deleted file mode 100644
index ec5361c..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/FeatureDetailsSection.java
+++ /dev/null

@@ -1,234 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.site;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.isite.ISiteFeature;
-import org.eclipse.pde.internal.core.isite.ISiteModel;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.PDESection;
-import org.eclipse.pde.internal.ui.parts.FormEntry;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.RTFTransfer;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.dnd.TransferData;
-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.ui.forms.IFormPart;
-import org.eclipse.ui.forms.IPartSelectionListener;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-public class FeatureDetailsSection extends PDESection implements IFormPart,
-		IPartSelectionListener {
-
-	private static final String PROPERTY_TYPE = "type"; //$NON-NLS-1$
-
-	private static final String PROPERTY_URL = "url"; //$NON-NLS-1$
-
-	private ISiteFeature fCurrentSiteFeature;
-
-	private Button fPatchCheckBox;
-
-	private FormEntry fUrlText;
-
-	public FeatureDetailsSection(PDEFormPage page, Composite parent) {
-		this(page, parent, PDEUIMessages.FeatureDetailsSection_title,
-				PDEUIMessages.FeatureDetailsSection_desc, SWT.NULL);
-		getSection().setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-	}
-
-	public FeatureDetailsSection(PDEFormPage page, Composite parent,
-			String title, String desc, int toggleStyle) {
-		super(page, parent, Section.DESCRIPTION | toggleStyle);
-		getSection().setText(title);
-		getSection().setDescription(desc);
-		createClient(getSection(), page.getManagedForm().getToolkit());
-	}
-
-	private void applyIsPatch(boolean patch) throws CoreException {
-		if (fCurrentSiteFeature == null)
-			return;
-		fCurrentSiteFeature.setIsPatch(patch);
-	}
-
-	private void applyValue(String property, String value) throws CoreException {
-		if (fCurrentSiteFeature == null)
-			return;
-		if (property.equals(PROPERTY_URL))
-			fCurrentSiteFeature.setURL(value);
-		else if (property.equals(PROPERTY_TYPE))
-			fCurrentSiteFeature.setType(value);
-	}
-
-	public void cancelEdit() {
-		fUrlText.cancelEdit();
-		super.cancelEdit();
-	}
-
-	public boolean canPaste(Clipboard clipboard) {
-		TransferData[] types = clipboard.getAvailableTypes();
-		Transfer[] transfers = new Transfer[] { TextTransfer.getInstance(),
-				RTFTransfer.getInstance() };
-		for (int i = 0; i < types.length; i++) {
-			for (int j = 0; j < transfers.length; j++) {
-				if (transfers[j].isSupportedType(types[i]))
-					return true;
-			}
-		}
-		return false;
-	}
-
-	private void clearField(String property) {
-		if (property.equals(PROPERTY_URL))
-			fUrlText.setValue(null, true);
-	}
-
-	private void clearFields() {
-		fUrlText.setValue(null, true);
-		fPatchCheckBox.setSelection(false);
-	}
-
-	public void commit(boolean onSave) {
-		try {
-			applyIsPatch(fPatchCheckBox.getSelection());
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-
-		super.commit(onSave);
-	}
-
-	public void createClient(Section section, FormToolkit toolkit) {
-		Composite container = toolkit.createComposite(section);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.verticalSpacing = 9;
-		layout.horizontalSpacing = 6;
-		container.setLayout(layout);
-
-		fUrlText = new FormEntry(container, toolkit, PDEUIMessages.FeatureDetailsSection_url, null, false);
-		fUrlText.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry text) {
-				try {
-					if (text.getValue().length() <= 0) {
-						setValue(PROPERTY_URL);
-						MessageDialog
-								.openError(
-										PDEPlugin.getActiveWorkbenchShell(),
-										PDEUIMessages.FeatureDetailsSection_requiredURL_title, 
-												PDEUIMessages.FeatureDetailsSection_requiredURL);
-					} else {
-						applyValue(PROPERTY_URL, text.getValue());
-					}
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		});
-		limitTextWidth(fUrlText);
-		fUrlText.getText().setEnabled(false);
-		
-		createPatchButton(toolkit, container);
-
-		toolkit.paintBordersFor(container);
-		section.setClient(container);
-
-		ISiteModel model = (ISiteModel) getPage().getModel();
-		if (model != null)
-			model.addModelChangedListener(this);
-	}
-
-	private void createPatchButton(FormToolkit toolkit, Composite container) {
-		fPatchCheckBox = toolkit.createButton(container, PDEUIMessages.FeatureDetailsSection_patch, SWT.CHECK);
-		fPatchCheckBox.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				try {
-					applyIsPatch(fPatchCheckBox.getSelection());
-				} catch (CoreException ce) {
-					PDEPlugin.logException(ce);
-				}
-			}
-		});
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		fPatchCheckBox.setLayoutData(gd);
-		fPatchCheckBox.setEnabled(isEditable());
-	}
-
-	public void dispose() {
-		ISiteModel model = (ISiteModel) getPage().getModel();
-		if (model != null)
-			model.removeModelChangedListener(this);
-		super.dispose();
-	}
-
-	private void limitTextWidth(FormEntry entry) {
-		GridData gd = (GridData) entry.getText().getLayoutData();
-		gd.widthHint = 30;
-	}
-
-	public void modelChanged(IModelChangedEvent e) {
-		markStale();
-	}
-
-	public void refresh() {
-		if (fCurrentSiteFeature == null) {
-			clearFields();
-			super.refresh();
-			return;
-		}
-		setValue(PROPERTY_URL);
-		setValue(PROPERTY_TYPE);
-		fPatchCheckBox.setSelection(fCurrentSiteFeature.isPatch());
-		super.refresh();
-	}
-
-	public void selectionChanged(IFormPart part, ISelection selection) {
-		if (selection instanceof IStructuredSelection && !selection.isEmpty()) {
-			Object o = ((IStructuredSelection) selection).getFirstElement();
-			if (o instanceof SiteFeatureAdapter) {
-				fCurrentSiteFeature = ((SiteFeatureAdapter) o).feature;
-			} else {
-				fCurrentSiteFeature = null;
-			}
-		} else
-			fCurrentSiteFeature = null;
-		refresh();
-	}
-
-	public void setFocus() {
-		if (fUrlText != null)
-			fUrlText.getText().setFocus();
-	}
-
-	private void setValue(String property) {
-		if (fCurrentSiteFeature == null) {
-			clearField(property);
-		} else {
-			if (property.equals(PROPERTY_URL))
-				fUrlText.setValue(fCurrentSiteFeature.getURL(), true);
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/FeaturesPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/FeaturesPage.java
deleted file mode 100644
index fe7e3a9..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/FeaturesPage.java
+++ /dev/null

@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.site;
-import org.eclipse.pde.internal.core.isite.ISiteCategoryDefinition;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.PDEDetailsSections;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.PDEMasterDetailsBlock;
-import org.eclipse.pde.internal.ui.editor.PDESection;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.DetailsPart;
-import org.eclipse.ui.forms.IDetailsPage;
-import org.eclipse.ui.forms.IDetailsPageProvider;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-/**
- * 
- * Features page.
- */
-public class FeaturesPage extends PDEFormPage {
-	public static final String PAGE_ID = "features"; //$NON-NLS-1$
-	private CategorySection fCategorySection;
-	private SiteFeaturesBlock fBlock;
-	public class SiteFeaturesBlock extends PDEMasterDetailsBlock {
-		public SiteFeaturesBlock() {
-			super(FeaturesPage.this);
-		}
-		protected PDESection createMasterSection(IManagedForm managedForm,
-				Composite parent) {
-			fCategorySection = new CategorySection(getPage(), parent);
-			return fCategorySection;
-		}
-		protected void registerPages(DetailsPart detailsPart) {
-			detailsPart.setPageProvider(new IDetailsPageProvider() {
-				public Object getPageKey(Object object) {
-					if (object instanceof SiteFeatureAdapter)
-						return SiteFeatureAdapter.class;
-					if (object instanceof ISiteCategoryDefinition)
-						return ISiteCategoryDefinition.class;
-					return object.getClass();
-				}
-				public IDetailsPage getPage(Object key) {
-					if (key.equals(SiteFeatureAdapter.class))
-						return createFeatureDetails();
-					if (key.equals(ISiteCategoryDefinition.class))
-						return createCategoryDetails();
-					return null;
-				}
-			});
-		}
-	}
-	
-	public FeaturesPage(PDEFormEditor editor) {
-		super(editor, PAGE_ID, PDEUIMessages.FeaturesPage_title); 
-		fBlock = new SiteFeaturesBlock();
-	}
-	protected void createFormContent(IManagedForm managedForm) {
-		
-		super.createFormContent(managedForm);
-		ScrolledForm form = managedForm.getForm();
-		form.setText(PDEUIMessages.FeaturesPage_header); 
-		fBlock.createContent(managedForm);
-		fCategorySection.fireSelection();
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(form.getBody(), IHelpContextIds.MANIFEST_SITE_FEATURES);
-
-	}
-	/**
-	 * @return
-	 */
-	private IDetailsPage createFeatureDetails() {
-		return new PDEDetailsSections() {
-			protected PDESection[] createSections(
-					PDEFormPage page, Composite parent) {
-				return new PDESection[] {
-						new FeatureDetailsSection(getPage(),
-								parent),
-						new PortabilitySection(getPage(),
-								parent) };
-			}
-
-			public String getContextId() {
-				return SiteInputContext.CONTEXT_ID;
-			}
-		};
-	}
-	/**
-	 * @return
-	 */
-	private IDetailsPage createCategoryDetails() {
-		return new PDEDetailsSections() {
-			protected PDESection[] createSections(
-					PDEFormPage page, Composite parent) {
-				return new PDESection[] { new CategoryDetailsSection(
-						getPage(), parent) };
-			}
-
-			public String getContextId() {
-				return SiteInputContext.CONTEXT_ID;
-			}
-		};
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/MirrorsSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/MirrorsSection.java
deleted file mode 100644
index f7d3b17..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/MirrorsSection.java
+++ /dev/null

@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.site;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.isite.ISite;
-import org.eclipse.pde.internal.core.isite.ISiteModel;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.PDESection;
-import org.eclipse.pde.internal.ui.parts.FormEntry;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.RTFTransfer;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-/**
- * 
- */
-public class MirrorsSection extends PDESection {
-	private FormEntry fMirrorsURLEntry;
-	public MirrorsSection(PDEFormPage page, Composite parent) {
-		super(page, parent, Section.DESCRIPTION | ExpandableComposite.TWISTIE);
-		getSection()
-				.setText(
-						PDEUIMessages.SiteEditor_MirrorsSection_header); 
-		getSection()
-				.setDescription(
-						PDEUIMessages.SiteEditor_MirrorsSection_desc); 
-		createClient(getSection(), page.getManagedForm().getToolkit());		
-	}
-	public void commit(boolean onSave) {
-		fMirrorsURLEntry.commit();
-		super.commit(onSave);
-	}
-	public void createClient(Section section, FormToolkit toolkit) {
-		Composite container = toolkit.createComposite(section);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.verticalSpacing = 10;
-		container.setLayout(layout);
-		fMirrorsURLEntry = new FormEntry(container, toolkit, PDEUIMessages.SiteEditor_MirrorsSection_urlLabel, 
-				null, false);
-		fMirrorsURLEntry.setFormEntryListener(new FormEntryAdapter(this) {
-			public void textValueChanged(FormEntry text) {
-				setMirrorsURL(text.getValue());
-			}
-		});
-		fMirrorsURLEntry.setEditable(isEditable());
-
-		toolkit.paintBordersFor(container);
-		section.setClient(container);
-		initialize();
-	}
-	private void setMirrorsURL(String text) {
-		ISiteModel model = (ISiteModel) getPage().getModel();
-		ISite site = model.getSite();
-		try {
-			site.setMirrorsURL(text);
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-	public void dispose() {
-		ISiteModel model = (ISiteModel) getPage().getModel();
-		if (model!=null)
-			model.removeModelChangedListener(this);
-		super.dispose();
-	}
-	public void initialize() {
-		ISiteModel model = (ISiteModel) getPage().getModel();
-		refresh();
-		model.addModelChangedListener(this);
-	}
-	public void modelChanged(IModelChangedEvent e) {
-		markStale();
-	}
-	public void setFocus() {
-		if (fMirrorsURLEntry != null)
-			fMirrorsURLEntry.getText().setFocus();
-	}
-	private void setIfDefined(FormEntry formText, String value) {
-		if (value != null) {
-			formText.setValue(value, true);
-		}
-	}
-	public void refresh() {
-		ISiteModel model = (ISiteModel) getPage().getModel();
-		ISite site = model.getSite();
-		setIfDefined(fMirrorsURLEntry, site.getMirrorsURL());
-		super.refresh();
-	}
-	public void cancelEdit() {
-		fMirrorsURLEntry.cancelEdit();
-		super.cancelEdit();
-	}
-	/**
-	 * @see org.eclipse.update.ui.forms.internal.FormSection#canPaste(Clipboard)
-	 */
-	public boolean canPaste(Clipboard clipboard) {
-		TransferData[] types = clipboard.getAvailableTypes();
-		Transfer[] transfers = new Transfer[]{TextTransfer.getInstance(),
-				RTFTransfer.getInstance()};
-		for (int i = 0; i < types.length; i++) {
-			for (int j = 0; j < transfers.length; j++) {
-				if (transfers[j].isSupportedType(types[i]))
-					return true;
-			}
-		}
-		return false;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/NewArchiveDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/NewArchiveDialog.java
deleted file mode 100644
index 40ff3b5..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/NewArchiveDialog.java
+++ /dev/null

@@ -1,180 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.site;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.StatusDialog;
-import org.eclipse.pde.internal.core.isite.ISiteArchive;
-import org.eclipse.pde.internal.core.isite.ISiteModel;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-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.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-
-public class NewArchiveDialog extends StatusDialog {
-
-	private IStatus fErrorStatus;
-
-	private IStatus fOkStatus;
-
-	private Text fPathText;
-
-	private ISiteArchive fSiteArchive;
-
-	private ISiteModel fSiteModel;
-
-	private Text fUrlText;
-
-	public NewArchiveDialog(Shell shell, ISiteModel siteModel,
-			ISiteArchive archive) {
-		super(shell);
-		this.fSiteModel = siteModel;
-		this.fSiteArchive = archive;
-	}
-
-	protected void createButtonsForButtonBar(Composite parent) {
-		super.createButtonsForButtonBar(parent);
-		dialogChanged();
-	}
-
-	protected Control createDialogArea(Composite parent) {
-		Composite container = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginHeight = layout.marginWidth = 10;
-		container.setLayout(layout);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		container.setLayoutData(gd);
-
-		createEntries(container);
-
-		ModifyListener listener = new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				dialogChanged();
-			}
-		};
-		fPathText.addModifyListener(listener);
-		fUrlText.addModifyListener(listener);
-		setTitle(PDEUIMessages.SiteEditor_NewArchiveDialog_title); 
-		Dialog.applyDialogFont(container);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(container, IHelpContextIds.NEW_ARCHIVE_DIALOG);
-		return container;
-	}
-
-	private void createEntries(Composite container) {
-		Label label = new Label(container, SWT.NULL);
-		label.setText(PDEUIMessages.SiteEditor_NewArchiveDialog_path); 
-		fPathText = new Text(container, SWT.SINGLE | SWT.BORDER);
-		fPathText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		label = new Label(container, SWT.NULL);
-		label.setText(PDEUIMessages.SiteEditor_NewArchiveDialog_url); 
-		fUrlText = new Text(container, SWT.SINGLE | SWT.BORDER);
-		fUrlText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		if (fSiteArchive != null) {
-			setIfDefined(fUrlText, fSiteArchive.getURL());
-			setIfDefined(fPathText, fSiteArchive.getPath());
-		}
-	}
-
-	private IStatus createErrorStatus(String message) {
-		return new Status(IStatus.ERROR, PDEPlugin.getPluginId(), IStatus.OK,
-				message, null);
-	}
-
-	private void dialogChanged() {
-		IStatus status = null;
-		if (fUrlText.getText().length() == 0
-				|| fPathText.getText().length() == 0)
-			status = getEmptyErrorStatus();
-		else {
-			if (hasPath(fPathText.getText()))
-				status = createErrorStatus(PDEUIMessages.NewArchiveDialog_alreadyExists); 
-		}
-		if (status == null)
-			status = getOKStatus();
-		updateStatus(status);
-	}
-
-	private void execute() {
-		boolean add = (fSiteArchive == null);
-		if (fSiteArchive == null)
-			fSiteArchive = fSiteModel.getFactory().createArchive();
-
-		try {
-			fSiteArchive.setURL(fUrlText.getText());
-			fSiteArchive.setPath(fPathText.getText());
-			if (add)
-				fSiteModel.getSite().addArchives(
-						new ISiteArchive[] { fSiteArchive });
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	private IStatus getEmptyErrorStatus() {
-		if (fErrorStatus == null)
-			fErrorStatus = createErrorStatus(PDEUIMessages.SiteEditor_NewArchiveDialog_error); 
-		return fErrorStatus;
-	}
-
-	private IStatus getOKStatus() {
-		if (fOkStatus == null)
-			fOkStatus = new Status(IStatus.OK, PDEPlugin.getPluginId(),
-					IStatus.OK, "", //$NON-NLS-1$
-					null);
-		return fOkStatus;
-	}
-
-	private boolean hasPath(String path) {
-		String currentPath = fSiteArchive != null ? fSiteArchive.getPath()
-				: null;
-
-		ISiteModel model = fSiteModel;
-		ISiteArchive[] archives = model.getSite().getArchives();
-		for (int i = 0; i < archives.length; i++) {
-			ISiteArchive archive = archives[i];
-			String apath = archive.getPath();
-			if (currentPath != null && currentPath.equals(path)) {
-				// do not have to change path while editing
-				return false;
-			}
-			if (apath != null && apath.equals(path)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	protected void okPressed() {
-		execute();
-		super.okPressed();
-	}
-
-	private void setIfDefined(Text text, String value) {
-		if (value != null)
-			text.setText(value);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/PortabilitySection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/PortabilitySection.java
deleted file mode 100644
index e7f1818..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/PortabilitySection.java
+++ /dev/null

@@ -1,375 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.site;
-
-import java.util.Locale;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.ifeature.IEnvironment;
-import org.eclipse.pde.internal.core.isite.ISiteFeature;
-import org.eclipse.pde.internal.core.isite.ISiteModel;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.FormEntryAdapter;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-import org.eclipse.pde.internal.ui.editor.PDESection;
-import org.eclipse.pde.internal.ui.editor.feature.Choice;
-import org.eclipse.pde.internal.ui.editor.feature.PortabilityChoicesDialog;
-import org.eclipse.pde.internal.ui.parts.FormEntry;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.RTFTransfer;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IFormPart;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.IPartSelectionListener;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-public class PortabilitySection extends PDESection implements IFormPart,
-		IPartSelectionListener {
-	public static Choice[] getArchChoices() {
-		return getKnownChoices(Platform.knownOSArchValues());
-	}
-
-	private static Choice[] getKnownChoices(String[] values) {
-		Choice[] choices = new Choice[values.length];
-		for (int i = 0; i < choices.length; i++) {
-			choices[i] = new Choice(values[i], values[i]);
-		}
-		return choices;
-	}
-
-	public static Choice[] getNLChoices() {
-		Locale[] locales = Locale.getAvailableLocales();
-		Choice[] choices = new Choice[locales.length];
-		for (int i = 0; i < locales.length; i++) {
-			Locale locale = locales[i];
-			choices[i] = new Choice(locale.toString(), locale.toString()
-					+ " - " + locale.getDisplayName()); //$NON-NLS-1$
-		}
-		return choices;
-	}
-
-	public static Choice[] getOSChoices() {
-		return getKnownChoices(Platform.knownOSValues());
-	}
-
-	public static Choice[] getWSChoices() {
-		return getKnownChoices(Platform.knownWSValues());
-	}
-
-	private FormEntry fArchText;
-
-	private ISiteFeature fCurrentSiteFeature;
-
-	private FormEntry fNlText;
-
-	private FormEntry fOsText;
-
-	private FormEntry fWsText;
-
-	public PortabilitySection(PDEFormPage page, Composite parent) {
-		this(page, parent, PDEUIMessages.SiteEditor_PortabilitySection_title,
-				PDEUIMessages.SiteEditor_PortabilitySection_desc, SWT.NULL);
-		getSection().setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-	}
-
-	public PortabilitySection(PDEFormPage page, Composite parent, String title,
-			String desc, int toggleStyle) {
-		super(page, parent, Section.DESCRIPTION | toggleStyle);
-		getSection().setText(title);
-		getSection().setDescription(desc);
-		createClient(getSection(), page.getManagedForm().getToolkit());
-	}
-
-	private void applyValue(String property, String value) throws CoreException {
-		if (fCurrentSiteFeature == null)
-			return;
-		if (property.equals(IEnvironment.P_NL))
-			fCurrentSiteFeature.setNL(value);
-		else if (property.equals(IEnvironment.P_OS))
-			fCurrentSiteFeature.setOS(value);
-		else if (property.equals(IEnvironment.P_WS))
-			fCurrentSiteFeature.setWS(value);
-		else if (property.equals(IEnvironment.P_ARCH))
-			fCurrentSiteFeature.setArch(value);
-	}
-
-	public void cancelEdit() {
-		fOsText.cancelEdit();
-		fWsText.cancelEdit();
-		fNlText.cancelEdit();
-		fArchText.cancelEdit();
-		super.cancelEdit();
-	}
-
-	public boolean canPaste(Clipboard clipboard) {
-		TransferData[] types = clipboard.getAvailableTypes();
-		Transfer[] transfers = new Transfer[] { TextTransfer.getInstance(),
-				RTFTransfer.getInstance() };
-		for (int i = 0; i < types.length; i++) {
-			for (int j = 0; j < transfers.length; j++) {
-				if (transfers[j].isSupportedType(types[i]))
-					return true;
-			}
-		}
-		return false;
-	}
-
-	private void clearField(String property) {
-		if (property.equals(IEnvironment.P_OS))
-			fOsText.setValue(null, true);
-		else if (property.equals(IEnvironment.P_WS))
-			fWsText.setValue(null, true);
-		else if (property.equals(IEnvironment.P_ARCH))
-			fArchText.setValue(null, true);
-	}
-
-	private void clearFields() {
-		fOsText.setValue(null, true);
-		fWsText.setValue(null, true);
-		if (fNlText != null)
-			fNlText.setValue(null, true);
-		fArchText.setValue(null, true);
-	}
-
-	public void commit(boolean onSave) {
-		fOsText.commit();
-		fWsText.commit();
-		if (fNlText != null)
-			fNlText.commit();
-		fArchText.commit();
-		super.commit(onSave);
-	}
-
-	public void createClient(Section section, FormToolkit toolkit) {
-		Composite container = toolkit.createComposite(section);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		layout.verticalSpacing = 9;
-		layout.horizontalSpacing = 6;
-		container.setLayout(layout);
-
-		String editLabel = PDEUIMessages.SiteEditor_PortabilitySection_edit;
-
-		fOsText = new FormEntry(container, toolkit, PDEUIMessages.SiteEditor_PortabilitySection_os, editLabel, false);
-		fOsText.setFormEntryListener(new FormEntryAdapter(this) {
-
-			public void browseButtonSelected(FormEntry entry) {
-				BusyIndicator.showWhile(fOsText.getText().getDisplay(),
-						new Runnable() {
-							public void run() {
-								Choice[] choices = getOSChoices();
-								openPortabilityChoiceDialog(IEnvironment.P_OS,
-										fOsText, choices);
-							}
-						});
-			}
-
-			public void textValueChanged(FormEntry text) {
-				try {
-					applyValue(IEnvironment.P_OS, text.getValue());
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		});
-		limitTextWidth(fOsText);
-		fOsText.setEditable(isEditable());
-
-		fWsText = new FormEntry(container, toolkit, PDEUIMessages.SiteEditor_PortabilitySection_ws, editLabel, false);
-		fWsText.setFormEntryListener(new FormEntryAdapter(this) {
-
-			public void browseButtonSelected(FormEntry entry) {
-				BusyIndicator.showWhile(fWsText.getText().getDisplay(),
-						new Runnable() {
-							public void run() {
-								Choice[] choices = getWSChoices();
-								openPortabilityChoiceDialog(IEnvironment.P_WS,
-										fWsText, choices);
-							}
-						});
-			}
-
-			public void textValueChanged(FormEntry text) {
-				try {
-					applyValue(IEnvironment.P_WS, text.getValue());
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		});
-		limitTextWidth(fWsText);
-		fWsText.setEditable(isEditable());
-
-		fNlText = new FormEntry(container, toolkit, PDEUIMessages.SiteEditor_PortabilitySection_nl, editLabel, false);
-
-		fNlText.setFormEntryListener(new FormEntryAdapter(this) {
-
-			public void browseButtonSelected(FormEntry entry) {
-				BusyIndicator.showWhile(fNlText.getText().getDisplay(),
-						new Runnable() {
-							public void run() {
-								Choice[] choices = getNLChoices();
-								openPortabilityChoiceDialog(IEnvironment.P_NL,
-										fNlText, choices);
-							}
-						});
-			}
-
-			public void textValueChanged(FormEntry text) {
-				try {
-					applyValue(IEnvironment.P_NL, text.getValue());
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		});
-		limitTextWidth(fNlText);
-		fNlText.setEditable(isEditable());
-
-		fArchText = new FormEntry(container, toolkit, PDEUIMessages.SiteEditor_PortabilitySection_arch, editLabel, false);
-		fArchText.setFormEntryListener(new FormEntryAdapter(this) {
-
-			public void browseButtonSelected(FormEntry entry) {
-				BusyIndicator.showWhile(fArchText.getText().getDisplay(),
-						new Runnable() {
-							public void run() {
-								Choice[] choices = getArchChoices();
-								openPortabilityChoiceDialog(
-										IEnvironment.P_ARCH, fArchText, choices);
-							}
-						});
-			}
-
-			public void textValueChanged(FormEntry text) {
-				try {
-					applyValue(IEnvironment.P_ARCH, text.getValue());
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-
-		});
-		limitTextWidth(fArchText);
-		fArchText.setEditable(isEditable());
-
-		toolkit.paintBordersFor(container);
-		section.setClient(container);
-	}
-
-	public void dispose() {
-		ISiteModel model = (ISiteModel) getPage().getModel();
-		if (model != null)
-			model.removeModelChangedListener(this);
-		super.dispose();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.forms.AbstractFormPart#initialize(org.eclipse.ui.forms.IManagedForm)
-	 */
-	public void initialize(IManagedForm form) {
-		ISiteModel model = (ISiteModel) getPage().getModel();
-		if (model != null)
-			model.addModelChangedListener(this);
-		super.initialize(form);
-	}
-
-	private void limitTextWidth(FormEntry entry) {
-		GridData gd = (GridData) entry.getText().getLayoutData();
-		gd.widthHint = 30;
-	}
-
-	public void modelChanged(IModelChangedEvent e) {
-		markStale();
-	}
-
-	private void openPortabilityChoiceDialog(String property, FormEntry text,
-			Choice[] choices) {
-		String value = text.getValue();
-
-		PortabilityChoicesDialog dialog = new PortabilityChoicesDialog(
-				PDEPlugin.getActiveWorkbenchShell(), choices, value);
-		dialog.create();
-		dialog.getShell().setText(PDEUIMessages.SiteEditor_PortabilityChoicesDialog_title);
-
-		int result = dialog.open();
-		if (result == Window.OK) {
-			value = dialog.getValue();
-			text.setValue(value);
-			try {
-				applyValue(property, value);
-			} catch (CoreException e) {
-				PDEPlugin.logException(e);
-			}
-		}
-	}
-
-	public void refresh() {
-		if (fCurrentSiteFeature == null) {
-			clearFields();
-			super.refresh();
-			return;
-		}
-		setValue(IEnvironment.P_OS);
-		setValue(IEnvironment.P_WS);
-		setValue(IEnvironment.P_ARCH);
-		setValue(IEnvironment.P_NL);
-		super.refresh();
-	}
-
-	public void selectionChanged(IFormPart part, ISelection selection) {
-		if (selection instanceof IStructuredSelection && !selection.isEmpty()) {
-			Object o = ((IStructuredSelection) selection).getFirstElement();
-			if (o instanceof SiteFeatureAdapter) {
-				fCurrentSiteFeature = ((SiteFeatureAdapter) o).feature;
-			} else {
-				fCurrentSiteFeature = null;
-			}
-		} else
-			fCurrentSiteFeature = null;
-		refresh();
-	}
-
-	public void setFocus() {
-		if (fOsText != null)
-			fOsText.getText().setFocus();
-	}
-
-	private void setValue(String property) {
-		if (fCurrentSiteFeature == null) {
-			clearField(property);
-		} else {
-			if (property.equals(IEnvironment.P_NL))
-				fNlText.setValue(fCurrentSiteFeature.getNL(), true);
-			else if (property.equals(IEnvironment.P_OS))
-				fOsText.setValue(fCurrentSiteFeature.getOS(), true);
-			else if (property.equals(IEnvironment.P_WS))
-				fWsText.setValue(fCurrentSiteFeature.getWS(), true);
-			else if (property.equals(IEnvironment.P_ARCH))
-				fArchText.setValue(fCurrentSiteFeature.getArch(), true);
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteEditor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteEditor.java
deleted file mode 100644
index 448f4b9..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteEditor.java
+++ /dev/null

@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 27, 2004
- */
-package org.eclipse.pde.internal.ui.editor.site;
-import java.io.File;
-import java.util.Locale;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.pde.internal.core.isite.ISiteObject;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.editor.ISortableContentOutlinePage;
-import org.eclipse.pde.internal.ui.editor.MultiSourceEditor;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.pde.internal.ui.editor.PDESourcePage;
-import org.eclipse.pde.internal.ui.editor.SystemFileEditorInput;
-import org.eclipse.pde.internal.ui.editor.context.InputContext;
-import org.eclipse.pde.internal.ui.editor.context.InputContextManager;
-import org.eclipse.swt.SWTError;
-import org.eclipse.swt.dnd.RTFTransfer;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.forms.editor.IFormPage;
-import org.eclipse.ui.part.FileEditorInput;
-
-public class SiteEditor extends MultiSourceEditor {
-	protected void createResourceContexts(InputContextManager manager,
-			IFileEditorInput input) {
-		IFile file = input.getFile();
-		IFile siteFile = null;
-		String name = file.getName().toLowerCase(Locale.ENGLISH);
-		if (name.equals("site.xml")) { //$NON-NLS-1$
-			siteFile = file;
-			if (siteFile.exists()) {
-				IEditorInput in = new FileEditorInput(siteFile);
-				manager.putContext(in, new SiteInputContext(this, in, file==siteFile));
-			}
-			manager.monitorFile(siteFile);
-		}
-	}
-	
-	protected InputContextManager createInputContextManager() {
-		SiteInputContextManager contextManager = new SiteInputContextManager(this);
-		contextManager.setUndoManager(new SiteUndoManager(this));
-		return contextManager;
-	}
-	
-	public boolean canCopy(ISelection selection) {
-		return true;
-	}	
-	
-	protected boolean hasKnownTypes() {
-		try {
-			TransferData[] types = getClipboard().getAvailableTypes();
-			Transfer[] transfers =
-				new Transfer[] { TextTransfer.getInstance(), RTFTransfer.getInstance()};
-			for (int i = 0; i < types.length; i++) {
-				for (int j = 0; j < transfers.length; j++) {
-					if (transfers[j].isSupportedType(types[i]))
-						return true;
-				}
-			}
-		} catch (SWTError e) {
-		}
-		return false;
-	}
-	
-	public void monitoredFileAdded(IFile file) {
-	}
-
-	public boolean monitoredFileRemoved(IFile file) {
-		//TODO may need to check with the user if there
-		//are unsaved changes in the model for the
-		//file that just got removed under us.
-		return true;
-	}
-	public void contextAdded(InputContext context) {
-		addSourcePage(context.getId());
-	}
-	public void contextRemoved(InputContext context) {
-		if (context.isPrimary()) {
-			close(true);
-			return;
-		}		
-		IFormPage page = findPage(context.getId());
-		if (page!=null)
-			removePage(context.getId());
-	}
-
-	protected void createSystemFileContexts(InputContextManager manager,
-			SystemFileEditorInput input) {
-		File file = (File) input.getAdapter(File.class);
-		File siteFile = null;
-
-		String name = file.getName().toLowerCase(Locale.ENGLISH);
-		if (name.equals("site.xml")) { //$NON-NLS-1$
-			siteFile = file;
-			if (siteFile.exists()) {
-				IEditorInput in = new SystemFileEditorInput(siteFile);
-				manager.putContext(in, new SiteInputContext(this, in,
-						file == siteFile));
-			}
-		}
-	}
-
-	protected void createStorageContexts(InputContextManager manager,
-			IStorageEditorInput input) {
-		String name = input.getName().toLowerCase(Locale.ENGLISH);
-		if (name.startsWith("site.xml")) { //$NON-NLS-1$
-			manager.putContext(input,
-							new SiteInputContext(this, input, true));
-		}
-	}
-	
-	protected void contextMenuAboutToShow(IMenuManager manager) {
-		super.contextMenuAboutToShow(manager);
-	}
-
-	protected void addPages() {
-		try {
-			addPage(new FeaturesPage(this));
-			addPage(new ArchivePage(this));
-		} catch (PartInitException e) {
-			PDEPlugin.logException(e);
-		}
-		addSourcePage(SiteInputContext.CONTEXT_ID);
-	}
-
-
-	protected String computeInitialPageId() {
-		return FeaturesPage.PAGE_ID;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.MultiSourceEditor#createXMLSourcePage(org.eclipse.pde.internal.ui.neweditor.PDEFormEditor, java.lang.String, java.lang.String)
-	 */
-	protected PDESourcePage createSourcePage(PDEFormEditor editor, String title, String name, String contextId) {
-		return new SiteSourcePage(editor, title, name);
-	}
-	
-	protected ISortableContentOutlinePage createContentOutline() {
-		return new SiteOutlinePage(this);
-	}
-		
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDEFormEditor#getInputContext(java.lang.Object)
-	 */
-	protected InputContext getInputContext(Object object) {
-		InputContext context = null;
-		if (object instanceof ISiteObject) {
-			context = inputContextManager
-					.findContext(SiteInputContext.CONTEXT_ID);
-		}
-		return context;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteEditorContributor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteEditorContributor.java
deleted file mode 100644
index 4914774..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteEditorContributor.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.site;
-
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.swt.dnd.Clipboard;
-
-public class SiteEditorContributor extends PDEFormEditorContributor {
-
-	public SiteEditorContributor() {
-		super("Site"); //$NON-NLS-1$
-	}
-
-	protected boolean hasKnownTypes(Clipboard clipboard) {
-		return true;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteFeatureAdapter.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteFeatureAdapter.java
deleted file mode 100644
index 978f015..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteFeatureAdapter.java
+++ /dev/null

@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.site;
-
-import java.io.*;
-
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.internal.core.isite.*;
-
-public class SiteFeatureAdapter implements Serializable, IWritable {
-
-	private static final long serialVersionUID = 1L;
-
-	String category;
-	ISiteFeature feature;
-
-	public SiteFeatureAdapter(String category, ISiteFeature feature) {
-		this.category = category;
-		this.feature = feature;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IWritable#write(java.lang.String, java.io.PrintWriter)
-	 */
-	public void write(String indent, PrintWriter writer) {
-		feature.write(indent, writer);
-	}
-
-	/*
-	 * For retaining selectiong in the tree, when modyfing or moving features,
-	 * SiteFeatureAdapter are equal if features are equal (same ID and version)
-	 * 
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object obj) {
-		if (obj instanceof SiteFeatureAdapter) {
-			SiteFeatureAdapter adapter = (SiteFeatureAdapter) obj;
-			String id = feature.getId();
-			String id2 = adapter.feature.getId();
-			boolean sameFeature = id != null && id2 != null && id.equals(id2);
-			if (sameFeature) {
-				String version = feature.getVersion();
-				String version2 = adapter.feature.getVersion();
-				sameFeature = version != null && version2 != null && version.equals(version2);
-			}
-			boolean sameCategory = adapter.category != null && category != null 
-										? adapter.category.equals(category) : true;
-			return sameFeature && sameCategory;
-		}
-		return super.equals(obj);
-	}
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	public int hashCode() {
-		int code = feature.getId().hashCode()+feature.getVersion().hashCode();
-		if(category!=null){
-			code+=category.hashCode();
-		}
-		return code;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteInputContext.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteInputContext.java
deleted file mode 100644
index 9ebdb77..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteInputContext.java
+++ /dev/null

@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.site;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.pde.core.IBaseModel;
-import org.eclipse.pde.core.IEditable;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.isite.ISiteModel;
-import org.eclipse.pde.internal.core.site.*;
-import org.eclipse.pde.internal.core.site.WorkspaceSiteModel;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.pde.internal.ui.editor.context.XMLInputContext;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IStorageEditorInput;
-
-public class SiteInputContext extends XMLInputContext {
-	public static final String CONTEXT_ID = "site-context"; //$NON-NLS-1$
-	private boolean storageModel=false;
-	/**
-	 * @param editor
-	 * @param input
-	 */
-	public SiteInputContext(PDEFormEditor editor, IEditorInput input,
-			boolean primary) {
-		super(editor, input, primary);
-		create();
-	}
-
-	protected IBaseModel createModel(IEditorInput input) {
-		IBaseModel model = null;
-		if (input instanceof IStorageEditorInput) {
-			InputStream is = null;
-			try {
-				if (input instanceof IFileEditorInput) {
-					IFile file = ((IFileEditorInput) input).getFile();
-					is = file.getContents();
-					model = createWorkspaceModel(file, is, true);
-				} else if (input instanceof IStorageEditorInput) {
-					is = ((IStorageEditorInput) input).getStorage()
-							.getContents();
-					model =  createStorageModel(is);
-				}
-			} catch (CoreException e) {
-				PDEPlugin.logException(e);
-				return null;
-			}
-		}
-		return model;
-	}
-
-	private IBaseModel createWorkspaceModel(IFile file, InputStream stream,
-			boolean editable) {
-		WorkspaceSiteModel model = new WorkspaceSiteModel(file);
-		try {
-			model.setEditable(editable);
-			model.load(stream, false);
-		} catch (CoreException e) {
-		}
-		try {
-			stream.close();
-		} catch (IOException e) {
-			PDEPlugin.logException(e);
-		}
-		return model;
-	}
-	
-	private IBaseModel createStorageModel(InputStream stream) {
-		ExternalSiteModel model = new ExternalSiteModel();
-		try {
-			model.load(stream, true);
-		} catch (CoreException e) {
-		} finally {
-			try {
-				stream.close();
-			} catch (IOException e1) {
-			}
-		}
-		return model;
-	}
-
-	public void dispose() {
-		ISiteModel model = (ISiteModel) getModel();
-		if (storageModel) {
-			model.dispose();
-		}
-		super.dispose();
-	}
-	protected void flushModel(IDocument doc) {
-		// if model is dirty, flush its content into
-		// the document so that the source editor will
-		// pick up the changes.
-		if (!(getModel() instanceof IEditable))
-			return;
-		IEditable editableModel = (IEditable) getModel();
-		if (editableModel.isEditable()==false) return;
-		if (editableModel.isDirty() == false) return;
-		try {
-			StringWriter swriter = new StringWriter();
-			PrintWriter writer = new PrintWriter(swriter);
-			editableModel.save(writer);
-			writer.flush();
-			swriter.close();
-			doc.set(swriter.toString());
-		} catch (IOException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-	
-	protected boolean synchronizeModel(IDocument doc) {
-		ISiteModel model = (ISiteModel) getModel();
-		boolean cleanModel = true;
-		String text = doc.get();
-		try {
-			InputStream stream =
-				new ByteArrayInputStream(text.getBytes("UTF8")); //$NON-NLS-1$
-			try {
-				model.reload(stream, false);
-			} catch (CoreException e) {
-				cleanModel = false;
-			}
-			try {
-				stream.close();
-			} catch (IOException e) {
-			}
-		} catch (UnsupportedEncodingException e) {
-			PDEPlugin.logException(e);
-		}
-		return cleanModel;
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.neweditor.InputContext#getId()
-	 */
-	public String getId() {
-		return CONTEXT_ID;
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.neweditor.context.InputContext#addTextEditOperation(java.util.ArrayList,
-	 *      org.eclipse.pde.core.IModelChangedEvent)
-	 */
-	protected void addTextEditOperation(ArrayList ops, IModelChangedEvent event) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.context.XMLInputContext#reorderInsertEdits(java.util.ArrayList)
-	 */
-	protected void reorderInsertEdits(ArrayList ops) {
-	}
-
-	protected String getPartitionName() {
-		return "___site_partition"; //$NON-NLS-1$
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteInputContextManager.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteInputContextManager.java
deleted file mode 100644
index 42f9620..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteInputContextManager.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.site;
-
-import org.eclipse.pde.core.IBaseModel;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.pde.internal.ui.editor.context.*;
-
-public class SiteInputContextManager extends InputContextManager {
-	/**
-	 * 
-	 */
-	public SiteInputContextManager(PDEFormEditor editor) {
-		super(editor);
-	}
-
-	public IBaseModel getAggregateModel() {
-		return findSiteModel();
-	}
-
-	private IBaseModel findSiteModel() {
-		InputContext scontext = findContext(SiteInputContext.CONTEXT_ID);
-		return (scontext != null) ? scontext.getModel() : null;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteLabelProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteLabelProvider.java
deleted file mode 100644
index 9400e87..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteLabelProvider.java
+++ /dev/null

@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.site;
-
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.isite.ISiteCategoryDefinition;
-import org.eclipse.pde.internal.core.isite.ISiteFeature;
-import org.eclipse.pde.internal.ui.PDELabelProvider;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.forms.editor.IFormPage;
-
-class SiteLabelProvider extends LabelProvider {
-
-	private PDELabelProvider fSharedProvider;
-
-	/**
-	 * Comment for <code>fLabelProvider</code>
-	 */
-	private Image fSiteFeatureImage;
-
-	private Image fMissingSiteFeatureImage;
-	
-	private Image fPageImage;
-
-	private Image fCatDefImage;
-
-	public SiteLabelProvider() {
-		fSiteFeatureImage = PDEPluginImages.DESC_FEATURE_OBJ.createImage();
-		fMissingSiteFeatureImage = PDEPluginImages.DESC_NOREF_FEATURE_OBJ
-				.createImage();
-		fCatDefImage = PDEPluginImages.DESC_CATEGORY_OBJ.createImage();
-		fPageImage = PDEPluginImages.DESC_PAGE_OBJ.createImage();
-		fSharedProvider = PDEPlugin.getDefault().getLabelProvider();
-		fSharedProvider.connect(this);
-	}
-
-
-	public Image getImage(Object element) {
-		if (element instanceof ISiteCategoryDefinition)
-			return fCatDefImage;
-		if (element instanceof SiteFeatureAdapter) {
-			if (PDECore.getDefault().getFeatureModelManager().findFeatureModelRelaxed(
-					((SiteFeatureAdapter) element).feature.getId(),
-					((SiteFeatureAdapter) element).feature.getVersion()) == null)
-				return fMissingSiteFeatureImage;
-			return fSiteFeatureImage;
-		}
-		if (element instanceof IFormPage)
-			return fPageImage;
-		return fSharedProvider.getImage(element);
-	}
-
-	public String getText(Object element) {
-		if (element instanceof ISiteCategoryDefinition)
-			return ((ISiteCategoryDefinition) element).getName();
-		if (element instanceof SiteFeatureAdapter) {
-			ISiteFeature feature = ((SiteFeatureAdapter) element).feature;
-			if (feature.getId() != null && feature.getVersion() != null)
-				return feature.getId() + " (" + feature.getVersion() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-			return feature.getURL();
-		}
-		if (element instanceof IFormPage)
-			return ((IFormPage)element).getTitle();
-		return fSharedProvider.getText(element);
-	}
-
-	public void dispose() {
-		fSharedProvider.disconnect(this);
-		super.dispose();
-		fCatDefImage.dispose();
-		fSiteFeatureImage.dispose();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteOutlinePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteOutlinePage.java
deleted file mode 100644
index cf4f6f0..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteOutlinePage.java
+++ /dev/null

@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.site;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.pde.internal.core.isite.ISite;
-import org.eclipse.pde.internal.core.isite.ISiteArchive;
-import org.eclipse.pde.internal.core.isite.ISiteCategory;
-import org.eclipse.pde.internal.core.isite.ISiteCategoryDefinition;
-import org.eclipse.pde.internal.core.isite.ISiteFeature;
-import org.eclipse.pde.internal.core.isite.ISiteModel;
-import org.eclipse.pde.internal.ui.editor.FormOutlinePage;
-import org.eclipse.pde.internal.ui.editor.PDEFormEditor;
-import org.eclipse.pde.internal.ui.editor.PDEFormPage;
-
-public class SiteOutlinePage extends FormOutlinePage {
-	private LabelProvider fLabelProvider;
-
-	/**
-	 * @param editor
-	 */
-	public SiteOutlinePage(PDEFormEditor editor) {
-		super(editor);
-	}
-
-	protected Object[] getChildren(Object parent) {
-		if (parent instanceof PDEFormPage) {
-			PDEFormPage page = (PDEFormPage) parent;
-			ISiteModel model = (ISiteModel) page.getModel();
-			if (model.isValid()) {
-				ISite site = model.getSite();
-				if (page.getId().equals(FeaturesPage.PAGE_ID)) {
-					ArrayList result = new ArrayList();
-					ISiteCategoryDefinition[] catDefs = site
-							.getCategoryDefinitions();
-					for (int i = 0; i < catDefs.length; i++) {
-						result.add(catDefs[i]);
-					}
-					ISiteFeature[] features = site.getFeatures();
-					for (int i = 0; i < features.length; i++) {
-						if (features[i].getCategories().length == 0)
-							result
-									.add(new SiteFeatureAdapter(null,
-											features[i]));
-					}
-					return result.toArray();
-				}
-				if (page.getId().equals(ArchivePage.PAGE_ID))
-					return site.getArchives();
-			}
-		}
-		if (parent instanceof ISiteCategoryDefinition) {
-			ISiteCategoryDefinition catDef = (ISiteCategoryDefinition) parent;
-			ISiteModel model = catDef.getModel();
-			if (model.isValid()) {
-				ISite site = model.getSite();
-				ISiteFeature[] features = site.getFeatures();
-				HashSet result = new HashSet();
-				for (int i = 0; i < features.length; i++) {
-					ISiteCategory[] cats = features[i].getCategories();
-					for (int j = 0; j < cats.length; j++) {
-						if (cats[j].getDefinition() != null
-								&& cats[j].getDefinition().equals(catDef)) {
-							result.add(new SiteFeatureAdapter(
-									cats[j].getName(), features[i]));
-						}
-					}
-				}
-				return result.toArray();
-			}
-		}
-		return new Object[0];
-	}
-
-	protected String getParentPageId(Object item) {
-		String pageId = null;
-		if (item instanceof ISiteCategoryDefinition
-				|| item instanceof SiteFeatureAdapter)
-			pageId = FeaturesPage.PAGE_ID;
-		else if (item instanceof ISiteArchive)
-			pageId = ArchivePage.PAGE_ID;
-		if (pageId != null)
-			return pageId;
-		return super.getParentPageId(item);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.editor.FormOutlinePage#createLabelProvider()
-	 */
-	protected ILabelProvider createLabelProvider() {
-		fLabelProvider = new SiteLabelProvider();
-		return fLabelProvider;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.editor.FormOutlinePage#dispose()
-	 */
-	public void dispose() {
-		super.dispose();
-		if (fLabelProvider != null)
-			fLabelProvider.dispose();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteSourcePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteSourcePage.java
deleted file mode 100644
index 7d8a103..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteSourcePage.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.site;
-
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.ui.views.contentoutline.*;
-
-public class SiteSourcePage extends XMLSourcePage {
-
-	public SiteSourcePage(PDEFormEditor editor, String id, String title) {
-		super(editor, id, title);
-	}
-	public IContentOutlinePage createContentOutlinePage() {
-		return null;
-	}
-	protected ILabelProvider createOutlineLabelProvider() {
-		return null;
-	}
-	protected ITreeContentProvider createOutlineContentProvider() {
-		return null;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.editor.PDESourcePage#createOutlineSorter()
-	 */
-	protected ViewerSorter createOutlineSorter() {
-		return null;
-	}
-	protected void outlineSelectionChanged(SelectionChangedEvent e) {
-	}
-	protected ISortableContentOutlinePage createOutlinePage() {
-		// TODO remove this method when the above three stubs
-		// are implemented
-		return new SiteOutlinePage((PDEFormEditor) getEditor());
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteUndoManager.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteUndoManager.java
deleted file mode 100644
index 21597c9..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SiteUndoManager.java
+++ /dev/null

@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.site;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.pde.core.IModelChangeProvider;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.isite.ISite;
-import org.eclipse.pde.internal.core.isite.ISiteArchive;
-import org.eclipse.pde.internal.core.isite.ISiteCategory;
-import org.eclipse.pde.internal.core.isite.ISiteCategoryDefinition;
-import org.eclipse.pde.internal.core.isite.ISiteDescription;
-import org.eclipse.pde.internal.core.isite.ISiteFeature;
-import org.eclipse.pde.internal.core.isite.ISiteModel;
-import org.eclipse.pde.internal.core.isite.ISiteObject;
-import org.eclipse.pde.internal.core.site.SiteObject;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.editor.ModelUndoManager;
-
-public class SiteUndoManager extends ModelUndoManager {
-	public SiteUndoManager(SiteEditor editor) {
-		super(editor);
-		setUndoLevelLimit(30);
-	}
-
-	protected String getPageId(Object obj) {
-		if (obj instanceof ISiteDescription) {
-			return ArchivePage.PAGE_ID;
-		}
-		if (obj instanceof ISiteFeature || obj instanceof ISiteCategory
-				|| obj instanceof ISiteCategoryDefinition) {
-			return FeaturesPage.PAGE_ID;
-		}
-		// site elements and attributes are on different pages, stay on the
-		// current page
-		return null;
-	}
-	/*
-	 * @see IModelUndoManager#execute(ModelUndoOperation)
-	 */
-	protected void execute(IModelChangedEvent event, boolean undo) {
-		IModelChangeProvider model = event.getChangeProvider();
-		Object[] elements = event.getChangedObjects();
-		int type = event.getChangeType();
-		String propertyName = event.getChangedProperty();
-
-		switch (type) {
-			case IModelChangedEvent.INSERT :
-				if (undo)
-					executeRemove(model, elements);
-				else
-					executeAdd(model, elements);
-				break;
-			case IModelChangedEvent.REMOVE :
-				if (undo)
-					executeAdd(model, elements);
-				else
-					executeRemove(model, elements);
-				break;
-			case IModelChangedEvent.CHANGE :
-				if (undo)
-					executeChange(
-						elements[0],
-						propertyName,
-						event.getNewValue(),
-						event.getOldValue());
-				else
-					executeChange(
-						elements[0],
-						propertyName,
-						event.getOldValue(),
-						event.getNewValue());
-		}
-	}
-
-	private void executeAdd(IModelChangeProvider model, Object[] elements) {
-		ISiteModel siteModel = (model instanceof ISiteModel)?(ISiteModel)model:null;
-		ISite site = siteModel!=null?siteModel.getSite():null;
-
-		try {
-			for (int i = 0; i < elements.length; i++) {
-				Object element = elements[i];
-
-				if (element instanceof ISiteFeature) {
-					site.addFeatures(new ISiteFeature [] {(ISiteFeature) element});
-				} else if (element instanceof ISiteArchive) {
-					site.addArchives(new ISiteArchive[] {(ISiteArchive) element});
-				} else if (element instanceof ISiteCategoryDefinition) {
-					site.addCategoryDefinitions(new ISiteCategoryDefinition[] {(ISiteCategoryDefinition) element});
-				} else if (element instanceof ISiteCategory) {
-					ISiteCategory category = (ISiteCategory)element;
-					ISiteFeature feature = (ISiteFeature)category.getParent();
-					feature.addCategories(new ISiteCategory[] {category});
-				}
-			}
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	private void executeRemove(IModelChangeProvider model, Object[] elements) {
-		ISiteModel siteModel = (model instanceof ISiteModel)?(ISiteModel)model:null;
-		ISite site = siteModel!=null?siteModel.getSite():null;
-		
-		try {
-			for (int i = 0; i < elements.length; i++) {
-				Object element = elements[i];
-
-				if (element instanceof ISiteFeature) {
-					site.removeFeatures(new ISiteFeature [] {(ISiteFeature) element});
-				} else if (element instanceof ISiteArchive) {
-					site.removeArchives(new ISiteArchive[] {(ISiteArchive) element});
-				} else if (element instanceof ISiteCategoryDefinition) {
-					site.removeCategoryDefinitions(new ISiteCategoryDefinition[] {(ISiteCategoryDefinition) element});
-				} else if (element instanceof ISiteCategory) {
-					ISiteCategory category = (ISiteCategory)element;
-					ISiteFeature feature = (ISiteFeature)category.getParent();
-					feature.removeCategories(new ISiteCategory[] {category});
-				}
-			}
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	private void executeChange(
-		Object element,
-		String propertyName,
-		Object oldValue,
-		Object newValue) {
-
-		if (element instanceof SiteObject) {
-			SiteObject sobj = (SiteObject) element;
-			try {
-				sobj.restoreProperty(propertyName, oldValue, newValue);
-			} catch (CoreException e) {
-				PDEPlugin.logException(e);
-			}
-		}
-	}
-
-	public void modelChanged(IModelChangedEvent event) {
-		if (event.getChangeType() == IModelChangedEvent.CHANGE) {
-			Object object = event.getChangedObjects()[0];
-			if (object instanceof ISiteObject) {
-				ISiteObject obj = (ISiteObject) object;
-				//Ignore events from objects that are not yet in the model.
-				if (!(obj instanceof ISite) && !obj.isInTheModel())
-					return;
-			}
-		}
-		super.modelChanged(event);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SynchronizePropertiesAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SynchronizePropertiesAction.java
deleted file mode 100644
index dbb0ee9..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SynchronizePropertiesAction.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.site;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.pde.internal.core.isite.ISiteFeature;
-import org.eclipse.pde.internal.core.isite.ISiteModel;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-
-public class SynchronizePropertiesAction extends Action {
-	private ISiteModel fModel;
-
-	private ISiteFeature fSiteFeature;
-
-	public SynchronizePropertiesAction(ISiteFeature siteFeature,
-			ISiteModel model) {
-		setText(PDEUIMessages.SynchronizePropertiesAction_label);
-		fSiteFeature = siteFeature;
-		fModel = model;
-	}
-
-	public void run() {
-		SynchronizePropertiesWizard wizard = new SynchronizePropertiesWizard(
-				fSiteFeature, fModel);
-		WizardDialog dialog = new WizardDialog(PDEPlugin
-				.getActiveWorkbenchShell(), wizard);
-		dialog.open();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SynchronizePropertiesWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SynchronizePropertiesWizard.java
deleted file mode 100644
index 9c79de8..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SynchronizePropertiesWizard.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.site;
-
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.pde.internal.core.isite.ISiteFeature;
-import org.eclipse.pde.internal.core.isite.ISiteModel;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-
-public class SynchronizePropertiesWizard extends Wizard {
-	private SynchronizePropertiesWizardPage fMainPage;
-
-	private ISiteModel fModel;
-
-	private ISiteFeature fSiteFeature;
-
-	public SynchronizePropertiesWizard(ISiteFeature siteFeature,
-			ISiteModel model) {
-		super();
-		setDefaultPageImageDescriptor(PDEPluginImages.DESC_NEWFTRPRJ_WIZ);
-		setDialogSettings(PDEPlugin.getDefault().getDialogSettings());
-		setNeedsProgressMonitor(true);
-		setWindowTitle(PDEUIMessages.SynchronizePropertiesWizard_wtitle);
-		fSiteFeature = siteFeature;
-		fModel = model;
-	}
-
-	public void addPages() {
-		fMainPage = new SynchronizePropertiesWizardPage(fSiteFeature, fModel);
-		addPage(fMainPage);
-	}
-
-	public boolean performFinish() {
-		return fMainPage.finish();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SynchronizePropertiesWizardPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SynchronizePropertiesWizardPage.java
deleted file mode 100644
index 568d674..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/site/SynchronizePropertiesWizardPage.java
+++ /dev/null

@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.site;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.ifeature.IFeature;
-import org.eclipse.pde.internal.core.ifeature.IFeatureImport;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.core.isite.ISiteFeature;
-import org.eclipse.pde.internal.core.isite.ISiteModel;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.swt.SWT;
-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.Group;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-
-public class SynchronizePropertiesWizardPage extends WizardPage {
-
-	public static final int ALL_FEATURES = 2;
-
-	public static final int ONE_FEATURE = 1;
-
-	private static final String PREFIX = PDEPlugin.getPluginId()
-			+ ".synchronizeFeatueEnvironment."; //$NON-NLS-1$
-
-	private static final String PROP_SYNCHRO_MODE = PREFIX + "mode"; //$NON-NLS-1$
-
-	private Button fAllFeaturesButton;
-
-	private ISiteModel fModel;
-
-	private Button fOneFeatureButton;
-
-	private ISiteFeature fSiteFeature;
-
-	/**
-	 * 
-	 * @param siteFeature
-	 *            selected feature or null
-	 */
-	public SynchronizePropertiesWizardPage(ISiteFeature siteFeature,
-			ISiteModel model) {
-		super("featureSelection"); //$NON-NLS-1$
-		setTitle(PDEUIMessages.SynchronizePropertiesWizardPage_title);
-		setDescription(PDEUIMessages.SynchronizePropertiesWizardPage_desc);
-		fSiteFeature = siteFeature != null && getFeature(siteFeature) != null ? siteFeature
-				: null;
-		fModel = model;
-	}
-
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		container.setLayout(layout);
-
-		Group group = new Group(container, SWT.SHADOW_ETCHED_IN);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		layout = new GridLayout();
-		group.setLayout(layout);
-		group.setLayoutData(gd);
-		group.setText(PDEUIMessages.SynchronizePropertiesWizardPage_group);
-
-		fOneFeatureButton = new Button(group, SWT.RADIO);
-		fOneFeatureButton.setText(PDEUIMessages.SynchronizePropertiesWizardPage_oneFeature);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		fOneFeatureButton.setLayoutData(gd);
-
-		fAllFeaturesButton = new Button(group, SWT.RADIO);
-		fAllFeaturesButton.setText(PDEUIMessages.SynchronizePropertiesWizardPage_allFeatures);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		fAllFeaturesButton.setLayoutData(gd);
-
-		setControl(container);
-		Dialog.applyDialogFont(container);
-		loadSettings();
-		// TODO add own F1 context
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(container,
-				IHelpContextIds.FEATURE_SYNCHRONIZE_VERSIONS);
-	}
-
-	public boolean finish() {
-		final int mode = saveSettings();
-
-		IRunnableWithProgress operation = new WorkspaceModifyOperation() {
-			public void execute(IProgressMonitor monitor) {
-				try {
-					runOperation(mode, monitor);
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				} catch (InvocationTargetException e) {
-					PDEPlugin.logException(e);
-				} finally {
-					monitor.done();
-				}
-			}
-		};
-		try {
-			getContainer().run(true, true, operation);
-		} catch (InvocationTargetException e) {
-			PDEPlugin.logException(e);
-			return false;
-		} catch (InterruptedException e) {
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * 
-	 * @param siteFeature
-	 * @return IFeatureModel or null
-	 */
-	private IFeature getFeature(ISiteFeature siteFeature) {
-		IFeatureModel model = PDECore
-				.getDefault()
-				.getFeatureModelManager()
-				.findFeatureModel(siteFeature.getId(), siteFeature.getVersion());
-		if (model != null)
-			return model.getFeature();
-		return null;
-	}
-
-	private void importEnvironment(final ISiteFeature siteFeature) {
-		final IFeature feature = getFeature(siteFeature);
-		if (feature == null) {
-			return;
-		}
-		boolean patch = false;
-		IFeatureImport[] imports = feature.getImports();
-		for (int i = 0; i < imports.length; i++) {
-			if (imports[i].isPatch()) {
-				patch = true;
-				break;
-			}
-		}
-		final boolean isPatch = patch;
-		getShell().getDisplay().syncExec(new Runnable() {
-			public void run() {
-				try {
-					siteFeature.setNL(feature.getNL());
-					siteFeature.setOS(feature.getOS());
-					siteFeature.setWS(feature.getWS());
-					siteFeature.setArch(feature.getArch());
-					siteFeature.setIsPatch(isPatch);
-				} catch (CoreException ce) {
-					PDEPlugin.log(ce);
-				}
-			}
-		});
-	}
-
-	private void importEnvironment(ISiteFeature[] siteFeatures,
-			IProgressMonitor monitor) {
-		for (int i = 0; i < siteFeatures.length; i++) {
-			if (monitor.isCanceled()) {
-				return;
-			}
-			monitor.subTask(siteFeatures[i].getId()
-					+ "_" + siteFeatures[i].getVersion()); //$NON-NLS-1$
-			importEnvironment(siteFeatures[i]);
-			monitor.worked(1);
-		}
-	}
-
-	private void loadSettings() {
-		if (fSiteFeature != null) {
-			IDialogSettings settings = getDialogSettings();
-			if (settings.get(PROP_SYNCHRO_MODE) != null) {
-				int mode = settings.getInt(PROP_SYNCHRO_MODE);
-				switch (mode) {
-				case ONE_FEATURE:
-					fOneFeatureButton.setSelection(true);
-					break;
-				case ALL_FEATURES:
-					fAllFeaturesButton.setSelection(true);
-					break;
-				default:
-					fOneFeatureButton.setSelection(true);
-				}
-			} else
-				fOneFeatureButton.setSelection(true);
-		} else {
-			fOneFeatureButton.setEnabled(false);
-			fAllFeaturesButton.setSelection(true);
-		}
-	}
-
-	private void runOperation(int mode, IProgressMonitor monitor)
-			throws CoreException, InvocationTargetException {
-		ISiteFeature[] siteFeatures;
-		if (mode == ONE_FEATURE) {
-			siteFeatures = new ISiteFeature[] { fSiteFeature };
-		} else {
-			siteFeatures = fModel.getSite().getFeatures();
-		}
-		int size = siteFeatures.length;
-		monitor.beginTask(PDEUIMessages.SynchronizePropertiesWizardPage_synchronizing, size);
-		importEnvironment(siteFeatures, monitor);
-	}
-
-	private int saveSettings() {
-		IDialogSettings settings = getDialogSettings();
-
-		int mode = ONE_FEATURE;
-
-		if (fAllFeaturesButton.getSelection())
-			mode = ALL_FEATURES;
-		settings.put(PROP_SYNCHRO_MODE, mode);
-		return mode;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/AnnotationHover.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/AnnotationHover.java
deleted file mode 100644
index ef6fe49..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/AnnotationHover.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.text;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.source.IAnnotationHover;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.ui.texteditor.MarkerAnnotation;
-
-public class AnnotationHover implements IAnnotationHover {
-
-	public String getHoverInfo(ISourceViewer sourceViewer, int lineNumber) {
-		String[] messages = getMessagesForLine(sourceViewer, lineNumber);
-
-		if (messages.length == 0)
-			return null;
-
-		StringBuffer buffer = new StringBuffer();
-		for (int i = 0; i < messages.length; i++) {
-			buffer.append(messages[i]);
-			if (i < messages.length - 1)
-				buffer.append(System.getProperty("line.separator")); //$NON-NLS-1$
-		}
-		return buffer.toString();
-	}
-
-	private String[] getMessagesForLine(ISourceViewer viewer, int line) {
-		IDocument document = viewer.getDocument();
-		IAnnotationModel model = viewer.getAnnotationModel();
-
-		if (model == null)
-			return new String[0];
-
-		ArrayList messages = new ArrayList();
-
-		Iterator iter = model.getAnnotationIterator();
-		while (iter.hasNext()) {
-			Object object = iter.next();
-			if (object instanceof MarkerAnnotation) {
-				MarkerAnnotation annotation = (MarkerAnnotation) object;
-				if (compareRulerLine(model.getPosition(annotation),
-					document,
-					line)) {
-					IMarker marker = annotation.getMarker();
-					String message =
-						marker.getAttribute(IMarker.MESSAGE, (String) null);
-					if (message != null && message.trim().length() > 0)
-						messages.add(message);
-				}
-			}
-		}
-		return (String[]) messages.toArray(new String[messages.size()]);
-	}
-
-	private boolean compareRulerLine(
-		Position position,
-		IDocument document,
-		int line) {
-
-		try {
-			if (position.getOffset() > -1 && position.getLength() > -1) {
-				return document.getLineOfOffset(position.getOffset()) == line;
-			}
-		} catch (BadLocationException e) {
-		}
-		return false;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ColorManager.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ColorManager.java
deleted file mode 100644
index c60fd7a..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ColorManager.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.text;
-
-import java.util.*;
-
-import org.eclipse.jface.preference.*;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.widgets.Display;
-
-public class ColorManager implements IColorManager, IPDEColorConstants {
-
-	private static ColorManager fColorManager;
-	private Map fColorTable = new HashMap(5);
-	private static int counter = 0;
-
-	public ColorManager() {
-		initialize();
-	}
-	
-	public static ColorManager getDefault(){
-		if (fColorManager == null){
-			fColorManager = new ColorManager();
-		}
-		counter++;
-		return fColorManager;
-	}
-
-	public static void initializeDefaults(IPreferenceStore store) {
-		PreferenceConverter.setDefault(store, P_DEFAULT, DEFAULT);
-		PreferenceConverter.setDefault(store, P_PROC_INSTR, PROC_INSTR);
-		PreferenceConverter.setDefault(store, P_STRING, STRING);
-		PreferenceConverter.setDefault(store, P_TAG, TAG);
-		PreferenceConverter.setDefault(store, P_XML_COMMENT, XML_COMMENT);
-	}
-
-	private void initialize() {
-		IPreferenceStore pstore = PDEPlugin.getDefault().getPreferenceStore();
-		putColor(pstore, P_DEFAULT);
-		putColor(pstore, P_PROC_INSTR);
-		putColor(pstore, P_STRING);
-		putColor(pstore, P_TAG);
-		putColor(pstore, P_XML_COMMENT);
-	}
-
-	public void dispose() {
-		counter--;
-		if (counter == 0) {
-			Iterator e = fColorTable.values().iterator();
-			while (e.hasNext())
-				 ((Color) e.next()).dispose();
-			fColorManager = null;
-		}
-	}
-	
-	private void putColor(IPreferenceStore pstore, String property) {
-		RGB setting = PreferenceConverter.getColor(pstore, property);
-		Color oldColor = (Color) fColorTable.get(property);
-		if (oldColor != null){
-			if (oldColor.getRGB().equals(setting))
-				return;
-			oldColor.dispose();
-		}
-		fColorTable.put(property, new Color(Display.getCurrent(), setting));
-	}
-
-	public void updateProperty(String property){
-		IPreferenceStore pstore = PDEPlugin.getDefault().getPreferenceStore();
-		putColor(pstore, property);
-	}
-
-	public Color getColor(String key) {
-		Color color = (Color) fColorTable.get(key);
-		if (color == null) {
-			color =
-				Display.getCurrent().getSystemColor(SWT.COLOR_LIST_FOREGROUND);
-		}
-		return color;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/IColorManager.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/IColorManager.java
deleted file mode 100644
index 1e75dfd..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/IColorManager.java
+++ /dev/null

@@ -1,19 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.text;
-
-import org.eclipse.swt.graphics.Color;
-
-public interface IColorManager {
-
-	void dispose();
-	Color getColor(String key);
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/IPDEColorConstants.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/IPDEColorConstants.java
deleted file mode 100644
index 351a2b0..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/IPDEColorConstants.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.text;
-
-import org.eclipse.swt.graphics.RGB;
-
-public interface IPDEColorConstants {
-	RGB XML_COMMENT =       new RGB(128,   0,   0);
-	RGB PROC_INSTR =        new RGB(128, 128, 128);
-	RGB STRING=             new RGB(  0, 128,   0);
-	RGB DEFAULT=            new RGB(  0,   0,   0);
-	RGB TAG=                new RGB(  0,   0, 128);
-	
-	
-	String P_XML_COMMENT = "editor.color.xml_comment"; //$NON-NLS-1$
-	String P_PROC_INSTR = "editor.color.instr"; //$NON-NLS-1$
-	String P_STRING = "editor.color.string"; //$NON-NLS-1$
-	String P_DEFAULT = "editor.color.default"; //$NON-NLS-1$
-	String P_TAG = "editor.color.tag"; //$NON-NLS-1$
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/IReconcilingParticipant.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/IReconcilingParticipant.java
deleted file mode 100644
index b833ce5..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/IReconcilingParticipant.java
+++ /dev/null

@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.text;
-
-import org.eclipse.jface.text.*;
-
-public interface IReconcilingParticipant {
-	
-	void reconciled(IDocument document);
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/NonRuleBasedDamagerRepairer.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/NonRuleBasedDamagerRepairer.java
deleted file mode 100644
index 5236bfd..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/NonRuleBasedDamagerRepairer.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.text;
-
-import org.eclipse.jface.text.BadLocationException;
-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.presentation.IPresentationDamager;
-import org.eclipse.jface.text.presentation.IPresentationRepairer;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.swt.custom.StyleRange;
-
-public class NonRuleBasedDamagerRepairer
-	implements IPresentationDamager, IPresentationRepairer {
-
-	/** The document this object works on */
-	protected IDocument fDocument;
-	/** The default text attribute if non is returned as data by the current token */
-	protected TextAttribute fDefaultTextAttribute;
-
-	/**
-	 * Constructor for NonRuleBasedDamagerRepairer.
-	 */
-	public NonRuleBasedDamagerRepairer(TextAttribute defaultTextAttribute) {
-		Assert.isNotNull(defaultTextAttribute);
-
-		fDefaultTextAttribute = defaultTextAttribute;
-	}
-
-	/**
-	 * @see IPresentationRepairer#setDocument(IDocument)
-	 */
-	public void setDocument(IDocument document) {
-		fDocument = document;
-	}
-
-	/**
-	 * Returns the end offset of the line that contains the specified offset or
-	 * if the offset is inside a line delimiter, the end offset of the next line.
-	 *
-	 * @param offset the offset whose line end offset must be computed
-	 * @return the line end offset for the given offset
-	 * @exception BadLocationException if offset is invalid in the current document
-	 */
-	protected int endOfLineOf(int offset) throws BadLocationException {
-
-		IRegion info = fDocument.getLineInformationOfOffset(offset);
-		if (offset <= info.getOffset() + info.getLength())
-			return info.getOffset() + info.getLength();
-
-		int line = fDocument.getLineOfOffset(offset);
-		try {
-			info = fDocument.getLineInformation(line + 1);
-			return info.getOffset() + info.getLength();
-		} catch (BadLocationException x) {
-			return fDocument.getLength();
-		}
-	}
-
-	/**
-	 * @see IPresentationDamager#getDamageRegion(ITypedRegion, DocumentEvent, boolean)
-	 */
-	public IRegion getDamageRegion(
-		ITypedRegion partition,
-		DocumentEvent event,
-		boolean documentPartitioningChanged) {
-		if (!documentPartitioningChanged) {
-			try {
-
-				IRegion info = fDocument.getLineInformationOfOffset(event.getOffset());
-				int start = Math.max(partition.getOffset(), info.getOffset());
-
-				int end =
-					event.getOffset()
-						+ (event.getText() == null ? event.getLength() : event.getText().length());
-
-				if (info.getOffset() <= end && end <= info.getOffset() + info.getLength()) {
-					// optimize the case of the same line
-					end = info.getOffset() + info.getLength();
-				} else
-					end = endOfLineOf(end);
-
-				end = Math.min(partition.getOffset() + partition.getLength(), end);
-				return new Region(start, end - start);
-
-			} catch (BadLocationException x) {
-			}
-		}
-
-		return partition;
-	}
-
-	/**
-	 * @see IPresentationRepairer#createPresentation(TextPresentation, ITypedRegion)
-	 */
-	public void createPresentation(
-		TextPresentation presentation,
-		ITypedRegion region) {
-		addRange(
-			presentation,
-			region.getOffset(),
-			region.getLength(),
-			fDefaultTextAttribute);
-	}
-
-	/**
-	 * Adds style information to the given text presentation.
-	 *
-	 * @param presentation the text presentation to be extended
-	 * @param offset the offset of the range to be styled
-	 * @param length the length of the range to be styled
-	 * @param attr the attribute describing the style of the range to be styled
-	 */
-	protected void addRange(
-		TextPresentation presentation,
-		int offset,
-		int length,
-		TextAttribute attr) {
-		if (attr != null)
-			presentation.addStyleRange(
-				new StyleRange(
-					offset,
-					length,
-					attr.getForeground(),
-					attr.getBackground(),
-					attr.getStyle()));
-	}
-	
-	/**
-	 * Configures the scanner's default return token. This is the text attribute
-	 * which is returned when none is returned by the current token.
-	 */
-	public void setDefaultTextAttribute(TextAttribute defaultTextAttribute) {
-		fDefaultTextAttribute= defaultTextAttribute;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ReconcilingStrategy.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ReconcilingStrategy.java
deleted file mode 100644
index 07a0e13..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/ReconcilingStrategy.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.text;
-
-import java.util.*;
-
-import org.eclipse.jface.text.*;
-import org.eclipse.jface.text.reconciler.*;
-
-public class ReconcilingStrategy implements IReconcilingStrategy {
-	
-	private IDocument fDocument;
-	private ArrayList fParticipants = new ArrayList();
-	
-	public ReconcilingStrategy () {
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.reconciler.IReconcilingStrategy#setDocument(org.eclipse.jface.text.IDocument)
-	 */
-	public void setDocument(IDocument document) {
-		fDocument = document;
-	}
-	/* (non-Javadoc)
-	 * @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) {
-		if (fDocument == null)
-			return;
-		notifyParticipants();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.reconciler.IReconcilingStrategy#reconcile(org.eclipse.jface.text.IRegion)
-	 */
-	public void reconcile(IRegion partition) {
-		if (fDocument == null)
-			return;
-		notifyParticipants();
-	}
-	
-	private synchronized void notifyParticipants() {
-		for (int i = 0; i < fParticipants.size(); i++) {
-			((IReconcilingParticipant)fParticipants.get(i)).reconciled(fDocument);
-		}
-	}
-	
-	public void addParticipant(IReconcilingParticipant participant) {
-		fParticipants.add(participant);
-	}
-	
-	public void removeParticipant(IReconcilingParticipant participant) {
-		fParticipants.remove(participant);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/TextUtil.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/TextUtil.java
deleted file mode 100644
index faf5d80..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/TextUtil.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.text;
-
-
-
-public abstract class TextUtil {
-
-public static String createMultiLine(String text, int limit) {
-	return createMultiLine(text, limit, false);
-}
-public static String createMultiLine(
-	String text,
-	int limit,
-	boolean ignoreNewLine) {
-	StringBuffer buffer = new StringBuffer();
-	int counter = 0;
-	boolean preformatted = false;
-
-	for (int i = 0; i < text.length(); i++) {
-		char c = text.charAt(i);
-		counter++;
-		if (c == '<') {
-			if (isPreStart(text, i)) {
-				preformatted = true;
-			} else
-				if (isPreEnd(text, i)) {
-					preformatted = false;
-				}
-				else if (isParagraph(text, i)) {
-					buffer.append("\n<p>\n"); //$NON-NLS-1$
-					counter=0;
-					i+=2;
-					continue;
-				}
-		}
-		if (preformatted) {
-			if (c=='\n') counter=0;
-			buffer.append(c);
-			continue;
-		}
-		if (Character.isWhitespace(c)) {
-			if (counter == 1) {
-				counter = 0;
-				continue; // skip
-			} else
-				if (counter > limit) {
-					buffer.append('\n');
-					counter = 0;
-					i--;
-					continue;
-				}
-		}
-		if (c == '\n') {
-			if (ignoreNewLine)
-				c = ' ';
-			else
-				counter = 0;
-		}
-		buffer.append(c);
-	}
-	return buffer.toString();
-}
-private static boolean isParagraph(String text, int loc) {
-	if (text.charAt(loc)!='<') return false;
-	if (loc+2 >= text.length()) return false;
-	if (text.charAt(loc+1)!='p') return false;
-	if (text.charAt(loc+2)!='>') return false;
-	return true;
-}
-private static boolean isPreEnd(String text, int loc) {
-	if (text.charAt(loc)!='<') return false;
-	if (loc+5 >= text.length()) return false;
-	if (text.charAt(loc+1)!='/') return false;
-	if (text.charAt(loc+2)!='p') return false;
-	if (text.charAt(loc+3)!='r') return false;
-	if (text.charAt(loc+4)!='e') return false;
-	if (text.charAt(loc+5)!='>') return false;
-	return true;
-}
-private static boolean isPreStart(String text, int loc) {
-	if (text.charAt(loc)!='<') return false;
-	if (loc+4 >= text.length()) return false;
-	if (text.charAt(loc+1)!='p') return false;
-	if (text.charAt(loc+2)!='r') return false;
-	if (text.charAt(loc+3)!='e') return false;
-	if (text.charAt(loc+4)!='>') return false;
-	return true;
-}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/XMLCommentScanner.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/XMLCommentScanner.java
deleted file mode 100644
index 5c371dd..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/XMLCommentScanner.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.text;
-
-import java.util.*;
-import org.eclipse.jface.text.rules.*;
-
-public class XMLCommentScanner extends RuleBasedScanner {
-
-public XMLCommentScanner(IColorManager manager) {
-	IToken comment =
-		new Token(new Token(manager.getColor(IPDEColorConstants.P_XML_COMMENT)));
-
-	List rules = new ArrayList();
-
-	// Add rule for comments.
-	rules.add(new MultiLineRule("<!--", "-->", comment)); //$NON-NLS-1$ //$NON-NLS-2$
-
-	IRule[] result = new IRule[rules.size()];
-	rules.toArray(result);
-	setRules(result);
-}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/XMLPartitionScanner.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/XMLPartitionScanner.java
deleted file mode 100644
index 9e93795..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/XMLPartitionScanner.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.text;
-
-import org.eclipse.jface.text.rules.*;
-
-public class XMLPartitionScanner extends RuleBasedPartitionScanner {
-	public final static String XML_DEFAULT = "__xml_default"; //$NON-NLS-1$
-	public final static String XML_COMMENT = "__xml_comment"; //$NON-NLS-1$
-	public final static String XML_TAG = "__xml_tag"; //$NON-NLS-1$
-
-	public XMLPartitionScanner() {
-		IPredicateRule[] rules = new IPredicateRule[2];
-		rules[0] = new MultiLineRule("<!--", "-->", new Token(XML_COMMENT)); //$NON-NLS-1$ //$NON-NLS-2$
-		rules[1] = new XMLTagRule(new Token(XML_TAG));
-		setPredicateRules(rules);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/XMLScanner.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/XMLScanner.java
deleted file mode 100644
index 24e3c0e..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/XMLScanner.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.text;
-
-import org.eclipse.jface.text.*;
-import org.eclipse.jface.text.rules.*;
-import org.eclipse.jface.util.*;
-
-public class XMLScanner extends RuleBasedScanner {
-	private Token fProcInstr;
-
-	public XMLScanner(IColorManager manager) {
-		fProcInstr = new Token(new TextAttribute(manager
-				.getColor(IPDEColorConstants.P_PROC_INSTR)));
-		
-		IRule[] rules = new IRule[2];		
-		//Add rule for processing instructions
-		rules[0] = new SingleLineRule("<?", "?>", fProcInstr); //$NON-NLS-1$ //$NON-NLS-2$
-		// Add generic whitespace rule.
-		rules[1] = new WhitespaceRule(new XMLWhitespaceDetector());
-		setRules(rules);
-	}
-	protected void adaptToColorChange(ColorManager colorManager,PropertyChangeEvent event, Token token) {
-		colorManager.updateProperty(event.getProperty());
-		TextAttribute attr= (TextAttribute) token.getData();
-		token.setData(new TextAttribute(colorManager.getColor(event.getProperty()), attr.getBackground(), attr.getStyle()));
-
-	}
-
-	private Token getTokenAffected(PropertyChangeEvent event) {
-    	if (event.getProperty().startsWith(IPDEColorConstants.P_PROC_INSTR)) {
-    		return fProcInstr;
-    	}
-    	return (Token)fDefaultReturnToken;
-    }
-    
-    public void adaptToPreferenceChange(ColorManager colorManager, PropertyChangeEvent event) {
-    	String property= event.getProperty();
-    	if (property.startsWith(IPDEColorConstants.P_DEFAULT) || property.startsWith(IPDEColorConstants.P_PROC_INSTR))
-    		adaptToColorChange(colorManager, event, getTokenAffected(event));
-    }
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/XMLSourceViewerConfiguration.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/XMLSourceViewerConfiguration.java
deleted file mode 100644
index 8525f8d..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/XMLSourceViewerConfiguration.java
+++ /dev/null

@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.text;
-
-import org.eclipse.jface.text.*;
-import org.eclipse.jface.text.presentation.*;
-import org.eclipse.jface.text.reconciler.*;
-import org.eclipse.jface.text.rules.*;
-import org.eclipse.jface.text.source.*;
-import org.eclipse.jface.util.*;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.internal.ui.editor.*;
-import org.eclipse.ui.editors.text.TextSourceViewerConfiguration;
-
-
-public class XMLSourceViewerConfiguration extends TextSourceViewerConfiguration {
-	private AnnotationHover fAnnotationHover;
-	private XMLDoubleClickStrategy fDoubleClickStrategy;
-	private XMLTagScanner fTagScanner;
-	private XMLScanner fPdeScanner;
-	private IColorManager fColorManager;
-	private XMLSourcePage fSourcePage;
-	private MonoReconciler fReconciler;
-	private NonRuleBasedDamagerRepairer fNdr; 
-
-	private TextAttribute fXMLCommentAttr;
-	
-	public XMLSourceViewerConfiguration(XMLSourcePage page, IColorManager colorManager) {
-		fSourcePage = page;
-		setColorManager(colorManager);
-	}
-	
-	public void setColorManager(IColorManager colorManager) {
-		fColorManager = colorManager;
-	}
-	
-	public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
-		return new String[] {
-			IDocument.DEFAULT_CONTENT_TYPE,
-			XMLPartitionScanner.XML_COMMENT,
-			XMLPartitionScanner.XML_TAG };
-	}
-	
-	public ITextDoubleClickStrategy getDoubleClickStrategy(
-		ISourceViewer sourceViewer,
-		String contentType) {
-		if (fDoubleClickStrategy == null)
-			fDoubleClickStrategy = new XMLDoubleClickStrategy();
-		return fDoubleClickStrategy;
-	}
-	
-	protected XMLScanner getPDEScanner() {
-		if (fPdeScanner == null) {
-			fPdeScanner = new XMLScanner(fColorManager);
-			fPdeScanner.setDefaultReturnToken(
-				new Token(
-					new TextAttribute(fColorManager.getColor(IPDEColorConstants.P_DEFAULT))));
-		}
-		return fPdeScanner;
-	}
-	
-	public void applyColorPreferenceChange(){
-		fPdeScanner = new XMLScanner(fColorManager);
-		fPdeScanner.setDefaultReturnToken(
-				new Token(
-						new TextAttribute(fColorManager.getColor(IPDEColorConstants.P_DEFAULT))));
-		fTagScanner = new XMLTagScanner(fColorManager);
-		fTagScanner.setDefaultReturnToken(
-				new Token(new TextAttribute(fColorManager.getColor(IPDEColorConstants.P_TAG))));
-		
-	}
-	protected XMLTagScanner getPDETagScanner() {
-		if (fTagScanner == null) {
-			fTagScanner = new XMLTagScanner(fColorManager);
-			fTagScanner.setDefaultReturnToken(
-				new Token(new TextAttribute(fColorManager.getColor(IPDEColorConstants.P_TAG))));
-		}
-		return fTagScanner;
-	}
-	
-	public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) {
-		PresentationReconciler reconciler = new PresentationReconciler();
-
-		DefaultDamagerRepairer fDr = new DefaultDamagerRepairer(getPDEScanner());
-		reconciler.setDamager(fDr, IDocument.DEFAULT_CONTENT_TYPE);
-		reconciler.setRepairer(fDr, IDocument.DEFAULT_CONTENT_TYPE);
-
-		fDr = new DefaultDamagerRepairer(getPDETagScanner());
-		reconciler.setDamager(fDr, XMLPartitionScanner.XML_TAG);
-		reconciler.setRepairer(fDr, XMLPartitionScanner.XML_TAG);
-
-		fXMLCommentAttr = new TextAttribute(fColorManager.getColor(IPDEColorConstants.P_XML_COMMENT));
-		fNdr =
-			new NonRuleBasedDamagerRepairer(fXMLCommentAttr);
-		reconciler.setDamager(fNdr, XMLPartitionScanner.XML_COMMENT);
-		reconciler.setRepairer(fNdr, XMLPartitionScanner.XML_COMMENT);
-
-		return reconciler;
-	}
-	
-	public IAnnotationHover getAnnotationHover(ISourceViewer sourceViewer) {
-		if (fAnnotationHover == null)
-			fAnnotationHover = new AnnotationHover();
-		return fAnnotationHover;
-	}
-	
-	public IReconciler getReconciler(ISourceViewer sourceViewer) {
-		if (fReconciler == null) {
-			IBaseModel model = fSourcePage.getInputContext().getModel();
-			if (model instanceof IReconcilingParticipant) {
-				ReconcilingStrategy strategy = new ReconcilingStrategy();
-				strategy.addParticipant((IReconcilingParticipant)model);
-				if (fSourcePage.getContentOutline() instanceof IReconcilingParticipant)
-					strategy.addParticipant((IReconcilingParticipant)fSourcePage.getContentOutline());
-				fReconciler = new MonoReconciler(strategy, false);
-				fReconciler.setDelay(500);
-			}
-		}
-		return fReconciler;
-	}
-
-	public IColorManager getColorManager(){
-		return fColorManager;	
-	}
-	
-	/**
-	 * Preference colors have changed.  
-	 * Update the default tokens of the scanners.
-	 */
-	public void adaptToPreferenceChange(PropertyChangeEvent event) {
-		if (fTagScanner == null) {
-			return; //property change before the editor is fully created
-		}
-		fTagScanner.adaptToPreferenceChange((ColorManager)fColorManager, event);
-		fPdeScanner.adaptToPreferenceChange((ColorManager)fColorManager, event);
-		String property= event.getProperty();
-		if (property.startsWith(IPDEColorConstants.P_XML_COMMENT)) {
-			adaptToColorChange(event);
-			fNdr.setDefaultTextAttribute(fXMLCommentAttr);
-		} 
-	}
-	
-	 /**
-     * Update the text attributes associated with the tokens of this scanner as a color preference has been changed. 
-     */
-    private void adaptToColorChange(PropertyChangeEvent event) {
-    	((ColorManager)fColorManager).updateProperty(event.getProperty()); 
-    	fXMLCommentAttr= new TextAttribute(((ColorManager)fColorManager).getColor(event.getProperty()), fXMLCommentAttr.getBackground(), fXMLCommentAttr.getStyle());
-    }
- 
-	
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/XMLTagRule.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/XMLTagRule.java
deleted file mode 100644
index 561b57e..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/XMLTagRule.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.text;
-
-import org.eclipse.jface.text.rules.*;
-
-public class XMLTagRule extends MultiLineRule {
-
-public XMLTagRule(IToken token) {
-	super("<", ">", token); //$NON-NLS-1$ //$NON-NLS-2$
-}
-protected boolean sequenceDetected(
-	ICharacterScanner scanner,
-	char[] sequence,
-	boolean eofAllowed) {
-	int c = scanner.read();
-	if (sequence[0] == '<') {
-		if (c == '?') {
-			// processing instruction - abort
-			scanner.unread();
-			return false;
-		}
-		if (c == '!') {
-			scanner.unread();
-			// comment - abort
-			return false;
-		}
-	} else if (sequence[0] == '>') {
-		scanner.unread();
-	}
-
-	return super.sequenceDetected(scanner, sequence, eofAllowed);
-}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/XMLTagScanner.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/XMLTagScanner.java
deleted file mode 100644
index 9ec7666..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/XMLTagScanner.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.text;
-
-import org.eclipse.jface.text.*;
-import org.eclipse.jface.text.rules.*;
-import org.eclipse.jface.util.*;
-
-
-
-public class XMLTagScanner extends RuleBasedScanner {
-	private Token fStringToken;
-	public XMLTagScanner(IColorManager manager) {
-		fStringToken = new Token(new TextAttribute(manager.getColor(IPDEColorConstants.P_STRING)));
-		
-		IRule[] rules = new IRule[3];
-		// Add rule for single and double quotes
-		rules[0] = new SingleLineRule("\"", "\"", fStringToken, '\\'); //$NON-NLS-1$ //$NON-NLS-2$
-		rules[1] = new SingleLineRule("'", "'", fStringToken, '\\'); //$NON-NLS-1$ //$NON-NLS-2$
-		// Add generic whitespace rule.
-		rules[2] = new WhitespaceRule(new XMLWhitespaceDetector());
-		setRules(rules);
-	}
-	protected void adaptToColorChange(ColorManager colorManager, PropertyChangeEvent event, Token token) {
-		colorManager.updateProperty(event.getProperty());
-		TextAttribute attr= (TextAttribute) token.getData();
-		token.setData(new TextAttribute(colorManager.getColor(event.getProperty()), attr.getBackground(), attr.getStyle()));
-	}
-
-    public void adaptToPreferenceChange(ColorManager colorManager,PropertyChangeEvent event) {
-    	String property= event.getProperty();
-    	if (property.startsWith(IPDEColorConstants.P_TAG) || property.startsWith(IPDEColorConstants.P_STRING)) {
-    			adaptToColorChange(colorManager, event, getTokenAffected(event));
-    	}
-    }
-    
-    private Token getTokenAffected(PropertyChangeEvent event) {
-    	String property= event.getProperty();
-    	if (property.startsWith(IPDEColorConstants.P_STRING)) 
-    		return fStringToken;
-    	return (Token)fDefaultReturnToken;
-    }
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/XMLWhitespaceDetector.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/XMLWhitespaceDetector.java
deleted file mode 100644
index 258bd30..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/text/XMLWhitespaceDetector.java
+++ /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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.editor.text;
-
-import org.eclipse.jface.text.rules.IWhitespaceDetector;
-
-
-public class XMLWhitespaceDetector implements IWhitespaceDetector {
-
-	public boolean isWhitespace(char c) {
-		return (c == ' ' || c == '\t' || c == '\n' || c == '\r');
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/DefaultContentProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/DefaultContentProvider.java
deleted file mode 100644
index be327ad..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/DefaultContentProvider.java
+++ /dev/null

@@ -1,22 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.elements;
-
-import org.eclipse.jface.viewers.*;
-
-public class DefaultContentProvider implements IContentProvider {
-
-public DefaultContentProvider() {
-	super();
-}
-public void dispose() {}
-public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/DefaultElement.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/DefaultElement.java
deleted file mode 100644
index 3d200ee..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/DefaultElement.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.elements;
-
-import org.eclipse.swt.graphics.Image;
-
-public abstract class DefaultElement implements IPDEElement {
-
-public Object[] getChildren() {
-	return null;
-}
-public Image getImage() {
-	return null;
-}
-public String getLabel() {
-	return ""; //$NON-NLS-1$
-}
-public Object getParent() {
-	return null;
-}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/DefaultTableProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/DefaultTableProvider.java
deleted file mode 100644
index 7790291..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/DefaultTableProvider.java
+++ /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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.elements;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-/**
- * @version 	1.0
- * @author
- */
-public abstract class DefaultTableProvider extends DefaultContentProvider implements IStructuredContentProvider {
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/ElementLabelProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/ElementLabelProvider.java
deleted file mode 100644
index a7caca1..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/ElementLabelProvider.java
+++ /dev/null

@@ -1,34 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.elements;
-
-import org.eclipse.swt.graphics.*;
-import org.eclipse.jface.viewers.*;
-
-public class ElementLabelProvider extends LabelProvider {
-	public static final ElementLabelProvider INSTANCE = new ElementLabelProvider();
-
-public ElementLabelProvider() {
-	super();
-}
-public Image getImage(Object element) {
-   if (element instanceof IPDEElement) {
-	   return ((IPDEElement)element).getImage();
-   }
-   return super.getImage(element);
-}
-public String getText(Object element) {
-   if (element instanceof IPDEElement) {
-	   return ((IPDEElement)element).getLabel();
-   }
-   return super.getText(element);
-}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/ElementList.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/ElementList.java
deleted file mode 100644
index 32615da..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/ElementList.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.elements;
-
-import java.util.*;
-import org.eclipse.swt.graphics.*;
-
-
-public class ElementList extends NamedElement {
-	private Vector children = new Vector();
-
-public ElementList(String name) {
-	super(name);
-}
-public ElementList(String name, Image icon) {
-	super(name, icon);
-}
-public ElementList(String name, Image icon, IPDEElement parent) {
-	super(name, icon, parent);
-}
-public void add(IPDEElement child) {
-	children.addElement(child);
-}
-public Object[] getChildren() {
-	if (children.size()==0) return new Object[0];
-	Object[] result = new Object[children.size()];
-	children.copyInto(result);
-	return result;
-}
-public void remove(IPDEElement child) {
-	children.remove(child);
-}
-public int size() {
-	return children.size();
-}
-public String toString() {
-	return children.toString();
-}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/IPDEElement.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/IPDEElement.java
deleted file mode 100644
index 6f455db..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/IPDEElement.java
+++ /dev/null

@@ -1,24 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.elements;
-
-import org.eclipse.swt.graphics.*;
-
-public interface IPDEElement {
-
-	public Object[] getChildren();
-
-	public Image getImage();
-
-	public String getLabel();
-
-	public Object getParent();
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/ListContentProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/ListContentProvider.java
deleted file mode 100644
index 4ed21e1..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/ListContentProvider.java
+++ /dev/null

@@ -1,26 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.elements;
-
-import org.eclipse.jface.viewers.*;
-
-public class ListContentProvider extends DefaultContentProvider implements IStructuredContentProvider {
-
-public ListContentProvider() {
-	super();
-}
-public Object[] getElements(Object element) {
-	if (element instanceof IPDEElement) {
-		return ((IPDEElement)element).getChildren();
-	}
-	return null;
-}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/NamedElement.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/NamedElement.java
deleted file mode 100644
index fb9f826..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/NamedElement.java
+++ /dev/null

@@ -1,51 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.elements;
-
-import org.eclipse.swt.graphics.Image;
-
-public class NamedElement extends DefaultElement {
-	protected Image image;
-
-	private String name;
-
-	private IPDEElement parent;
-
-	public NamedElement(String name) {
-		this(name, null, null);
-	}
-
-	public NamedElement(String name, Image icon) {
-		this(name, icon, null);
-	}
-
-	public NamedElement(String name, Image image, IPDEElement parent) {
-		this.name = name;
-		this.image = image;
-		this.parent = parent;
-	}
-
-	public Image getImage() {
-		return image;
-	}
-
-	public String getLabel() {
-		return name;
-	}
-
-	public Object getParent() {
-		return parent;
-	}
-
-	public String toString() {
-		return getLabel();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/TreeContentProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/TreeContentProvider.java
deleted file mode 100644
index c53a3a8..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/elements/TreeContentProvider.java
+++ /dev/null

@@ -1,51 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.elements;
-
-import org.eclipse.jface.viewers.*;
-
-public class TreeContentProvider extends ListContentProvider implements ITreeContentProvider {
-
-public TreeContentProvider() {
-	super();
-}
-public void dispose() {}
-public Object[] getChildren(Object element) {
-	if (element instanceof IPDEElement) {
-		return ((IPDEElement)element).getChildren();
-	}
-	return null;
-}
-public Object[] getElements(Object element) {
-	if (element instanceof IPDEElement) {
-		return ((IPDEElement)element).getChildren();
-	}
-	return null;
-}
-public Object getParent(Object element) {
-	if (element instanceof IPDEElement) {
-		return ((IPDEElement)element).getParent();
-	}
-	return null;
-}
-public boolean hasChildren(java.lang.Object element) {
-	if (element instanceof IPDEElement) {
-		Object [] children = ((IPDEElement)element).getChildren();
-		return children != null && children.length > 0;
-	}
-	return false;
-}
-public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-}
-public boolean isDeleted(Object element) {
-	return false;
-}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/AbstractPDELaunchConfigurationTabGroup.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/AbstractPDELaunchConfigurationTabGroup.java
deleted file mode 100644
index 38827c7..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/AbstractPDELaunchConfigurationTabGroup.java
+++ /dev/null

@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.pde.ui.launcher.IPDELauncherConstants;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.widgets.Display;
-
-public abstract class AbstractPDELaunchConfigurationTabGroup extends
-		AbstractLaunchConfigurationTabGroup {
-
-	/**
-	 * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup#initializeFrom(ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		final ILaunchConfiguration config = configuration;
-		final ILaunchConfigurationTab[] tabs = getTabs();
-		BusyIndicator.showWhile(Display.getCurrent(), new Runnable() {
-			public void run() {
-				try {
-					if (config instanceof ILaunchConfigurationWorkingCopy) {
-						checkBackwardCompatibility(
-							(ILaunchConfigurationWorkingCopy) config);
-					}
-				} catch (CoreException e) {
-				}
-				for (int i = 0; i < tabs.length; i++) {
-					tabs[i].initializeFrom(config);
-				}
-			}
-		});
-	}
-	
-	private void checkBackwardCompatibility(ILaunchConfigurationWorkingCopy wc) throws CoreException {
-		String id = wc.getAttribute(
-						IJavaLaunchConfigurationConstants.ATTR_SOURCE_PATH_PROVIDER,
-						(String) null);
-		if (id == null) {
-			wc.setAttribute(
-				IJavaLaunchConfigurationConstants.ATTR_SOURCE_PATH_PROVIDER,
-				"org.eclipse.pde.ui.workbenchClasspathProvider"); //$NON-NLS-1$
-		}
-		
-		String value = wc.getAttribute("vmargs", (String)null); //$NON-NLS-1$
-		if (value != null) {
-			wc.setAttribute("vmargs", (String)null); //$NON-NLS-1$
-			wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, value);
-		}
-		
-		value = wc.getAttribute("progargs", (String)null); //$NON-NLS-1$
-		if (value != null) {
-			wc.setAttribute("progargs", (String)null); //$NON-NLS-1$
-			wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, value);
-		}
-		
-		value = wc.getAttribute(IPDELauncherConstants.LOCATION + "0", (String)null); //$NON-NLS-1$
-		if (value != null) {
-			wc.setAttribute(IPDELauncherConstants.LOCATION + "0", (String)null); //$NON-NLS-1$
-			wc.setAttribute(IPDELauncherConstants.LOCATION, value);			
-		}
-		
-		LaunchPluginValidator.checkBackwardCompatibility(wc, false);	
-		wc.doSave();
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTabGroup#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
-		super.setDefaults(configuration);
-		configuration.setAttribute(
-			IJavaLaunchConfigurationConstants.ATTR_SOURCE_PATH_PROVIDER,
-			"org.eclipse.pde.ui.workbenchClasspathProvider"); //$NON-NLS-1$
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/AbstractPluginBlock.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/AbstractPluginBlock.java
deleted file mode 100644
index c83f135..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/AbstractPluginBlock.java
+++ /dev/null

@@ -1,558 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.TreeSet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTreeViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.window.Window;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.core.plugin.IFragmentModel;
-import org.eclipse.pde.core.plugin.IPluginBase;
-import org.eclipse.pde.core.plugin.IPluginImport;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.ModelEntry;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.PluginModelManager;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
-import org.eclipse.pde.internal.ui.elements.NamedElement;
-import org.eclipse.pde.internal.ui.util.PersistablePluginObject;
-import org.eclipse.pde.internal.ui.util.SWTUtil;
-import org.eclipse.pde.internal.ui.wizards.ListUtil;
-import org.eclipse.pde.ui.launcher.AbstractLauncherTab;
-import org.eclipse.pde.ui.launcher.IPDELauncherConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-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.ui.IWorkingSet;
-import org.eclipse.ui.IWorkingSetManager;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.IWorkingSetSelectionDialog;
-
-public abstract class AbstractPluginBlock {
-
-	protected AbstractLauncherTab fTab;
-	
-	protected CheckboxTreeViewer fPluginTreeViewer;
-	protected NamedElement fWorkspacePlugins;
-	protected NamedElement fExternalPlugins;
-	protected IPluginModelBase[] fExternalModels;
-	protected IPluginModelBase[] fWorkspaceModels;
-	protected int fNumExternalChecked;
-	protected int fNumWorkspaceChecked;
-
-	private Button fIncludeOptionalButton;
-	protected Button fAddWorkspaceButton;
-	
-	private Button fSelectAllButton;
-	private Button fDeselectButton;
-	private Button fWorkingSetButton;
-	private Button fAddRequiredButton;
-	private Button fDefaultsButton;
-	
-	private Listener fListener = new Listener();
-
-	private Label fCounter;
-	
-	class Listener extends SelectionAdapter {
-		public void widgetSelected(SelectionEvent e) {
-			Object source = e.getSource();
-			if (source == fSelectAllButton) {
-				toggleGroups(true);
-			} else if (source == fDeselectButton) {
-				toggleGroups(false);
-			} else if (source == fWorkingSetButton) {
-				handleWorkingSets();
-			} else if (source == fAddRequiredButton) {
-				computeSubset();
-			} else if (source == fDefaultsButton) {
-				handleRestoreDefaults();
-			}
-			fTab.updateLaunchConfigurationDialog();
-		}
-	}
-
-	class PluginContentProvider extends DefaultContentProvider implements
-			ITreeContentProvider {
-		public boolean hasChildren(Object parent) {
-			return !(parent instanceof IPluginModelBase);
-		}
-
-		public Object[] getChildren(Object parent) {
-			if (parent == fExternalPlugins)
-				return fExternalModels;
-			if (parent == fWorkspacePlugins)
-				return fWorkspaceModels;
-			return new Object[0];
-		}
-
-		public Object getParent(Object child) {
-			return null;
-		}
-
-		public Object[] getElements(Object input) {
-			return new Object[] { fWorkspacePlugins, fExternalPlugins };
-		}
-	}
-	
-	public AbstractPluginBlock(AbstractLauncherTab tab) {
-		fTab = tab;
-		PDEPlugin.getDefault().getLabelProvider().connect(this);
-		fExternalModels = PDECore.getDefault().getModelManager().getExternalModels();
-		fWorkspaceModels = PDECore.getDefault().getModelManager().getWorkspaceModels();
-	}
-	
-	protected void updateCounter() {
-		if (fCounter != null) {
-			int checked = fNumExternalChecked + fNumWorkspaceChecked;
-			int total = fWorkspaceModels.length + fExternalModels.length;
-			fCounter.setText(NLS.bind(PDEUIMessages.AbstractPluginBlock_counter, new Integer(checked), new Integer(total)));
-		}
-	}
-
-	public void createControl(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		createPluginViewer(composite);
-		createButtonContainer(composite);
-		
-		fIncludeOptionalButton = new Button(composite, SWT.CHECK);
-		fIncludeOptionalButton.setText(PDEUIMessages.AdvancedLauncherTab_includeOptional); 
-		GridData gd = new GridData();
-		gd.horizontalSpan = 2;
-		fIncludeOptionalButton.setLayoutData(gd);
-		fIncludeOptionalButton.addSelectionListener(fListener);
-		
-		fAddWorkspaceButton = new Button(composite, SWT.CHECK);
-		fAddWorkspaceButton.setText(PDEUIMessages.AdvancedLauncherTab_addNew); 
-		fAddWorkspaceButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fAddWorkspaceButton.addSelectionListener(fListener);
-		
-		Button button = new Button(composite, SWT.PUSH);
-		button.setText(PDEUIMessages.AdvancedLauncherTab_validatePlugins); 
-		button.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-		button.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleValidatePlugins();
-			}
-		});		
-		SWTUtil.setButtonDimensionHint(button);
-	}
-	
-	protected ILabelProvider getLabelProvider() {
-		return PDEPlugin.getDefault().getLabelProvider();
-	}
-	
-	protected void createPluginViewer(Composite composite) {
-		fPluginTreeViewer = new CheckboxTreeViewer(composite, SWT.BORDER|SWT.FULL_SELECTION);
-		fPluginTreeViewer.setContentProvider(new PluginContentProvider());
-		fPluginTreeViewer.setLabelProvider(getLabelProvider());
-		fPluginTreeViewer.setAutoExpandLevel(2);
-		fPluginTreeViewer.addCheckStateListener(new ICheckStateListener() {
-			public void checkStateChanged(final CheckStateChangedEvent event) {
-				Object element = event.getElement();
-				if (element instanceof IPluginModelBase) {
-					handleCheckStateChanged(event);
-				} else {
-					handleGroupStateChanged(element, event.getChecked());
-				}
-				fTab.updateLaunchConfigurationDialog();
-			}
-		});
-		fPluginTreeViewer.setSorter(new ListUtil.PluginSorter() {
-			public int category(Object obj) {
-				if (obj == fWorkspacePlugins)
-					return -1;
-				return 0;
-			}
-		});
-
-		fPluginTreeViewer.getTree().setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		Image pluginsImage =
-			PDEPlugin.getDefault().getLabelProvider().get(
-				PDEPluginImages.DESC_REQ_PLUGINS_OBJ);
-
-		fWorkspacePlugins =
-			new NamedElement(
-				PDEUIMessages.AdvancedLauncherTab_workspacePlugins, 
-				pluginsImage);
-		fExternalPlugins =
-			new NamedElement(
-				PDEUIMessages.PluginsTab_target, 
-				pluginsImage);
-	}
-
-	private void createButtonContainer(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = layout.marginWidth = 0;
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(GridData.FILL_VERTICAL));
-	
-		fSelectAllButton = createButton(composite, PDEUIMessages.AdvancedLauncherTab_selectAll); 		
-		fDeselectButton = createButton(composite, PDEUIMessages.AdvancedLauncherTab_deselectAll); 		
-		fWorkingSetButton = createButton(composite, PDEUIMessages.AdvancedLauncherTab_workingSet); 
-		fAddRequiredButton = createButton(composite, PDEUIMessages.AdvancedLauncherTab_subset); 
-		fDefaultsButton = createButton(composite, PDEUIMessages.AdvancedLauncherTab_defaults); 
-		
-		fCounter = new Label(composite, SWT.NONE);
-		fCounter.setLayoutData(new GridData(GridData.FILL_BOTH|GridData.VERTICAL_ALIGN_END));
-		updateCounter();
-	}
-	
-	private Button createButton(Composite composite, String text) {
-		Button button = new Button(composite, SWT.PUSH);
-		button.setText(text);
-		button.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		SWTUtil.setButtonDimensionHint(button);
-		button.addSelectionListener(fListener);
-		return button;
-	}
-	
-	protected void handleCheckStateChanged(CheckStateChangedEvent event) {
-		IPluginModelBase model = (IPluginModelBase)event.getElement();
-		if (model.getUnderlyingResource() == null) {
-			if (event.getChecked()) {
-				fNumExternalChecked += 1;
-			} else {
-				fNumExternalChecked -= 1;
-			}
-		} else {
-			if (event.getChecked()) {
-				fNumWorkspaceChecked += 1;
-			} else {
-				fNumWorkspaceChecked -= 1;
-			}
-		}
-		adjustGroupState();
-	}
-
-	protected void handleGroupStateChanged(Object group, boolean checked) {
-		fPluginTreeViewer.setSubtreeChecked(group, checked);
-		fPluginTreeViewer.setGrayed(group, false);
-
-		if (group == fWorkspacePlugins)
-			fNumWorkspaceChecked = checked ? fWorkspaceModels.length : 0;
-		else if (group == fExternalPlugins)
-			fNumExternalChecked = checked ? fExternalModels.length : 0;
-
-	}
-	
-	private void handleValidatePlugins() {
-		PluginValidationOperation op = createValidationOperation();
-		try {
-			PlatformUI.getWorkbench().getProgressService().busyCursorWhile(op);
-		} catch (InvocationTargetException e) {
-		} catch (InterruptedException e) {
-		} finally {
-			if (op.hasErrors())
-				new PluginStatusDialog(fTab.getControl().getShell(), op).open();
-			else
-				MessageDialog.openInformation(fTab.getControl().getShell(), PDEUIMessages.AdvancedLauncherTab_pluginValidation, PDEUIMessages.AdvancedLauncherTab_noProblems); // 
-		}
-	}
-	
-	protected PluginValidationOperation createValidationOperation() {
-		return new PluginValidationOperation(getPluginsToValidate());
-	}
-	
-	protected IPluginModelBase[] getPluginsToValidate() {
-		if (!fPluginTreeViewer.getTree().isEnabled())
-			return PDECore.getDefault().getModelManager().getPlugins();
-		
-		Map map = new HashMap();
-		Object[] objects = fPluginTreeViewer.getCheckedElements();
-		for (int i = 0; i < objects.length; i++) {
-			if (objects[i] instanceof IPluginModelBase) {
-				IPluginModelBase model = (IPluginModelBase)objects[i];
-				String id = model.getPluginBase().getId();
-				if (id == null)
-					continue;
-				if (!map.containsKey(id) || model.getUnderlyingResource() != null)
-					map.put(id, model);
-			}
-		}
-		return (IPluginModelBase[])map.values().toArray(new IPluginModelBase[map.size()]);
-	}
-	
-	protected void toggleGroups(boolean select) {
-		handleGroupStateChanged(fWorkspacePlugins, select);
-		handleGroupStateChanged(fExternalPlugins, select);
-	}
-
-	private void handleWorkingSets() {
-		IWorkingSetManager workingSetManager = PlatformUI.getWorkbench().getWorkingSetManager();
-		IWorkingSetSelectionDialog dialog = workingSetManager.createWorkingSetSelectionDialog(fTab.getControl().getShell(), true);
-		if (dialog.open() == Window.OK) {
-			String[] ids = getPluginIDs(dialog.getSelection());
-			PluginModelManager manager = PDECore.getDefault().getModelManager();
-			for (int i = 0; i < ids.length; i++) {
-				ModelEntry entry = manager.findEntry(ids[i]);
-				if (entry != null) {
-					IPluginModelBase model = entry.getActiveModel();
-					if (!fPluginTreeViewer.getChecked(model)) {
-						setChecked(model, true);
-						if (model.getUnderlyingResource() == null)
-							fNumExternalChecked += 1;
-						else
-							fNumWorkspaceChecked += 1;
-					}
-				}
-			}
-			adjustGroupState();
-		}
-	}
-	
-	protected void setChecked(IPluginModelBase model, boolean checked) {
-		fPluginTreeViewer.setChecked(model, checked);
-	}
-	
-	private String[] getPluginIDs(IWorkingSet[] workingSets) {
-		HashSet set = new HashSet();
-		for (int i = 0; i < workingSets.length; i++) {
-			IAdaptable[] elements = workingSets[i].getElements();
-			for (int j = 0; j < elements.length; j++) {
-				Object element = elements[j];
-				if (element instanceof PersistablePluginObject) {
-					set.add(((PersistablePluginObject)element).getPluginID());
-				} else {
-					if (element instanceof IJavaProject)
-						element = ((IJavaProject)element).getProject();
-					if (element instanceof IProject) {
-						IPluginModelBase model = PDECore.getDefault().getModelManager().findModel((IProject)element);
-						if (model != null)
-							set.add(model.getPluginBase().getId());
-					}
-				}
-			}
-		}
-		return (String[])set.toArray(new String[set.size()]);
-	}
-	
-	public void initializeFrom(ILaunchConfiguration config) throws CoreException {
-		fIncludeOptionalButton.setSelection(config.getAttribute(IPDELauncherConstants.INCLUDE_OPTIONAL, true));
-		fAddWorkspaceButton.setSelection(config.getAttribute(IPDELauncherConstants.AUTOMATIC_ADD, true));
-
-		if (fPluginTreeViewer.getInput() == null) {
-			fPluginTreeViewer.setUseHashlookup(true);
-			fPluginTreeViewer.setInput(PDEPlugin.getDefault());
-			fPluginTreeViewer.reveal(fWorkspacePlugins);
-		}
-	}
-	
-	private void computeSubset() {
-		Object[] checked = fPluginTreeViewer.getCheckedElements();
-		TreeMap map = new TreeMap();
-		for (int i = 0; i < checked.length; i++) {
-			if (checked[i] instanceof IPluginModelBase) {
-				IPluginModelBase model = (IPluginModelBase) checked[i];
-				addPluginAndDependencies(model, map);
-			}
-		}
-		if (!PDECore.getDefault().getModelManager().isOSGiRuntime()) {
-			addPluginAndDependencies(findPlugin("org.eclipse.core.runtime"), map); //$NON-NLS-1$
-		}
-
-		checked = map.values().toArray();
-
-		setCheckedElements(checked);
-		fNumExternalChecked = 0;
-		fNumWorkspaceChecked = 0;
-		for (int i = 0; i < checked.length; i++) {
-			if (((IPluginModelBase)checked[i]).getUnderlyingResource() != null)
-				fNumWorkspaceChecked += 1;
-			else
-				fNumExternalChecked += 1;
-		}
-		adjustGroupState();
-	}
-	
-	protected void setCheckedElements(Object[] checked) {
-		fPluginTreeViewer.setCheckedElements(checked);
-	}
-
-	private void addPluginAndDependencies(IPluginModelBase model, TreeMap map) {
-		if (model == null)
-			return;
-
-		String id = model.getPluginBase().getId();
-		if (map.containsKey(id))
-			return;
-
-		map.put(id, model);
-
-		if (model instanceof IFragmentModel) {
-			IPluginModelBase parent =
-				findPlugin(((IFragmentModel) model).getFragment().getPluginId());
-			addPluginAndDependencies(parent, map);
-		} else {
-			IFragmentModel[] fragments = findFragments(model.getPluginBase());
-			for (int i = 0; i < fragments.length; i++) {
-				addPluginAndDependencies(fragments[i], map);
-			}
-		}
-
-		IPluginImport[] imports = model.getPluginBase().getImports();
-		for (int i = 0; i < imports.length; i++) {
-			if (imports[i].isOptional() && !fIncludeOptionalButton.getSelection())
-				continue;
-			addPluginAndDependencies(findPlugin(imports[i].getId()), map);
-		}
-		
-	}
-
-	private IPluginModelBase findPlugin(String id) {
-		PluginModelManager manager = PDECore.getDefault().getModelManager();
-		ModelEntry entry = manager.findEntry(id);
-		if (entry != null) {
-			IPluginModelBase model = entry.getActiveModel();
-			if (fPluginTreeViewer.getChecked(model))
-				return model;
-
-			model = entry.getExternalModel();
-			if (model != null && fPluginTreeViewer.getChecked(model)) {
-				return model;
-			}
-			return entry.getActiveModel();
-		}
-		return null;
-	}
-
-	private IFragmentModel[] findFragments(IPluginBase plugin) {
-		ModelEntry[] entries = PDECore.getDefault().getModelManager().getEntries();
-		ArrayList result = new ArrayList();
-		for (int i = 0; i < entries.length; i++) {
-			ModelEntry entry = entries[i];
-			IPluginModelBase model = entry.getActiveModel();
-			if ("org.eclipse.ui.workbench.compatibility".equals(model.getPluginBase().getId())) //$NON-NLS-1$
-				continue;
-			if (model instanceof IFragmentModel) {
-				String id = ((IFragmentModel) model).getFragment().getPluginId();
-				if (id.equals(plugin.getId())) {
-					if (fPluginTreeViewer.getChecked(model)) {
-						result.add(model);
-					} else {
-						model = entry.getExternalModel();
-						if (model != null && fPluginTreeViewer.getChecked(model)) {
-							result.add(model);
-						} else {
-							result.add(entry.getActiveModel());
-						}
-					}
-				}
-			}
-		}
-		return (IFragmentModel[]) result.toArray(new IFragmentModel[result.size()]);
-	}
-
-	protected void adjustGroupState() {
-		fPluginTreeViewer.setChecked(fExternalPlugins, fNumExternalChecked > 0);
-		fPluginTreeViewer.setGrayed(
-			fExternalPlugins,
-			fNumExternalChecked > 0 && fNumExternalChecked < fExternalModels.length);
-		fPluginTreeViewer.setChecked(fWorkspacePlugins, fNumWorkspaceChecked > 0);
-		fPluginTreeViewer.setGrayed(
-			fWorkspacePlugins,
-			fNumWorkspaceChecked > 0 && fNumWorkspaceChecked < fWorkspaceModels.length);
-	}
-
-	public void performApply(ILaunchConfigurationWorkingCopy config) {
-		config.setAttribute(IPDELauncherConstants.INCLUDE_OPTIONAL, fIncludeOptionalButton.getSelection());
-		config.setAttribute(IPDELauncherConstants.AUTOMATIC_ADD, fAddWorkspaceButton.getSelection());
-		savePluginState(config);
-		updateCounter();
-	}
-	
-	protected abstract void savePluginState(ILaunchConfigurationWorkingCopy config);
-	
-	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
-		config.setAttribute(IPDELauncherConstants.INCLUDE_OPTIONAL, true);
-		config.setAttribute(IPDELauncherConstants.AUTOMATIC_ADD, true);
-	}
-	
-	public void enableViewer(boolean enable) {
-		fPluginTreeViewer.getTree().setEnabled(enable);
-		fAddRequiredButton.setEnabled(enable);
-		fDefaultsButton.setEnabled(enable);
-		fWorkingSetButton.setEnabled(enable);
-		fSelectAllButton.setEnabled(enable);
-		fDeselectButton.setEnabled(enable);
-		fIncludeOptionalButton.setEnabled(enable);
-		fAddWorkspaceButton.setEnabled(enable);
-		fCounter.setEnabled(enable);
-	}
-	
-	public void dispose() {
-		PDEPlugin.getDefault().getLabelProvider().disconnect(this);
-	}
-	
-	protected boolean isEnabled() {
-		return fPluginTreeViewer.getTree().isEnabled();
-	}
-	
-	protected void handleRestoreDefaults() {
-		TreeSet wtable = new TreeSet();
-		fNumWorkspaceChecked = 0;
-		fNumExternalChecked = 0;
-
-		for (int i = 0; i < fWorkspaceModels.length; i++) {
-			IPluginModelBase model = fWorkspaceModels[i];
-			fNumWorkspaceChecked += 1;
-			String id = model.getPluginBase().getId();
-			if (id != null)
-				wtable.add(model.getPluginBase().getId());
-		}
-		fPluginTreeViewer.setSubtreeChecked(fWorkspacePlugins, true);
-
-		fNumExternalChecked = 0;
-		for (int i = 0; i < fExternalModels.length; i++) {
-			IPluginModelBase model = fExternalModels[i];
-			boolean masked = wtable.contains(model.getPluginBase().getId());
-			if (!masked && model.isEnabled()) {
-				fPluginTreeViewer.setChecked(model, true);
-				fNumExternalChecked += 1;
-			}
-		}
-		adjustGroupState();
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/ApplicationSelectionDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/ApplicationSelectionDialog.java
deleted file mode 100644
index 90010c4..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/ApplicationSelectionDialog.java
+++ /dev/null

@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-
-import org.eclipse.debug.core.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-
-public class ApplicationSelectionDialog extends Dialog {
-	
-	private String fMode;
-	private Combo applicationCombo;
-	private String[] fApplicationNames;
-	private String fSelectedApplication;
-
-	public ApplicationSelectionDialog(Shell parentShell, String[] applicationNames,  String mode) {
-		super(parentShell);
-		fMode = mode;
-		fApplicationNames = applicationNames;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite)
-	 */
-	protected void createButtonsForButtonBar(Composite parent) {
-		createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-		createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, true);
-	}
-	
-	protected Control createDialogArea(Composite parent) {
-		Composite container = (Composite) super.createDialogArea(parent);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginWidth = layout.marginHeight = 9;
-		container.setLayout(layout);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.heightHint = 100;
-		container.setLayoutData(gd);
-
-		Label label = new Label(container, SWT.NONE);
-		if (fMode.equals(ILaunchManager.DEBUG_MODE))
-			label.setText(PDEUIMessages.ApplicationSelectionDialog_debug); 
-		else 
-			label.setText(PDEUIMessages.ApplicationSelectionDialog_run); 
-				
-		applicationCombo = new Combo(container, SWT.READ_ONLY|SWT.DROP_DOWN);
-		applicationCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		applicationCombo.setItems(fApplicationNames);
-		
-		String defaultApp = LaunchConfigurationHelper.getDefaultApplicationName();
-		if (applicationCombo.indexOf(defaultApp) == -1)
-			applicationCombo.add(defaultApp);
-		
-		applicationCombo.setText(applicationCombo.getItem(0));
-		
-		getShell().setText(fMode.equals(ILaunchManager.DEBUG_MODE) ? PDEUIMessages.ApplicationSelectionDialog_dtitle : PDEUIMessages.ApplicationSelectionDialog_rtitle); // 
-		Dialog.applyDialogFont(container);
-		return container;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-	 */
-	protected void okPressed() {
-		fSelectedApplication = applicationCombo.getText();
-		super.okPressed();
-	}
-	
-	public String getSelectedApplication() {
-		if (fSelectedApplication.equals(LaunchConfigurationHelper.getDefaultApplicationName()))
-			return null;
-		return fSelectedApplication;
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/BaseBlock.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/BaseBlock.java
deleted file mode 100644
index 81617fe..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/BaseBlock.java
+++ /dev/null

@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-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.IStringVariableManager;
-import org.eclipse.core.variables.VariablesPlugin;
-import org.eclipse.debug.ui.StringVariableSelectionDialog;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.util.SWTUtil;
-import org.eclipse.pde.ui.launcher.AbstractLauncherTab;
-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.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.ContainerSelectionDialog;
-
-public abstract class BaseBlock {
-	
-	protected AbstractLauncherTab fTab;
-
-	private Button fVariablesButton;
-	private Button fFileSystemButton;
-	private Button fWorkspaceButton;
-	
-	protected Text fLocationText;
-	
-	protected Listener fListener = new Listener();
-
-	protected Label fLocationLabel;
-
-	class Listener extends SelectionAdapter implements ModifyListener {		
-		public void widgetSelected(SelectionEvent e) {
-			Object source= e.getSource();
-			if (source == fFileSystemButton) { 
-				handleBrowseFileSystem();
-			} else if (source == fWorkspaceButton) {
-				handleBrowseWorkspace();
-			} else if (source == fVariablesButton) {
-				handleInsertVariable();
-			} else {			
-				fTab.updateLaunchConfigurationDialog();
-			}
-		}
-
-		public void modifyText(ModifyEvent e) {
-			fTab.updateLaunchConfigurationDialog();
-		}
-	}
-	
-	public BaseBlock(AbstractLauncherTab tab) {
-		fTab = tab;
-	}
-	
-	protected void createText(Composite parent, String text, int indent) {
-		fLocationLabel = new Label(parent, SWT.NONE);
-		fLocationLabel.setText(text);
-		if (indent > 0) {
-			GridData gd = new GridData();
-			gd.horizontalIndent = indent;
-			fLocationLabel.setLayoutData(gd);
-		}
-
-		fLocationText = new Text(parent, SWT.SINGLE|SWT.BORDER);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.widthHint = 400;
-		fLocationText.setLayoutData(gd);
-		fLocationText.addModifyListener(fListener);
-	}
-	
-	protected void createButtons(Composite parent) {
-		fWorkspaceButton = createButton(parent, PDEUIMessages.BaseBlock_workspace); 
-		fFileSystemButton = createButton(parent, PDEUIMessages.BaseBlock_filesystem); 
-		fVariablesButton = createButton(parent, PDEUIMessages.BaseBlock_variables); 	
-	}
-	
-	protected Button createButton(Composite parent, String text) {
-		Button button = new Button(parent, SWT.PUSH);
-		button.setText(text);
-		button.setLayoutData(new GridData());
-		button.addSelectionListener(fListener);
-		SWTUtil.setButtonDimensionHint(button);
-		return button;
-	}
-		
-	protected void handleBrowseFileSystem() {
-		DirectoryDialog dialog = new DirectoryDialog(fTab.getControl().getShell());
-		dialog.setFilterPath(getLocation());
-		dialog.setText(PDEUIMessages.BaseBlock_dirSelection); 
-		dialog.setMessage(PDEUIMessages.BaseBlock_dirChoose); 
-		String result = dialog.open();
-		if (result != null)
-			fLocationText.setText(result);
-	}
-	
-	protected void handleBrowseWorkspace() {
-		ContainerSelectionDialog dialog = 
-			new ContainerSelectionDialog(
-					PDEPlugin.getActiveWorkbenchShell(),
-					getContainer(), 
-					true,
-					PDEUIMessages.BaseBlock_relative); 
-		if (dialog.open() == ContainerSelectionDialog.OK) {
-			IPath path = (IPath)dialog.getResult()[0];
-			fLocationText.setText("${workspace_loc:" + path.makeRelative().toString() + "}"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-	
-	protected IContainer getContainer() {
-		String path = getLocation();
-		if (path.length() > 0) {
-		    IResource res = null;
-		    IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		    if (path.startsWith("${workspace_loc:")) { //$NON-NLS-1$
-		        IStringVariableManager manager = VariablesPlugin.getDefault().getStringVariableManager();
-			    try {
-                    path = manager.performStringSubstitution(path, false);
-                    IContainer[] containers = root.findContainersForLocation(new Path(path));
-                    if (containers.length > 0)
-                        res = containers[0];
-                } catch (CoreException e) {
-                }
-			} else {	    
-				res = root.findMember(path);
-			}
-			if (res instanceof IContainer) {
-				return (IContainer)res;
-			}
-		}
-		return ResourcesPlugin.getWorkspace().getRoot();
-	}
-	
-	private void handleInsertVariable() {
-		StringVariableSelectionDialog dialog = 
-					new StringVariableSelectionDialog(PDEPlugin.getActiveWorkbenchShell());
-		if (dialog.open() == StringVariableSelectionDialog.OK)
-			fLocationText.insert(dialog.getVariableExpression());
-	}
-	
-	protected String getLocation() {
-		return fLocationText.getText().trim();
-	}
-	
-	public String validate() {
-		return (fLocationText.isEnabled() && getLocation().length() == 0)
-					? NLS.bind(PDEUIMessages.BaseBlock_errorMessage, getName())
-					: null;
-	}
-	
-	protected abstract String getName();
-	
-	protected void enableBrowseSection(boolean enabled) {
-		fLocationLabel.setEnabled(enabled);
-		fLocationText.setEnabled(enabled);
-		fFileSystemButton.setEnabled(enabled);
-		fWorkspaceButton.setEnabled(enabled);
-		fVariablesButton.setEnabled(enabled);
-		fTab.updateLaunchConfigurationDialog();
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/ConfigurationAreaBlock.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/ConfigurationAreaBlock.java
deleted file mode 100644
index 4be12d2..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/ConfigurationAreaBlock.java
+++ /dev/null

@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.ui.launcher.AbstractLauncherTab;
-import org.eclipse.pde.ui.launcher.IPDELauncherConstants;
-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.Group;
-
-public class ConfigurationAreaBlock extends BaseBlock {
-
-	private Button fUseDefaultLocationButton;
-	private Button fClearConfig;
-	private String fLastEnteredConfigArea;
-	private String fConfigName;
-	private static String DEFAULT_DIR = "${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/"; //$NON-NLS-1$
-
-	public ConfigurationAreaBlock(AbstractLauncherTab tab) {
-		super(tab);
-	}
-	
-	public void createControl(Composite parent) {
-		Group group = new Group(parent, SWT.NONE);
-		group.setText(PDEUIMessages.ConfigurationTab_configAreaGroup); 
-		group.setLayout(new GridLayout(2, false));
-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		fUseDefaultLocationButton = new Button(group, SWT.CHECK);
-		GridData gd = new GridData();
-		gd.horizontalSpan = 2;
-		fUseDefaultLocationButton.setLayoutData(gd);
-		fUseDefaultLocationButton.setText(PDEUIMessages.ConfigurationTab_useDefaultLoc); 
-		fUseDefaultLocationButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				boolean useDefaultArea = fUseDefaultLocationButton.getSelection();
-				if (useDefaultArea)
-					fLocationText.setText(DEFAULT_DIR + fConfigName);
-				else
-					fLocationText.setText(fLastEnteredConfigArea);
-				enableBrowseSection(!useDefaultArea);
-			}
-		});
-
-		createText(group, PDEUIMessages.ConfigurationTab_configLog, 20);
-		
-		Composite buttons = new Composite(group, SWT.NONE);
-		GridLayout layout = new GridLayout(4, false);
-		layout.marginHeight = layout.marginWidth = 0;
-		buttons.setLayout(layout);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		buttons.setLayoutData(gd);
-		
-		fClearConfig = new Button(buttons, SWT.CHECK);
-		fClearConfig.setText(PDEUIMessages.ConfigurationTab_clearArea); 
-		fClearConfig.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fClearConfig.addSelectionListener(fListener);
-		
-		createButtons(buttons);
-	}
-	
-	public void initializeFrom(ILaunchConfiguration configuration) throws CoreException {
-		fConfigName = configuration.getName();
-		boolean useDefaultArea = configuration.getAttribute(IPDELauncherConstants.CONFIG_USE_DEFAULT_AREA, true);
-		fUseDefaultLocationButton.setSelection(useDefaultArea);
-		enableBrowseSection(!useDefaultArea);
-		
-		fClearConfig.setSelection(configuration.getAttribute(IPDELauncherConstants.CONFIG_CLEAR_AREA, false));
-		fLastEnteredConfigArea = configuration.getAttribute(IPDELauncherConstants.CONFIG_LOCATION, ""); //$NON-NLS-1$
-
-		if (useDefaultArea)
-			fLocationText.setText(DEFAULT_DIR + fConfigName);
-		else
-			fLocationText.setText(fLastEnteredConfigArea);
-	}
-	
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		configuration.setAttribute(IPDELauncherConstants.CONFIG_USE_DEFAULT_AREA, fUseDefaultLocationButton.getSelection());
-		if (!fUseDefaultLocationButton.getSelection()) {
-			fLastEnteredConfigArea = getLocation();
-			configuration.setAttribute(IPDELauncherConstants.CONFIG_LOCATION, fLastEnteredConfigArea);
-		} else {
-			configuration.setAttribute(IPDELauncherConstants.CONFIG_LOCATION, PDEUIMessages.ConfigurationAreaBlock_0);
-		}
-		configuration.setAttribute(IPDELauncherConstants.CONFIG_CLEAR_AREA, fClearConfig.getSelection());
-	}
-	
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration, boolean clear) {		
-		configuration.setAttribute(IPDELauncherConstants.CONFIG_USE_DEFAULT_AREA, true);
-		configuration.setAttribute(IPDELauncherConstants.CONFIG_LOCATION, ""); //$NON-NLS-1$
-		configuration.setAttribute(IPDELauncherConstants.CONFIG_CLEAR_AREA, clear);
-	}
-	
-	protected String getName() {
-		return PDEUIMessages.ConfigurationAreaBlock_name;
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/ConfigurationTemplateBlock.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/ConfigurationTemplateBlock.java
deleted file mode 100644
index ee360a2..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/ConfigurationTemplateBlock.java
+++ /dev/null

@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.variables.IStringVariableManager;
-import org.eclipse.core.variables.VariablesPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.util.FileNameFilter;
-import org.eclipse.pde.ui.launcher.AbstractLauncherTab;
-import org.eclipse.pde.ui.launcher.IPDELauncherConstants;
-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.FileDialog;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-public class ConfigurationTemplateBlock extends BaseBlock {
-
-	private Button fGenerateFileButton;
-	private Button fUseTemplateButton;
-
-	public ConfigurationTemplateBlock(AbstractLauncherTab tab) {
-		super(tab);
-	}
-	
-	public void createControl(Composite parent) {
-		Group group = new Group(parent, SWT.NONE);
-		group.setText(PDEUIMessages.ConfigurationTab_configFileGroup); 
-		group.setLayout(new GridLayout(2, false));
-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		fGenerateFileButton = new Button(group, SWT.RADIO);
-		fGenerateFileButton.setText(PDEUIMessages.ConfigurationTab_defaultConfigIni); 
-		GridData gd = new GridData();
-		gd.horizontalSpan = 2;
-		fGenerateFileButton.setLayoutData(gd);
-		fGenerateFileButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				enableBrowseSection(!fGenerateFileButton.getSelection());
-			}
-		});
-		
-		fUseTemplateButton = new Button(group, SWT.RADIO);
-		fUseTemplateButton.setText(PDEUIMessages.ConfigurationTab_existingConfigIni); 
-		gd = new GridData();
-		gd.horizontalSpan = 2;
-		fUseTemplateButton.setLayoutData(gd);
-		
-		createText(group, PDEUIMessages.ConfigurationTab_templateLoc, 20); 
-
-		Composite buttons = new Composite(group, SWT.NONE);
-		GridLayout layout = new GridLayout(4, false);
-		layout.marginHeight = layout.marginWidth = 0;
-		buttons.setLayout(layout);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		buttons.setLayoutData(gd);
-
-		Label label = new Label(buttons, SWT.NONE);
-		label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		createButtons(buttons);
-	}
-	
-	public void initializeFrom(ILaunchConfiguration configuration) throws CoreException {
-		boolean generateDefault = configuration.getAttribute(IPDELauncherConstants.CONFIG_GENERATE_DEFAULT, true);
-		fGenerateFileButton.setSelection(generateDefault);
-		fUseTemplateButton.setSelection(!generateDefault);
-		enableBrowseSection(!generateDefault);
-		fLocationText.setText(configuration.getAttribute(IPDELauncherConstants.CONFIG_TEMPLATE_LOCATION, "")); //$NON-NLS-1$
-	}
-	
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		configuration.setAttribute(IPDELauncherConstants.CONFIG_GENERATE_DEFAULT, fGenerateFileButton.getSelection());
-		if (!fGenerateFileButton.getSelection())
-			configuration.setAttribute(IPDELauncherConstants.CONFIG_TEMPLATE_LOCATION, getLocation());
-	}
-	
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {		
-		configuration.setAttribute(IPDELauncherConstants.CONFIG_GENERATE_DEFAULT, true);
-		configuration.setAttribute(IPDELauncherConstants.CONFIG_TEMPLATE_LOCATION, ""); //$NON-NLS-1$
-	}
-	
-
-	protected String getName() {
-		return PDEUIMessages.ConfigurationTemplateBlock_name;
-	}
-		
-	protected void handleBrowseWorkspace() {
-		ElementTreeSelectionDialog dialog = 
-						new ElementTreeSelectionDialog(
-								fTab.getControl().getShell(), 
-								new WorkbenchLabelProvider(),
-								new WorkbenchContentProvider());
-		
-		IFile file = getFile();
-		if (file != null)
-			dialog.setInitialSelection(file);
-		dialog.setInput(PDEPlugin.getWorkspace().getRoot());
-		dialog.addFilter(new FileNameFilter("config.ini")); //$NON-NLS-1$
-		dialog.setAllowMultiple(false);
-		dialog.setTitle(PDEUIMessages.ConfigurationTab_fileSelection); 
-		dialog.setMessage(PDEUIMessages.ConfigurationTab_fileDialogMessage); 
-		dialog.setValidator(new ISelectionStatusValidator() {
-			public IStatus validate(Object[] selection) {
-				if (selection.length > 0 && selection[0] instanceof IFile)
-					return new Status(IStatus.OK, PDEPlugin.getPluginId(),
-							IStatus.OK, "", null); //$NON-NLS-1$
-				
-				return new Status(IStatus.ERROR, PDEPlugin.getPluginId(),
-						IStatus.ERROR, "", null); //$NON-NLS-1$
-			}
-		});
-		if (dialog.open() == ElementTreeSelectionDialog.OK) {
-			file = (IFile) dialog.getFirstResult();
-			fLocationText.setText("${workspace_loc:" + file.getFullPath().makeRelative() + "}"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-	
-	protected IFile getFile() {
-		String path = getLocation();
-		if (path.length() > 0) {
-		    IResource res = null;
-		    IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		    if (path.startsWith("${workspace_loc:")) { //$NON-NLS-1$
-		        IStringVariableManager manager = VariablesPlugin.getDefault().getStringVariableManager();
-			    try {
-                    path = manager.performStringSubstitution(path, false);
-                    IFile[] containers = root.findFilesForLocation(new Path(path));
-                    if (containers.length > 0)
-                        res = containers[0];
-                } catch (CoreException e) {
-                }
-			} else {	    
-				res = root.findMember(path);
-			}
-			if (res instanceof IFile) {
-				return (IFile)res;
-			}
-		}
-		return null;
-	}
-
-
-	protected void handleBrowseFileSystem() {
-		FileDialog dialog = new FileDialog(fTab.getControl().getShell());
-		dialog.setFilterExtensions(new String[] {"*.ini"}); //$NON-NLS-1$
-		dialog.setFilterPath(getLocation());
-		dialog.setText(PDEUIMessages.ConfigurationTab_configLocMessage); 
-		String res = dialog.open();
-		if (res != null)
-			fLocationText.setText(res);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/EclipseApplicationLauncherTabGroup.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/EclipseApplicationLauncherTabGroup.java
deleted file mode 100644
index 26bad63..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/EclipseApplicationLauncherTabGroup.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-
-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.sourcelookup.SourceLookupTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaArgumentsTab;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.ui.launcher.ConfigurationTab;
-import org.eclipse.pde.ui.launcher.MainTab;
-import org.eclipse.pde.ui.launcher.PluginsTab;
-import org.eclipse.pde.ui.launcher.TracingTab;
-
-public class EclipseApplicationLauncherTabGroup extends AbstractPDELaunchConfigurationTabGroup {
-
-	/**
-	 * @see ILaunchConfigurationTabGroup#createTabs(ILaunchConfigurationDialog,
-	 *      String)
-	 */
-	public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
-		ILaunchConfigurationTab[] tabs = null;
-		if (PDECore.getDefault().getModelManager().isOSGiRuntime()) {
-			tabs = new ILaunchConfigurationTab[]{new MainTab(),
-					new JavaArgumentsTab(),
-					new PluginsTab(), new ConfigurationTab(),
-					new TracingTab(), new EnvironmentTab(),
-					new SourceLookupTab(), new CommonTab()};
-		} else {
-			tabs = new ILaunchConfigurationTab[]{new MainTab(),
-					new JavaArgumentsTab(),
-					new PluginsTab(), new TracingTab(),
-					new EnvironmentTab(), new SourceLookupTab(), 
-					new CommonTab()};
-		}
-		setTabs(tabs);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/EquinoxLaunchShortcut.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/EquinoxLaunchShortcut.java
deleted file mode 100644
index 180e466..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/EquinoxLaunchShortcut.java
+++ /dev/null

@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-
-import java.util.ArrayList;
-import java.util.TreeMap;
-
-import org.eclipse.core.resources.IProject;
-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.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.PluginModelManager;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.ui.launcher.IPDELauncherConstants;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.dialogs.ElementListSelectionDialog;
-
-public class EquinoxLaunchShortcut implements ILaunchShortcut {
-	
-	private static final String CLASSPATH_PROVIDER = "org.eclipse.pde.ui.workbenchClasspathProvider"; //$NON-NLS-1$
-	private static final String CONFIGURATION_TYPE = "org.eclipse.pde.ui.EquinoxLauncher"; //$NON-NLS-1$
-
-	public void run(IProject project) {
-		launch(PDECore.getDefault().getModelManager().findModel(project), ILaunchManager.RUN_MODE);
-	}
-	
-	public void debug(IProject project) {
-		launch(PDECore.getDefault().getModelManager().findModel(project), ILaunchManager.DEBUG_MODE);
-	}
-	
-	public void launch(ISelection selection, String mode) {
-		launch((IPluginModelBase)null, mode);
-	}
-
-	public void launch(IEditorPart editor, String mode) {
-		launch((IPluginModelBase)null, mode);
-	}
-	
-	private void launch(IPluginModelBase model, String mode) {
-		ILaunchConfiguration[] configs = getLaunchConfigurations();
-		ILaunchConfiguration configuration = null;
-		if (configs.length == 0) {
-			PluginModelManager manager = PDECore.getDefault().getModelManager();
-			IPluginModelBase[] models = (model == null) ? manager.getWorkspaceModels() : new IPluginModelBase[] {model};
-            if (models.length == 0) {
-            	IPluginModelBase osgi = manager.findModel("org.eclipse.osgi"); //$NON-NLS-1$
-            	if (osgi != null)
-            		models = new IPluginModelBase[] {osgi};
-            }
-            configuration =  createNewConfiguration(models, mode);
-		} else if (configs.length == 1) {
-			configuration = configs[0];
-		} else {
-			configuration = chooseConfiguration(configs, mode);
-		}
-		
-		if (configuration != null)
-			DebugUITools.launch(configuration, mode);		
-	}
-	
-	private ILaunchConfiguration[] getLaunchConfigurations() {
-		ArrayList result = new ArrayList();
-		try {
-			ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager();
-			ILaunchConfiguration[] configs = manager.getLaunchConfigurations(getLaunchConfigurationType());
-			for (int i = 0; i < configs.length; i++) {
-				if (!DebugUITools.isPrivate(configs[i])) {
-							result.add(configs[i]);
-				}
-			}
-		} catch (CoreException e) {
-		}
-		return (ILaunchConfiguration[]) result.toArray(new ILaunchConfiguration[result.size()]);
-	}
-	
-	private ILaunchConfigurationType getLaunchConfigurationType() {
-		ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager();
-		return  manager.getLaunchConfigurationType(CONFIGURATION_TYPE);		
-	}
-	
-	protected ILaunchConfiguration chooseConfiguration(ILaunchConfiguration[] configs, String mode) {
-		IDebugModelPresentation labelProvider = DebugUITools.newDebugModelPresentation();
-		ElementListSelectionDialog dialog= new ElementListSelectionDialog(PDEPlugin.getActiveWorkbenchShell(), labelProvider);
-		dialog.setElements(configs);
-		dialog.setTitle(PDEUIMessages.RuntimeWorkbenchShortcut_title);  
-		if (mode.equals(ILaunchManager.DEBUG_MODE)) {
-			dialog.setMessage(PDEUIMessages.RuntimeWorkbenchShortcut_select_debug); 
-		} else {
-			dialog.setMessage(PDEUIMessages.RuntimeWorkbenchShortcut_select_run);  
-		}
-		dialog.setMultipleSelection(false);
-		int result= dialog.open();
-		labelProvider.dispose();
-		if (result == ElementListSelectionDialog.OK) {
-			return (ILaunchConfiguration)dialog.getFirstResult();
-		}
-		return null;		
-	}
-	
-	private ILaunchConfiguration createNewConfiguration(IPluginModelBase[] selected, String mode) {
-		ILaunchConfiguration config = null;
-		try {
-			ILaunchConfigurationType configType = getLaunchConfigurationType();
-			String computedName = getComputedName("Equinox"); //$NON-NLS-1$
-			ILaunchConfigurationWorkingCopy wc = configType.newInstance(null, computedName);  
-			wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, ""); //$NON-NLS-1$
-			wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, "-console"); //$NON-NLS-1$
-			wc.setAttribute(IPDELauncherConstants.TRACING_CHECKED, IPDELauncherConstants.TRACING_NONE);
-			wc.setAttribute(IPDELauncherConstants.AUTOMATIC_ADD, true);
-			initializePluginState(wc, selected);
-			wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_SOURCE_PATH_PROVIDER, CLASSPATH_PROVIDER);
-			config = wc.doSave();		
-		} catch (CoreException ce) {
-			PDEPlugin.logException(ce);
-		} 
-		return config;
-	}
-	
-	public static void initializePluginState(ILaunchConfigurationWorkingCopy wc, IPluginModelBase[] selected) {
-		TreeMap map = new TreeMap();
-		for (int i = 0; i < selected.length; i++)
-			RuntimeWorkbenchShortcut.addPluginAndDependencies(selected[i], map);
-		Object[] models = map.values().toArray();
-		StringBuffer wsplugins = new StringBuffer();
-		StringBuffer explugins = new StringBuffer();
-		for (int i = 0; i < models.length; i++) {
-			IPluginModelBase model = (IPluginModelBase)models[i];
-			String id = model.getPluginBase().getId();
-			String value = "org.eclipse.osgi".equals(id) ? "@:" : "@default:default"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			if (model.getUnderlyingResource() == null) {
-				if (explugins.length() > 0)
-					explugins.append(","); //$NON-NLS-1$
-				explugins.append(id);
-				explugins.append(value);
-			} else {
-				if (wsplugins.length() > 0)
-					wsplugins.append(","); //$NON-NLS-1$
-				wsplugins.append(id);
-				wsplugins.append(value);
-			}
-		}
-		wc.setAttribute(IPDELauncherConstants.WORKSPACE_BUNDLES, wsplugins.toString());
-		wc.setAttribute(IPDELauncherConstants.TARGET_BUNDLES, explugins.toString());
-		
-	}
-
-	private String getComputedName(String prefix) {
-		ILaunchManager lm = DebugPlugin.getDefault().getLaunchManager();
-		return lm.generateUniqueLaunchConfigurationNameFrom(prefix);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/EquinoxLauncherTabGroup.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/EquinoxLauncherTabGroup.java
deleted file mode 100644
index 1b199fd..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/EquinoxLauncherTabGroup.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.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.sourcelookup.SourceLookupTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaArgumentsTab;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.pde.ui.launcher.EquinoxSettingsTab;
-import org.eclipse.pde.ui.launcher.EquinoxPluginsTab;
-import org.eclipse.pde.ui.launcher.TracingTab;
-
-public class EquinoxLauncherTabGroup extends AbstractLaunchConfigurationTabGroup {
-
-	public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
-		ILaunchConfigurationTab[] tabs =
-			tabs = new ILaunchConfigurationTab[]{
-					new EquinoxPluginsTab(),
-					new JavaArgumentsTab(),
-					new EquinoxSettingsTab(),
-					new TracingTab(), 
-					new EnvironmentTab(),
-					new SourceLookupTab(), 
-					new CommonTab()};
-
-		setTabs(tabs);
-	}
-	
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
-		super.setDefaults(configuration);
-		configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, "-console"); //$NON-NLS-1$
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/EquinoxPluginBlock.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/EquinoxPluginBlock.java
deleted file mode 100644
index cacd211..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/EquinoxPluginBlock.java
+++ /dev/null

@@ -1,398 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-
-import java.util.Map;
-import java.util.StringTokenizer;
-import java.util.TreeMap;
-import java.util.TreeSet;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.ui.PDELabelProvider;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.elements.NamedElement;
-import org.eclipse.pde.ui.launcher.EquinoxPluginsTab;
-import org.eclipse.pde.ui.launcher.IPDELauncherConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.TreeEditor;
-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.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Spinner;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeColumn;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.swt.widgets.Widget;
-
-public class EquinoxPluginBlock extends AbstractPluginBlock {
-	
-	class EquinoxLabelProvider extends PDELabelProvider {
-		
-		public Image getColumnImage(Object obj, int index) {
-			return index == 0 ? super.getColumnImage(obj, index) : null;
-		}
-		public String getColumnText(Object obj, int index) {
-			switch (index) {
-			case 0:
-				return super.getColumnText(obj, index);
-			default:
-				return ""; //$NON-NLS-1$
-			}
-		}
-	}
-
-	public EquinoxPluginBlock(EquinoxPluginsTab tab) {
-		super(tab);
-	}
-	
-	protected void createPluginViewer(Composite composite) {
-		super.createPluginViewer(composite);
-    	Tree tree = fPluginTreeViewer.getTree();
- 
-    	TreeColumn column1 = new TreeColumn(tree, SWT.LEFT);
-    	column1.setText(PDEUIMessages.EquinoxPluginBlock_pluginsColumn); 
-    	column1.setWidth(300);
-
-    	TreeColumn column2 = new TreeColumn(tree, SWT.CENTER);
-    	column2.setText(PDEUIMessages.EquinoxPluginBlock_levelColumn); 
-    	column2.setWidth(80);
-         
-        TreeColumn column3 = new TreeColumn(tree, SWT.CENTER);
-        column3.setText(PDEUIMessages.EquinoxPluginBlock_autoColumn);
-        column3.setWidth(80);      
-        tree.setHeaderVisible(true);
-
-		createEditors();
-	}
-	
-	private void createEditors() {
-		final Tree tree = fPluginTreeViewer.getTree();
-
-		final TreeEditor editor1 = new TreeEditor(tree);
-		editor1.horizontalAlignment = SWT.CENTER;
-		editor1.minimumWidth = 60;
-
-		final TreeEditor editor2 = new TreeEditor(tree);
-		editor2.horizontalAlignment = SWT.CENTER;
-		editor2.grabHorizontal = true;
-		editor2.minimumWidth = 60;
-
-		tree.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				// Clean up any previous editor control
-				Control oldEditor = editor1.getEditor();
-				if (oldEditor != null)
-					oldEditor.dispose();
-
-				oldEditor = editor2.getEditor();
-				if (oldEditor != null)
-					oldEditor.dispose();
-
-				// Identify the selected row
-				final TreeItem item = (TreeItem) e.item;
-				if (!isEditable(item))
-					return;
-
-				final Spinner spinner = new Spinner(tree, SWT.BORDER);
-				spinner.setMinimum(0);
-				String level = item.getText(1);
-				int defaultLevel =  "default".equals(level) ? 0 : Integer.parseInt(level); //$NON-NLS-1$
-				spinner.setSelection(defaultLevel);
-				spinner.addModifyListener(new ModifyListener() {
-					public void modifyText(ModifyEvent e) {
-						if (item.getChecked()) {
-							int selection = spinner.getSelection();
-							item.setText(1, selection == 0 
-												? "default"  //$NON-NLS-1$
-												: Integer.toString(selection));
-							fTab.updateLaunchConfigurationDialog();
-						}
-					}
-				});
-				editor1.setEditor(spinner, item, 1);
-
-				final CCombo combo = new CCombo(tree, SWT.BORDER | SWT.READ_ONLY);
-				combo.setItems(new String[] { "default", Boolean.toString(true), Boolean.toString(false) }); //$NON-NLS-1$
-				combo.setText(item.getText(2));
-				combo.pack();
-				combo.addSelectionListener(new SelectionAdapter() {
-					public void widgetSelected(SelectionEvent e) {
-						if (item.getChecked()) {
-							item.setText(2, combo.getText());
-							fTab.updateLaunchConfigurationDialog();
-						}
-					}
-				});
-				editor2.setEditor(combo, item, 2);
-
-			}
-		});			
-	}
-	
-	private boolean isEditable(TreeItem item) {
-		Object obj = item.getData();
-		if (obj instanceof IPluginModelBase) {
-			IPluginModelBase model = (IPluginModelBase)obj;
-			if (!"org.eclipse.osgi".equals(model.getPluginBase().getId())) //$NON-NLS-1$
-				return fPluginTreeViewer.getChecked(model);
-		}
-		return false;
-	}
-	
-	protected ILabelProvider getLabelProvider() {
-		return new EquinoxLabelProvider();
-	}
-	
-	protected void savePluginState(ILaunchConfigurationWorkingCopy config) {		
-		Object[] selected = fPluginTreeViewer.getCheckedElements();
-		StringBuffer wBuffer = new StringBuffer();
-		StringBuffer tBuffer = new StringBuffer();
-		for (int i = 0; i < selected.length; i++) {
-			if (selected[i] instanceof IPluginModelBase) {
-				IPluginModelBase model = (IPluginModelBase)selected[i];
-				String id = model.getPluginBase().getId();
-				TreeItem item = (TreeItem)fPluginTreeViewer.testFindItem(model);
-				if (model.getUnderlyingResource() == null) {
-					appendToBuffer(tBuffer, id, item);
-				} else {
-					appendToBuffer(wBuffer, id, item);
-				}
-			}
-		}		
-		config.setAttribute(IPDELauncherConstants.WORKSPACE_BUNDLES, 
-							wBuffer.length() == 0 ? (String)null : wBuffer.toString());		
-		config.setAttribute(IPDELauncherConstants.TARGET_BUNDLES, 
-							tBuffer.length() == 0 ? (String)null : tBuffer.toString());
-		
-		StringBuffer buffer = new StringBuffer();
-		if (fAddWorkspaceButton.getSelection()) {
-			for (int i = 0; i < fWorkspaceModels.length; i++) {
-				if (!fPluginTreeViewer.getChecked(fWorkspaceModels[i])) {
-					if (buffer.length() > 0)
-						buffer.append(","); //$NON-NLS-1$
-					buffer.append(fWorkspaceModels[i].getPluginBase().getId());
-				}
-			}
-		} 		
-		config.setAttribute(IPDELauncherConstants.DESELECTED_WORKSPACE_PLUGINS, 
-							buffer.length() > 0 ? buffer.toString() : (String)null);
-	}
-	
-	private void appendToBuffer(StringBuffer buffer, String id, TreeItem item) {
-		if (buffer.length() > 0)
-			buffer.append(","); //$NON-NLS-1$
-		buffer.append(id);
-		buffer.append("@"); //$NON-NLS-1$
-		buffer.append(item.getText(1));
-		buffer.append(":"); //$NON-NLS-1$
-		buffer.append(item.getText(2));
-	}
-	
-	private static Map retrieveMap(ILaunchConfiguration configuration, String attribute) {
-		Map map = new TreeMap();
-		try {
-			String value = configuration.getAttribute(attribute, ""); //$NON-NLS-1$
-			StringTokenizer tok = new StringTokenizer(value, ","); //$NON-NLS-1$
-			while (tok.hasMoreTokens()) {
-				String token = tok.nextToken();
-				int index = token.indexOf('@');
-				map.put(token.substring(0, index), token.substring(index + 1));
-			}
-		} catch (CoreException e) {
-		}	
-		return map;
-	}
-	
-	public static Map retrieveTargetMap(ILaunchConfiguration configuration) {
-		return retrieveMap(configuration, IPDELauncherConstants.TARGET_BUNDLES);
-	}
-	
-	public static Map retrieveWorkspaceMap(ILaunchConfiguration configuration) throws CoreException {
-		Map map = retrieveMap(configuration, IPDELauncherConstants.WORKSPACE_BUNDLES);
-		if (configuration.getAttribute(IPDELauncherConstants.AUTOMATIC_ADD, true)) {
-			TreeSet deselectedPlugins = LaunchPluginValidator.parsePlugins(configuration, IPDELauncherConstants.DESELECTED_WORKSPACE_PLUGINS);
-			IPluginModelBase[] models = PDECore.getDefault().getModelManager().getWorkspaceModels();
-			for (int i = 0; i < models.length; i++) {
-				String id = models[i].getPluginBase().getId();
-				if (!map.containsKey(id) && !deselectedPlugins.contains(id)) {
-					map.put(id, "default:default"); //$NON-NLS-1$
-				}
-			}
-		}
-		return map;
-	}
-
-	public void initializeFrom(ILaunchConfiguration configuration) throws CoreException {
-		super.initializeFrom(configuration);
-		initWorkspacePluginsState(configuration);
-		initExternalPluginsState(configuration);
-		updateCounter();
-	}
-		
-	private void initExternalPluginsState(ILaunchConfiguration configuration)
-			throws CoreException {
-		fNumExternalChecked = 0;
-		fPluginTreeViewer.setSubtreeChecked(fExternalPlugins, false);
-		
-		Map map = retrieveTargetMap(configuration);
-		for (int i = 0; i < fExternalModels.length; i++) {
-			IPluginModelBase model = fExternalModels[i];
-			if (map.containsKey(model.getPluginBase().getId())) {
-				if (fPluginTreeViewer.setChecked(model, true)) {
-					fNumExternalChecked += 1;
-					setText(model, (String)map.get(model.getPluginBase().getId()));
-				}
-			}
-		}
-		
-		resetGroup(fExternalPlugins);
-		fPluginTreeViewer.setChecked(fExternalPlugins, fNumExternalChecked > 0);
-		fPluginTreeViewer.setGrayed(fExternalPlugins, fNumExternalChecked > 0
-				&& fNumExternalChecked < fExternalModels.length);
-	}
-
-	private void resetGroup(NamedElement group) {
-		Widget widget = fPluginTreeViewer.testFindItem(group);
-		if (widget instanceof TreeItem) {
-			TreeItem[] items = ((TreeItem)widget).getItems();
-			for (int i = 0; i < items.length; i++) {
-				if (!items[i].getChecked()) {
-					resetText(items[i]);
-				}
-			}
-		}
-	}
-
-	private void initWorkspacePluginsState(ILaunchConfiguration configuration)
-			throws CoreException {
-		fNumWorkspaceChecked = 0;
-		fPluginTreeViewer.setSubtreeChecked(fWorkspacePlugins, false);
-		
-		Map map = retrieveWorkspaceMap(configuration);
-		for (int i = 0; i < fWorkspaceModels.length; i++) {
-			IPluginModelBase model = fWorkspaceModels[i];
-			if (map.containsKey(model.getPluginBase().getId())) {
-				if (fPluginTreeViewer.setChecked(model, true)) {
-					fNumWorkspaceChecked += 1;
-					setText(model, (String)map.get(model.getPluginBase().getId()));
-				}
-			}
-		}
-		
-		resetGroup(fWorkspacePlugins);
-
-		fPluginTreeViewer.setChecked(fWorkspacePlugins, fNumWorkspaceChecked > 0);
-		fPluginTreeViewer.setGrayed(
-			fWorkspacePlugins,
-			fNumWorkspaceChecked > 0 && fNumWorkspaceChecked < fWorkspaceModels.length);
-	}
-	
-	protected void handleGroupStateChanged(Object group, boolean checked) {
-		super.handleGroupStateChanged(group, checked);
-		Widget item = fPluginTreeViewer.testFindItem(group);
-		if (item instanceof TreeItem) {
-			TreeItem[] items = ((TreeItem)item).getItems();
-			for (int i = 0; i < items.length; i++) {
-				TreeItem child = items[i];
-				if (child.getChecked() == (child.getText(1).length() == 0))
-					resetText(items[i]);
-			}
-		}		
-	}
-	
-	protected void handleCheckStateChanged(CheckStateChangedEvent event) {
-		super.handleCheckStateChanged(event);
-		resetText((IPluginModelBase)event.getElement());
-	}
-	
-	protected void setChecked(IPluginModelBase model, boolean checked) {
-		super.setChecked(model, checked);
-		resetText(model);
-	}
-	
-	protected void setCheckedElements(Object[] checked) {
-		super.setCheckedElements(checked);
-		updateGroup(fWorkspacePlugins);
-		updateGroup(fExternalPlugins);
-	}
-	
-	private void updateGroup(Object group) {
-		Widget item = fPluginTreeViewer.testFindItem(group);
-		if (item instanceof TreeItem) {
-			TreeItem[] items = ((TreeItem)item).getItems();
-			for (int i = 0; i < items.length; i++) {
-				TreeItem child = items[i];
-				if (child.getChecked() == (child.getText(1).length() == 0))
-					resetText(items[i]);
-			}
-		}		
-	}
-	
-	private void setText(IPluginModelBase model, String value) {
-		Widget widget = fPluginTreeViewer.testFindItem(model);
-		if (widget instanceof TreeItem) {
-			TreeItem item = (TreeItem)widget;
-			int index = value == null ? -1 : value.indexOf(':');
-			item.setText(1, index == -1 ? "" : value.substring(0, index)); //$NON-NLS-1$
-			item.setText(2, index == -1 ? "" : value.substring(index + 1)); //$NON-NLS-1$
-		}
-	}
-	
-	private void resetText(IPluginModelBase model) {
-		Widget widget = fPluginTreeViewer.testFindItem(model);
-		if (widget instanceof TreeItem) {
-			resetText((TreeItem)widget);
-		}
-	}
-	
-	private void resetText(TreeItem item) {
-		if (item.getChecked()) {
-			IPluginModelBase model = (IPluginModelBase)item.getData();
-			boolean isSystemBundle = "org.eclipse.osgi".equals(model.getPluginBase().getId()); //$NON-NLS-1$
-			if (!"default".equals(item.getText(1))) //$NON-NLS-1$
-				item.setText(1, isSystemBundle ? "" : "default"); //$NON-NLS-1$ //$NON-NLS-2$
-			if (!"default".equals(item.getText(2))) //$NON-NLS-1$
-				item.setText(2, isSystemBundle ? "" : "default"); //$NON-NLS-1$ //$NON-NLS-2$
-		} else {
-			if (item.getText(1).length() > 0)
-				item.setText(1, ""); //$NON-NLS-1$
-			if (item.getText(2).length() > 0)
-				item.setText(2, ""); //$NON-NLS-1$
-		}		
-	}
-	
-	protected void handleRestoreDefaults() {
-		Object[] selected = fPluginTreeViewer.getCheckedElements();
-		for (int i = 0; i < selected.length; i++) {
-			if (selected[i] instanceof IPluginModelBase) {
-				resetText((IPluginModelBase)selected[i]);
-			}
-		}
-	}
-	
-	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
-		super.setDefaults(config);
-		EquinoxLaunchShortcut.initializePluginState(config, 
-				PDECore.getDefault().getModelManager().getWorkspaceModels());
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/JREBlock.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/JREBlock.java
deleted file mode 100644
index 416071f..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/JREBlock.java
+++ /dev/null

@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.preferences.PDEPreferencesUtil;
-import org.eclipse.pde.internal.ui.util.SWTUtil;
-import org.eclipse.pde.ui.launcher.AbstractLauncherTab;
-import org.eclipse.pde.ui.launcher.IPDELauncherConstants;
-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.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-public class JREBlock {
-
-	private AbstractLauncherTab fTab;
-	private Listener fListener = new Listener();
-	private Button fJavawButton;
-	private Button fJavaButton;
-	private Combo fJreCombo;
-	private Text fBootstrap;
-
-	class Listener extends SelectionAdapter implements ModifyListener {		
-		public void widgetSelected(SelectionEvent e) {
-			fTab.updateLaunchConfigurationDialog();
-		}
-		public void modifyText(ModifyEvent e) {
-			fTab.updateLaunchConfigurationDialog();
-		}
-	}
-
-	public JREBlock(AbstractLauncherTab tab) {
-		fTab = tab;
-	}
-	
-	public void createControl(Composite parent) {
-		Group group = new Group(parent, SWT.NONE);
-		group.setText(PDEUIMessages.MainTab_jreSection); 
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		group.setLayout(layout);
-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		createJavaExecutableSection(group);
-		createJRESection(group);
-		createBootstrapEntriesSection(group);
-	}
-	
-	protected void createJRESection(Composite parent) {
-		Label label = new Label(parent, SWT.NONE);
-		label.setText(PDEUIMessages.BasicLauncherTab_jre); 
-
-		Composite composite = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginHeight = layout.marginWidth = 0;
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		fJreCombo = new Combo(composite, SWT.DROP_DOWN | SWT.READ_ONLY);
-		fJreCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fJreCombo.addSelectionListener(fListener);
-		
-		Button button = new Button(composite, SWT.PUSH);
-		button.setText(PDEUIMessages.BasicLauncherTab_installedJREs); 
-		button.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				String currentVM = fJreCombo.getText();
-				String[] pageIDs = new String[] {"org.eclipse.jdt.debug.ui.preferences.VMPreferencePage"}; //$NON-NLS-1$
-				if (PDEPreferencesUtil.showPreferencePage(pageIDs)) {
-					fJreCombo.setItems(VMHelper.getVMInstallNames());
-					fJreCombo.setText(currentVM);
-					if (fJreCombo.getSelectionIndex() == -1)
-						fJreCombo.setText(VMHelper.getDefaultVMInstallName());
-				}
-			}
-		});
-		button.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-		SWTUtil.setButtonDimensionHint(button);				
-	}
-	
-	protected void createJavaExecutableSection(Composite parent) {
-		Label label = new Label(parent, SWT.NONE);
-		label.setText(PDEUIMessages.BasicLauncherTab_javaExec); 
-
-		Composite composite = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginHeight = layout.marginWidth = 0;
-		layout.horizontalSpacing = 20;
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		fJavawButton = new Button(composite, SWT.RADIO);
-		fJavawButton.setText(PDEUIMessages.BasicLauncherTab_javaExecDefault); // 
-		fJavawButton.addSelectionListener(fListener);
-		
-		fJavaButton = new Button(composite, SWT.RADIO);
-		fJavaButton.setText("&java");	 //$NON-NLS-1$
-		fJavaButton.addSelectionListener(fListener);
-	}
-			
-	private void createBootstrapEntriesSection(Composite parent) {
-		Label label = new Label(parent, SWT.NONE);
-		label.setText(PDEUIMessages.BasicLauncherTab_bootstrap); 
-		
-		fBootstrap = new Text(parent, SWT.BORDER);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.widthHint = 300;
-		fBootstrap.setLayoutData(gd);
-		fBootstrap.addModifyListener(fListener);
-	}
-	
-	public void initializeFrom(ILaunchConfiguration config) throws CoreException {
-		initializeJRESection(config);
-		initializeBootstrapEntriesSection(config);
-	}
-	
-	private void initializeJRESection(ILaunchConfiguration config) throws CoreException {
-		String javaCommand = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_JAVA_COMMAND, "javaw"); //$NON-NLS-1$
-		fJavawButton.setSelection(javaCommand.equals("javaw")); //$NON-NLS-1$
-		fJavaButton.setSelection(!fJavawButton.getSelection());
-		
-		fJreCombo.setItems(VMHelper.getVMInstallNames());
-		String vmInstallName =
-			config.getAttribute(IPDELauncherConstants.VMINSTALL, VMHelper.getDefaultVMInstallName());
-		fJreCombo.setText(vmInstallName);
-		if (fJreCombo.getSelectionIndex() == -1)
-			fJreCombo.setText(VMHelper.getDefaultVMInstallName());
-	}
-	
-	private void initializeBootstrapEntriesSection(ILaunchConfiguration config) throws CoreException {
-		fBootstrap.setText(config.getAttribute(IPDELauncherConstants.BOOTSTRAP_ENTRIES, "")); //$NON-NLS-1$
-	}
-	
-	public void performApply(ILaunchConfigurationWorkingCopy config) {
-		saveJRESection(config);
-		saveBootstrapEntriesSection(config);
-	}
-	
-	protected void saveJRESection(ILaunchConfigurationWorkingCopy config) {	
-		try {
-			String javaCommand = fJavawButton.getSelection() ? null : "java"; //$NON-NLS-1$
-			config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_JAVA_COMMAND, javaCommand);
-			
-			if (fJreCombo.getSelectionIndex() == -1)
-				return;
-
-			String jre = fJreCombo.getText();
-			if (config.getAttribute(IPDELauncherConstants.VMINSTALL, (String) null) != null) {
-				config.setAttribute(IPDELauncherConstants.VMINSTALL, jre);
-			} else {
-				config.setAttribute(
-						IPDELauncherConstants.VMINSTALL,
-					jre.equals(VMHelper.getDefaultVMInstallName()) ? null : jre);
-			}
-		} catch (CoreException e) {
-		}
-	}
-
-	protected void saveBootstrapEntriesSection(ILaunchConfigurationWorkingCopy config) {
-		config.setAttribute(IPDELauncherConstants.BOOTSTRAP_ENTRIES, fBootstrap.getText().trim());
-	}
-	
-	public void setDefaults(ILaunchConfigurationWorkingCopy config) {		
-		config.setAttribute(IPDELauncherConstants.BOOTSTRAP_ENTRIES, ""); //$NON-NLS-1$
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/JUnitLaunchConfiguration.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/JUnitLaunchConfiguration.java
deleted file mode 100644
index 15a1792..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/JUnitLaunchConfiguration.java
+++ /dev/null

@@ -1,515 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-
-import java.io.File;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-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.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.internal.junit.launcher.JUnitBaseLaunchConfiguration;
-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;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.core.plugin.IFragment;
-import org.eclipse.pde.core.plugin.IFragmentModel;
-import org.eclipse.pde.core.plugin.IPluginExtension;
-import org.eclipse.pde.core.plugin.IPluginImport;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.ClasspathHelper;
-import org.eclipse.pde.internal.core.ModelEntry;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.PDEManager;
-import org.eclipse.pde.internal.core.PDEState;
-import org.eclipse.pde.internal.core.PluginModelManager;
-import org.eclipse.pde.internal.core.TargetPlatform;
-import org.eclipse.pde.internal.core.util.CoreUtility;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.ui.launcher.IPDELauncherConstants;
-import org.eclipse.update.configurator.ConfiguratorUtils;
-
-
-public class JUnitLaunchConfiguration extends JUnitBaseLaunchConfiguration implements IPDELauncherConstants {
-
-	public static final String CORE_APPLICATION = "org.eclipse.pde.junit.runtime.coretestapplication"; //$NON-NLS-1$
-	public static final String LEGACY_CORE_APPLICATION = "org.eclipse.pde.junit.runtime.legacyCoretestapplication"; //$NON-NLS-1$
-	public static final String UI_APPLICATION = "org.eclipse.pde.junit.runtime.uitestapplication"; //$NON-NLS-1$
-	public static final String LEGACY_UI_APPLICATION = "org.eclipse.pde.junit.runtime.legacyUItestapplication"; //$NON-NLS-1$
-	
-	protected static IPluginModelBase[] registryPlugins;
-	protected File fConfigDir = null;
-
-	public void launch(
-		ILaunchConfiguration configuration,
-		String mode,
-		ILaunch launch,
-		IProgressMonitor monitor)
-		throws CoreException {
-		try {
-			fConfigDir = null;
-			monitor.beginTask("", 6); //$NON-NLS-1$
-			IType[] testTypes = getTestTypes(configuration, monitor);
-			monitor.worked(1);
-			
-			String workspace = LaunchArgumentsHelper.getWorkspaceLocation(configuration);
-			if (!LauncherUtils.clearWorkspace(configuration, workspace, new SubProgressMonitor(monitor, 1))) {
-				monitor.setCanceled(true);
-				return;
-			}
-
-			if (configuration.getAttribute(CONFIG_CLEAR_AREA, false))
-				CoreUtility.deleteContent(getConfigDir(configuration));
-			launch.setAttribute(IPDELauncherConstants.CONFIG_LOCATION, getConfigDir(configuration).toString());
-			
-			int port = SocketUtil.findFreePort();
-			VMRunnerConfiguration runnerConfig = createVMRunner(configuration, testTypes, port, mode);
-			monitor.worked(1);
-			
-			setDefaultSourceLocator(launch, configuration);
-			LaunchConfigurationHelper.synchronizeManifests(configuration, getConfigDir(configuration));
-			launch.setAttribute(PORT_ATTR, Integer.toString(port));
-			launch.setAttribute(TESTTYPE_ATTR, testTypes[0].getHandleIdentifier());
-			PDEPlugin.getDefault().getLaunchListener().manage(launch);
-			IVMRunner runner = getVMRunner(configuration, mode);
-			if (runner != null)
-				runner.run(runnerConfig, launch, monitor);
-			else
-				monitor.setCanceled(true);
-			monitor.worked(1);
-		} catch (CoreException e) {
-			monitor.setCanceled(true);
-			throw e;
-		}
-	}
-	
-	public IVMRunner getVMRunner(ILaunchConfiguration configuration, String mode) throws CoreException {
-		IVMInstall launcher = VMHelper.createLauncher(configuration);
-		return launcher.getVMRunner(mode);
-	}
-	/*
-	 * @see JUnitBaseLauncherDelegate#configureVM(IType[], int, String)
-	 */
-	protected VMRunnerConfiguration createVMRunner(
-		ILaunchConfiguration configuration,
-		IType[] testTypes,
-		int port,
-		String runMode)
-		throws CoreException {
-
-		// Program arguments
-		String[] programArgs = getProgramArgumentsArray(configuration, testTypes, port, runMode);
-		if (programArgs == null)
-			return null;
-
-		VMRunnerConfiguration runnerConfig =
-			new VMRunnerConfiguration("org.eclipse.core.launcher.Main", getClasspath(configuration)); //$NON-NLS-1$
-		runnerConfig.setVMArguments(getVMArgumentsArray(configuration));
-		runnerConfig.setProgramArguments(programArgs);
-		runnerConfig.setEnvironment(getEnvironment(configuration));
-		runnerConfig.setWorkingDirectory(getWorkingDirectory(configuration).getAbsolutePath());
-		runnerConfig.setVMSpecificAttributesMap(getVMSpecificAttributesMap(configuration));
-		return runnerConfig;
-	}
-
-	protected String getTestPluginId(ILaunchConfiguration configuration)
-		throws CoreException {
-		IJavaProject javaProject = getJavaProject(configuration);
-		IPluginModelBase model =
-			PDECore.getDefault().getModelManager().findModel(javaProject.getProject());
-		if (model == null)
-			throw new CoreException(
-				new Status(
-					IStatus.ERROR,
-					PDEPlugin.PLUGIN_ID,
-					IStatus.ERROR,
-					PDEUIMessages.JUnitLaunchConfiguration_error_notaplugin, 
-					null));
-		if (model instanceof IFragmentModel)
-			return ((IFragmentModel)model).getFragment().getPluginId();
-
-		return model.getPluginBase().getId();
-	}
-	
-	protected void abort(String message, Throwable exception, int code)
-		throws CoreException {
-		throw new CoreException(new Status(IStatus.ERROR, PDEPlugin.PLUGIN_ID, code, message, exception));
-	}
-	
-	public String[] getProgramArgumentsArray(
-		ILaunchConfiguration configuration,
-		IType[] testTypes,
-		int port,
-		String runMode)
-		throws CoreException {
-		ArrayList programArgs = new ArrayList();
-		
-		// Get the list of plug-ins to run
-		Map pluginMap = LaunchPluginValidator.getPluginsToRun(configuration);
-		if (pluginMap == null)
-			return null;		
-		addRequiredPlugins(pluginMap);
-		
-		programArgs.add("-version"); //$NON-NLS-1$
-		programArgs.add("3"); //$NON-NLS-1$
-		
-		// Specify the application to launch based on the list of plug-ins to run.
-		programArgs.add("-application"); //$NON-NLS-1$
-		programArgs.add(getApplicationName(pluginMap, configuration));
-		
-		// If a product is specified, then add it to the program args
-		if (configuration.getAttribute(USE_PRODUCT, false)) {
-			programArgs.add("-product"); //$NON-NLS-1$
-			programArgs.add(configuration.getAttribute(PRODUCT, "")); //$NON-NLS-1$
-		} else {
-			// Specify the application to test
-			String testApplication = configuration.getAttribute(APP_TO_TEST, (String)null);
-			if (testApplication != null && testApplication.length() > 0) {
-				programArgs.add("-testApplication"); //$NON-NLS-1$
-				programArgs.add(testApplication);
-			}
-		}
-		
-		// Specify the location of the runtime workbench
-		String targetWorkspace = LaunchArgumentsHelper.getWorkspaceLocation(configuration);
-		if (targetWorkspace.length() > 0) {
-			programArgs.add("-data"); //$NON-NLS-1$
-			programArgs.add(targetWorkspace);
-		}
-		
-		// Create the platform configuration for the runtime workbench
-		if (PDECore.getDefault().getModelManager().isOSGiRuntime()) {
-			String productID = LaunchConfigurationHelper.getProductID(configuration);
-			LaunchConfigurationHelper.createConfigIniFile(configuration,
-					productID, pluginMap, getConfigDir(configuration));
-			TargetPlatform.createPlatformConfigurationArea(
-					pluginMap,
-					getConfigDir(configuration),
-					LaunchConfigurationHelper.getContributingPlugin(productID));
-		} else {
-			TargetPlatform.createPlatformConfigurationArea(
-					pluginMap,
-					getConfigDir(configuration),
-					LaunchConfigurationHelper.getPrimaryPlugin());
-			// Pre-OSGi platforms need the location of org.eclipse.core.boot specified
-			IPluginModelBase bootModel = (IPluginModelBase)pluginMap.get("org.eclipse.core.boot"); //$NON-NLS-1$
-			String bootPath = LaunchConfigurationHelper.getBootPath(bootModel);
-			if (bootPath != null && !bootPath.endsWith(".jar")) { //$NON-NLS-1$
-				programArgs.add("-boot"); //$NON-NLS-1$
-				programArgs.add("file:" + bootPath); //$NON-NLS-1$
-			}			
-		}
-		
-		programArgs.add("-configuration"); //$NON-NLS-1$
-		if (PDECore.getDefault().getModelManager().isOSGiRuntime())
-			programArgs.add("file:" + new Path(getConfigDir(configuration).getPath()).addTrailingSeparator().toString()); //$NON-NLS-1$
-		else
-			programArgs.add("file:" + new Path(getConfigDir(configuration).getPath()).append("platform.cfg").toString()); //$NON-NLS-1$ //$NON-NLS-2$
-		
-		// Specify the output folder names
-		programArgs.add("-dev"); //$NON-NLS-1$
-		if (PDECore.getDefault().getModelManager().isOSGiRuntime())
-			programArgs.add(ClasspathHelper.getDevEntriesProperties(getConfigDir(configuration).toString() + "/dev.properties", pluginMap)); //$NON-NLS-1$
-		else
-			programArgs.add(ClasspathHelper.getDevEntries(true));
-		
-		// necessary for PDE to know how to load plugins when target platform = host platform
-		// see PluginPathFinder.getPluginPaths()
-		if (pluginMap.containsKey(PDECore.getPluginId()))
-			programArgs.add("-pdelaunch"); //$NON-NLS-1$	
-
-		// Create the .options file if tracing is turned on
-		if (configuration.getAttribute(TRACING, false)
-				&& !TRACING_NONE.equals(configuration.getAttribute(
-						TRACING_CHECKED, (String) null))) {
-			programArgs.add("-debug"); //$NON-NLS-1$
-			String path = getConfigDir(configuration).getPath() + Path.SEPARATOR + ".options"; //$NON-NLS-1$
-			programArgs.add(LaunchArgumentsHelper.getTracingFileArgument(configuration, path));
-		}
-		
-		// add the program args specified by the user
-		String[] userArgs = LaunchArgumentsHelper.getUserProgramArgumentArray(configuration);
-		for (int i = 0; i < userArgs.length; i++) {
-			// be forgiving if people have tracing turned on and forgot
-			// to remove the -debug from the program args field.
-			if (userArgs[i].equals("-debug") && programArgs.contains("-debug")) //$NON-NLS-1$ //$NON-NLS-2$
-				continue;
-			programArgs.add(userArgs[i]);
-		}
-		
-		if (!programArgs.contains("-os")) { //$NON-NLS-1$
-			programArgs.add("-os"); //$NON-NLS-1$
-			programArgs.add(TargetPlatform.getOS());
-		}
-		if (!programArgs.contains("-ws")) { //$NON-NLS-1$
-			programArgs.add("-ws"); //$NON-NLS-1$
-			programArgs.add(TargetPlatform.getWS());
-		}
-		if (!programArgs.contains("-arch")) { //$NON-NLS-1$
-			programArgs.add("-arch"); //$NON-NLS-1$
-			programArgs.add(TargetPlatform.getOSArch());
-		}
-			
-		if (keepAlive(configuration) && runMode.equals(ILaunchManager.DEBUG_MODE))
-			programArgs.add("-keepalive"); //$NON-NLS-1$
-		programArgs.add("-port"); //$NON-NLS-1$
-		programArgs.add(Integer.toString(port));
-		programArgs.add("-testpluginname"); //$NON-NLS-1$
-		programArgs.add(getTestPluginId(configuration));
-		String testFailureNames = configuration.getAttribute(JUnitBaseLaunchConfiguration.FAILURES_FILENAME_ATTR, ""); //$NON-NLS-1$
-		if (testFailureNames.length() > 0) {
-			programArgs.add("-testfailures"); //$NON-NLS-1$
-			programArgs.add(testFailureNames);			
-		}
-
-		// a testname was specified just run the single test
-		String testName =
-			configuration.getAttribute(JUnitBaseLaunchConfiguration.TESTNAME_ATTR, ""); //$NON-NLS-1$
-		if (testName.length() > 0) {
-			programArgs.add("-test"); //$NON-NLS-1$
-			programArgs.add(testTypes[0].getFullyQualifiedName() + ":" + testName); //$NON-NLS-1$
-		} else {
-			programArgs.add("-classnames"); //$NON-NLS-1$
-			for (int i = 0; i < testTypes.length; i++)
-			programArgs.add(testTypes[i].getFullyQualifiedName());
-		}
-		return (String[]) programArgs.toArray(new String[programArgs.size()]);
-	}
-	
-	protected IPluginModelBase[] addRequiredPlugins(Map pluginMap)
-		throws CoreException {
-		if (!pluginMap.containsKey("org.eclipse.pde.junit.runtime")) { //$NON-NLS-1$
-			pluginMap.put(
-				"org.eclipse.pde.junit.runtime", //$NON-NLS-1$
-				findPlugin("org.eclipse.pde.junit.runtime")); //$NON-NLS-1$
-		}
-		if (!pluginMap.containsKey("org.eclipse.jdt.junit.runtime")) { //$NON-NLS-1$
-			pluginMap.put(
-				"org.eclipse.jdt.junit.runtime", //$NON-NLS-1$
-				findPlugin("org.eclipse.jdt.junit.runtime")); //$NON-NLS-1$
-		}
-		if (!pluginMap.containsKey("org.junit")) { //$NON-NLS-1$
-			pluginMap.put("org.junit", findPlugin("org.junit")); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		return (IPluginModelBase[]) pluginMap.values().toArray(
-			new IPluginModelBase[pluginMap.size()]);
-	}
-	
-	protected IPluginModelBase findPlugin(String id) throws CoreException {
-		PluginModelManager manager = PDECore.getDefault().getModelManager();
-		IPluginModelBase model = manager.findModel(id);
-		if (model != null)
-			return model;
-
-		if (registryPlugins == null) {
-			URL[] pluginPaths = ConfiguratorUtils.getCurrentPlatformConfiguration().getPluginPath();
-			PDEState state = new PDEState(pluginPaths, false, new NullProgressMonitor());
-			registryPlugins = state.getTargetModels();
-		}
-
-		for (int i = 0; i < registryPlugins.length; i++) {
-			if (registryPlugins[i].getPluginBase().getId().equals(id))
-				return registryPlugins[i];
-		}
-		abort(
-			NLS.bind(PDEUIMessages.JUnitLaunchConfiguration_error_missingPlugin, id),
-			null,
-			IStatus.OK);
-		return null;
-	}
-	
-	public String[] getVMArgumentsArray(ILaunchConfiguration configuration) throws CoreException {
-		return new ExecutionArguments(getVMArguments(configuration),"").getVMArgumentsArray();		 //$NON-NLS-1$
-	}
-	
-	public String getProgramArguments(ILaunchConfiguration configuration)
-		throws CoreException {
-		return LaunchArgumentsHelper.getUserProgramArguments(configuration);
-	}
-	
-	public String getVMArguments(ILaunchConfiguration configuration)
-		throws CoreException {
-		return LaunchArgumentsHelper.getUserVMArguments(configuration);
-	}
-	
-	public String[] getEnvironment(ILaunchConfiguration configuration) throws CoreException {
-		return DebugPlugin.getDefault().getLaunchManager().getEnvironment(configuration);
-	}
-	
-	public String[] getClasspath(ILaunchConfiguration configuration) throws CoreException {
-		String[] classpath = LaunchArgumentsHelper.constructClasspath(configuration);
-		if (classpath == null) {
-			abort(PDEUIMessages.WorkbenchLauncherConfigurationDelegate_noStartup, null, IStatus.OK);
-		}
-		return classpath;
-	}
-	
-	public File getWorkingDirectory(ILaunchConfiguration configuration) throws CoreException {
-		return LaunchArgumentsHelper.getWorkingDirectory(configuration);
-	}
-	
-	public Map getVMSpecificAttributesMap(ILaunchConfiguration configuration) throws CoreException {
-		return LaunchArgumentsHelper.getVMSpecificAttributesMap(configuration);
-	}
-
-	protected void setDefaultSourceLocator(ILaunch launch, ILaunchConfiguration configuration) throws CoreException {
-		LauncherUtils.setDefaultSourceLocator(configuration);
-	}
-	
-	protected String getDefaultWorkspace(ILaunchConfiguration config) throws CoreException {
-		if (config.getAttribute(APPLICATION, UI_APPLICATION).equals(UI_APPLICATION))
-			return LauncherUtils.getDefaultPath().append("junit-workbench-workspace").toPortableString(); //$NON-NLS-1$
-		return LauncherUtils.getDefaultPath().append("junit-core-workspace").toPortableString();				 //$NON-NLS-1$
-	}
-	
-	protected String getApplicationName(Map pluginMap, ILaunchConfiguration configuration) {
-		try {
-			String application = configuration.getAttribute(APPLICATION, (String)null);
-			if (CORE_APPLICATION.equals(application)) {
-				if (PDECore.getDefault().getModelManager().isOSGiRuntime())
-					return CORE_APPLICATION;
-				return LEGACY_CORE_APPLICATION;
-			}			
-		} catch (CoreException e) {
-		}
-				
-		IPluginModelBase model = (IPluginModelBase)pluginMap.get("org.eclipse.ui"); //$NON-NLS-1$
-		if (model != null) {
-			IPluginExtension[] extensions = model.getPluginBase().getExtensions();
-			for (int i = 0; i < extensions.length; i++) {
-				String point = extensions[i].getPoint();
-				if (point != null && point.equals("org.eclipse.core.runtime.applications")) { //$NON-NLS-1$
-					if ("workbench".equals(extensions[i].getId())){ //$NON-NLS-1$
-						return LEGACY_UI_APPLICATION;
-					}
-				}
-			}
-		}
-		return UI_APPLICATION;
-	}
-	
-	public static String getPluginID(ILaunchConfiguration configuration) {
-		try {
-			String projectID = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, ""); //$NON-NLS-1$
-			if (projectID.length() > 0) {
-				IResource project = PDEPlugin.getWorkspace().getRoot().findMember(projectID);
-				if (project != null && project instanceof IProject) {
-					IPluginModelBase model = PDECore.getDefault().getModelManager().findModel((IProject)project);
-					if (model != null) {
-						return model.getPluginBase().getId();
-					}
-				}
-			}
-		} catch (CoreException e) {
-		}
-		return null;
-	}
-	
-	public static boolean requiresUI(ILaunchConfiguration configuration) {
-		String id = getPluginID(configuration);
-		if (id != null) {
-			IPluginModelBase[] models = getPluginAndPrereqs(id);
-			for (int i = 0; i < models.length; i++) {
-				if ("org.eclipse.swt".equals(models[i].getPluginBase().getId())) //$NON-NLS-1$
-					return true;
-			}
-			return false;
-		}
-		return true;
-	}
-	
-	public static IPluginModelBase[] getPluginAndPrereqs(String id) {
-		TreeMap map = new TreeMap();
-		addPluginAndPrereqs(id, map);
-		if (!PDECore.getDefault().getModelManager().isOSGiRuntime()) {
-			addPluginAndPrereqs("org.eclipse.core.boot", map); //$NON-NLS-1$
-			addPluginAndPrereqs("org.eclipse.core.runtime", map); //$NON-NLS-1$
-		}
-		
-		return (IPluginModelBase[])map.values().toArray(new IPluginModelBase[map.size()]);
-	}
-	
-	protected static void addPluginAndPrereqs(String id, TreeMap map) {
-		if (map.containsKey(id))
-			return;
-		
-		ModelEntry entry = PDECore.getDefault().getModelManager().findEntry(id);
-		if (entry == null)
-			return;
-		
-		IPluginModelBase model = entry.getActiveModel();
-		
-		map.put(id, model);
-		
-		IPluginImport[] imports = model.getPluginBase().getImports();
-		for (int i = 0; i < imports.length; i++) {
-			addPluginAndPrereqs(imports[i].getId(), map);
-		}
-		
-		if (model instanceof IFragmentModel) {
-			addPluginAndPrereqs(((IFragmentModel) model).getFragment().getPluginId(), map);
-		} else {
-			IFragmentModel[] fragments = PDEManager.findFragmentsFor(model);
-			for (int i = 0; i < fragments.length; i++) {
-				IFragment fragment = fragments[i].getFragment();
-				if (!"org.eclipse.ui.workbench.compatibility".equals(fragment.getId())) //$NON-NLS-1$
-					addPluginAndPrereqs(fragment.getId(), map);
-			}
-		}
-	}
-
-	
-	protected File getConfigDir(ILaunchConfiguration config) {
-		if (fConfigDir == null)
-			fConfigDir = LaunchConfigurationHelper.getConfigurationArea(config);
-	
-		return fConfigDir;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.LaunchConfigurationDelegate#getBuildOrder(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String)
-	 */
-	protected IProject[] getBuildOrder(ILaunchConfiguration configuration,
-			String mode) throws CoreException {
-		return computeBuildOrder(LaunchPluginValidator.getAffectedProjects(configuration));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.LaunchConfigurationDelegate#getProjectsForProblemSearch(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String)
-	 */
-	protected IProject[] getProjectsForProblemSearch(
-			ILaunchConfiguration configuration, String mode)
-			throws CoreException {
-		return LaunchPluginValidator.getAffectedProjects(configuration);
-	}
-
-
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/JUnitProgramBlock.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/JUnitProgramBlock.java
deleted file mode 100644
index d8dc720..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/JUnitProgramBlock.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-
-import java.util.TreeSet;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.ui.launcher.AbstractLauncherTab;
-import org.eclipse.pde.ui.launcher.IPDELauncherConstants;
-
-public class JUnitProgramBlock extends ProgramBlock {
-
-	public JUnitProgramBlock(AbstractLauncherTab tab) {
-		super(tab);
-	}
-
-	protected String getApplicationAttribute() {
-		return IPDELauncherConstants.APP_TO_TEST;
-	}
-	
-	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
-		if (!JUnitLaunchConfiguration.requiresUI(config))
-			config.setAttribute(IPDELauncherConstants.APPLICATION, 
-					JUnitLaunchConfiguration.CORE_APPLICATION);
-		else
-			super.setDefaults(config);
-	}
-	
-	protected String[] getApplicationNames() {
-		TreeSet result = new TreeSet();
-		result.add(PDEUIMessages.JUnitProgramBlock_headless); 
-		String[] appNames = super.getApplicationNames();
-		for (int i = 0; i < appNames.length; i++) {
-			result.add(appNames[i]);
-		}
-		return (String[])result.toArray(new String[result.size()]);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.launcher.BasicLauncherTab#initializeApplicationSection(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	protected void initializeApplicationSection(ILaunchConfiguration config)
-			throws CoreException {
-		String application = config.getAttribute(IPDELauncherConstants.APPLICATION, (String)null);
-		if (JUnitLaunchConfiguration.CORE_APPLICATION.equals(application)) 
-			fApplicationCombo.setText(PDEUIMessages.JUnitProgramBlock_headless); 
-		else
-			super.initializeApplicationSection(config);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.launcher.BasicLauncherTab#saveApplicationSection(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	protected void saveApplicationSection(ILaunchConfigurationWorkingCopy config) {
-		if (fApplicationCombo.getText().equals(PDEUIMessages.JUnitProgramBlock_headless)) { 
-			config.setAttribute(IPDELauncherConstants.APPLICATION, JUnitLaunchConfiguration.CORE_APPLICATION);
-			config.setAttribute(IPDELauncherConstants.APP_TO_TEST, (String)null);
-		} else {
-			config.setAttribute(IPDELauncherConstants.APPLICATION, (String)null);
-			super.saveApplicationSection(config);
-		}
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/JUnitTabGroup.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/JUnitTabGroup.java
deleted file mode 100644
index 91df26a..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/JUnitTabGroup.java
+++ /dev/null

@@ -1,47 +0,0 @@
-package org.eclipse.pde.internal.ui.launcher;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
- 
-
-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.sourcelookup.SourceLookupTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaArgumentsTab;
-import org.eclipse.jdt.internal.junit.launcher.JUnitMainTab;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.ui.launcher.ConfigurationTab;
-import org.eclipse.pde.ui.launcher.PluginJUnitMainTab;
-import org.eclipse.pde.ui.launcher.PluginsTab;
-import org.eclipse.pde.ui.launcher.TracingTab;
-
-public class JUnitTabGroup extends AbstractPDELaunchConfigurationTabGroup {
-	
-	/**
-	 * @see ILaunchConfigurationTabGroup#createTabs(ILaunchConfigurationDialog, String)
-	 */
-	public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
-		ILaunchConfigurationTab[] tabs = null;
-		if (PDECore.getDefault().getModelManager().isOSGiRuntime()) {
-			tabs = new ILaunchConfigurationTab[]{new JUnitMainTab(),
-					new PluginJUnitMainTab(), new JavaArgumentsTab(),
-					new PluginsTab(false),	
-					 new ConfigurationTab(true), new TracingTab(),
-					new EnvironmentTab(), new SourceLookupTab(), 
-					new CommonTab()};
-		} else {
-			tabs = new ILaunchConfigurationTab[]{new JUnitMainTab(),
-					new PluginJUnitMainTab(), 
-					new JavaArgumentsTab(),
-					new PluginsTab(false),
-					new TracingTab(), new EnvironmentTab(),
-					new SourceLookupTab(), new CommonTab()};
-		}
-		setTabs(tabs);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/JUnitWorkbenchShortcut.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/JUnitWorkbenchShortcut.java
deleted file mode 100644
index 8ed18f6..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/JUnitWorkbenchShortcut.java
+++ /dev/null

@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-
-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.jdt.core.IJavaProject;
-import org.eclipse.jdt.internal.junit.launcher.JUnitBaseLaunchConfiguration;
-import org.eclipse.jdt.internal.junit.launcher.JUnitLaunchShortcut;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.pde.internal.core.TargetPlatform;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.ui.launcher.IPDELauncherConstants;
-
-public class JUnitWorkbenchShortcut extends JUnitLaunchShortcut {	
-	
-	/**
-	 * Returns the local java launch config type
-	 */
-	protected ILaunchConfigurationType getJUnitLaunchConfigType() {
-		ILaunchManager lm= DebugPlugin.getDefault().getLaunchManager();
-		return lm.getLaunchConfigurationType("org.eclipse.pde.ui.JunitLaunchConfig");		 //$NON-NLS-1$
-	}
-	
-	protected ILaunchConfiguration createConfiguration(
-		IJavaProject project, String name, String mainType, String container, String testName) {
-		ILaunchConfiguration config = null;
-		try {
-			ILaunchConfigurationType configType= getJUnitLaunchConfigType();
-			String computedName = DebugPlugin.getDefault().getLaunchManager().generateUniqueLaunchConfigurationNameFrom(name);
-			ILaunchConfigurationWorkingCopy wc = configType.newInstance(null, computedName);
-			wc.setAttribute(IPDELauncherConstants.LOCATION, getDefaultWorkspaceLocation(wc)); //$NON-NLS-1$
-			wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, ""); //$NON-NLS-1$
-			wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, ""); //$NON-NLS-1$
-			wc.setAttribute(IPDELauncherConstants.USE_DEFAULT, true);
-			wc.setAttribute(IPDELauncherConstants.DOCLEAR, true);
-			wc.setAttribute(IPDELauncherConstants.ASKCLEAR, false);
-			wc.setAttribute(IPDELauncherConstants.TRACING_CHECKED, IPDELauncherConstants.TRACING_NONE);
-			wc.setAttribute(IPDELauncherConstants.CONFIG_CLEAR_AREA, true);
-			wc.setAttribute(
-				IJavaLaunchConfigurationConstants.ATTR_SOURCE_PATH_PROVIDER,
-				"org.eclipse.pde.ui.workbenchClasspathProvider"); //$NON-NLS-1$
-			wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, project.getElementName());
-			wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, mainType);
-			wc.setAttribute(JUnitBaseLaunchConfiguration.ATTR_KEEPRUNNING, false);
-			wc.setAttribute(JUnitBaseLaunchConfiguration.LAUNCH_CONTAINER_ATTR, container);
-			if (testName.length() > 0)
-				wc.setAttribute(JUnitBaseLaunchConfiguration.TESTNAME_ATTR, testName);	
-			if (JUnitLaunchConfiguration.requiresUI(wc)) {
-				String product = TargetPlatform.getDefaultProduct();
-				if (product != null) {
-					wc.setAttribute(IPDELauncherConstants.USE_PRODUCT, true);
-					wc.setAttribute(IPDELauncherConstants.PRODUCT, product);
-				}
-			} else {
-				wc.setAttribute(IPDELauncherConstants.APPLICATION, JUnitLaunchConfiguration.CORE_APPLICATION);				
-			}
-			config= wc.doSave();		
-		} catch (CoreException ce) {
-			PDEPlugin.log(ce);
-		}
-		return config;
-	}
-	
-	protected String getDefaultWorkspaceLocation(ILaunchConfiguration configuration) {
-		return LaunchArgumentsHelper.getDefaultWorkspaceLocation(configuration.getName());
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LaunchAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LaunchAction.java
deleted file mode 100644
index 0975946..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LaunchAction.java
+++ /dev/null

@@ -1,257 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-
-import java.io.*;
-import java.util.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.*;
-import org.eclipse.debug.ui.*;
-import org.eclipse.jdt.launching.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.core.ifeature.*;
-import org.eclipse.pde.internal.core.iproduct.*;
-import org.eclipse.pde.internal.core.util.CoreUtility;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.ui.launcher.IPDELauncherConstants;
-import org.eclipse.ui.dialogs.*;
-
-public class LaunchAction extends Action {
-
-	private IProduct fProduct;
-	private String fMode;
-	private String fPath;
-
-	public LaunchAction(IProduct product, String path, String mode) {
-		fProduct = product;
-		fMode = mode;
-		fPath = path;
-	}
-	
-	public void run() {
-		try {
-			ILaunchConfiguration config = findLaunchConfiguration();
-			if (config != null)
-				DebugUITools.launch(config, fMode);
-		} catch (CoreException e) {
-		}
-	}
-	
-	private ILaunchConfiguration findLaunchConfiguration() throws CoreException {
-		ILaunchConfiguration[] configs = getLaunchConfigurations();
-		
-		if (configs.length == 0)
-			return createConfiguration();
-
-		ILaunchConfiguration config = null;
-		if (configs.length == 1) {
-			config = configs[0];
-		} else {
-			// Prompt the user to choose a config. 
-			config = chooseConfiguration(configs);
-		}
-		
-		if (config != null) {
-			config = refreshConfiguration(config.getWorkingCopy());
-		}
-		return config;
-	}
-
-	private ILaunchConfiguration refreshConfiguration(ILaunchConfigurationWorkingCopy wc) throws CoreException {
-		wc.setAttribute(IPDELauncherConstants.PRODUCT, fProduct.getId());
-		wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, getVMArguments()); 
-		wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, getProgramArguments());
-		StringBuffer wsplugins = new StringBuffer();
-		StringBuffer explugins = new StringBuffer();
-		IPluginModelBase[] models = getModels();
-		for (int i = 0; i < models.length; i++) {
-			IPluginModelBase model = models[i];
-			String id = model.getPluginBase().getId();
-			if (model.getUnderlyingResource() == null) {
-				explugins.append(id);
-				explugins.append(","); //$NON-NLS-1$
-			} else {
-				wsplugins.append(id);
-				wsplugins.append(","); //$NON-NLS-1$
-			}	
-		}
-		wc.setAttribute(IPDELauncherConstants.SELECTED_WORKSPACE_PLUGINS, wsplugins.toString());
-		wc.setAttribute(IPDELauncherConstants.SELECTED_TARGET_PLUGINS, explugins.toString());
-		String configIni = getTemplateConfigIni();
-		wc.setAttribute(IPDELauncherConstants.CONFIG_GENERATE_DEFAULT, configIni == null);
-		if (configIni != null)
-			wc.setAttribute(IPDELauncherConstants.CONFIG_TEMPLATE_LOCATION, configIni);
-		return wc.doSave();
-	}
-	
-	private String getProgramArguments() {
-		IArgumentsInfo info = fProduct.getLauncherArguments();
-		return (info != null) ? CoreUtility.normalize(info.getProgramArguments()) : ""; //$NON-NLS-1$
-	}
-	
-	private String getVMArguments() {
-		IArgumentsInfo info = fProduct.getLauncherArguments();
-		return (info != null) ? CoreUtility.normalize(info.getVMArguments()) : ""; //$NON-NLS-1$
-	}	
-	
-	private IPluginModelBase[] getModels() {
-		HashMap map = new HashMap();
-		PluginModelManager manager = PDECore.getDefault().getModelManager();
-		if (fProduct.useFeatures()) {
-			IFeatureModel[] features = getUniqueFeatures();
-			for (int i = 0; i < features.length; i++) {
-				addFeaturePlugins(features[i].getFeature(), map);
-			}
-		} else {
-			IProductPlugin[] plugins = fProduct.getPlugins();
-			for (int i = 0; i < plugins.length; i++) {
-				String id = plugins[i].getId();
-				if (id == null || map.containsKey(id))
-					continue;
-				IPluginModelBase model = manager.findModel(id);
-				if (model != null)
-					map.put(id, model);				
-			}
-		}
-		return (IPluginModelBase[])map.values().toArray(new IPluginModelBase[map.size()]);
-	}
-	
-	private IFeatureModel[] getUniqueFeatures() {
-		ArrayList list = new ArrayList();
-		IProductFeature[] features = fProduct.getFeatures();
-		for (int i = 0; i < features.length; i++) {
-			String id = features[i].getId();
-			String version = features[i].getVersion();
-			addFeatureAndChildren(id, version, list);
-		}
-		return (IFeatureModel[])list.toArray(new IFeatureModel[list.size()]);
-	}
-	
-	private void addFeatureAndChildren(String id, String version, List list) {
-		FeatureModelManager manager = PDECore.getDefault().getFeatureModelManager();
-		IFeatureModel model = manager.findFeatureModel(id, version);
-		if (model == null || list.contains(model))
-			return;
-		
-		list.add(model);
-		
-		IFeatureChild[] children = model.getFeature().getIncludedFeatures();
-		for (int i = 0; i < children.length; i++) {
-			addFeatureAndChildren(children[i].getId(), children[i].getVersion(), list);
-		}	
-	}
-	
-	private void addFeaturePlugins(IFeature feature, HashMap map) {
-		PluginModelManager manager = PDECore.getDefault().getModelManager();
-		IFeaturePlugin[] plugins = feature.getPlugins();
-		for (int i = 0; i < plugins.length; i++) {
-			String id = plugins[i].getId();
-			if (id == null || map.containsKey(id))
-				continue;
-			IPluginModelBase model = manager.findModel(id);
-			if (model != null)
-				map.put(id, model);
-		}
-	}
-	
-	private String getTemplateConfigIni() {
-		IConfigurationFileInfo info = fProduct.getConfigurationFileInfo();
-		if (info != null  && info.getUse().equals("custom")) { //$NON-NLS-1$
-			String path = getExpandedPath(info.getPath());
-			if (path != null) {
-				File file = new File(path);
-				if (file.exists() && file.isFile())
-					return file.getAbsolutePath();
-			}
-		}
-		return null;
-	}
-	
-	private String getExpandedPath(String path) {
-		if (path == null || path.length() == 0)
-			return null;
-		IResource resource = PDEPlugin.getWorkspace().getRoot().findMember(new Path(path));
-		if (resource != null) {
-			IPath fullPath = resource.getLocation();
-			return fullPath == null ? null : fullPath.toOSString();
-		}
-		return null;
-	}
-
-
-	private ILaunchConfiguration chooseConfiguration(ILaunchConfiguration[] configs) {
-		IDebugModelPresentation labelProvider = DebugUITools.newDebugModelPresentation();
-		ElementListSelectionDialog dialog= new ElementListSelectionDialog(PDEPlugin.getActiveWorkbenchShell(), labelProvider);
-		dialog.setElements(configs);
-		dialog.setTitle(PDEUIMessages.RuntimeWorkbenchShortcut_title);  
-		if (fMode.equals(ILaunchManager.DEBUG_MODE)) {
-			dialog.setMessage(PDEUIMessages.RuntimeWorkbenchShortcut_select_debug); 
-		} else {
-			dialog.setMessage(PDEUIMessages.RuntimeWorkbenchShortcut_select_run);  
-		}
-		dialog.setMultipleSelection(false);
-		int result= dialog.open();
-		labelProvider.dispose();
-		if (result == ElementListSelectionDialog.OK) {
-			return (ILaunchConfiguration)dialog.getFirstResult();
-		}
-		return null;		
-	}
-
-	private ILaunchConfiguration createConfiguration() throws CoreException {
-		ILaunchConfigurationType configType = getWorkbenchLaunchConfigType();
-		String computedName = getComputedName(new Path(fPath).lastSegment());
-		ILaunchConfigurationWorkingCopy wc = configType.newInstance(null, computedName);  
-		wc.setAttribute(IPDELauncherConstants.LOCATION, LaunchArgumentsHelper.getDefaultWorkspaceLocation(computedName)); //$NON-NLS-1$
-		wc.setAttribute(IPDELauncherConstants.USEFEATURES, false);
-		wc.setAttribute(IPDELauncherConstants.USE_DEFAULT, false);
-		wc.setAttribute(IPDELauncherConstants.DOCLEAR, false);
-		wc.setAttribute(IPDELauncherConstants.ASKCLEAR, true);
-		wc.setAttribute(IPDELauncherConstants.USE_PRODUCT, true);
-		wc.setAttribute(IPDELauncherConstants.AUTOMATIC_ADD, false);
-		wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_SOURCE_PATH_PROVIDER, RuntimeWorkbenchShortcut.CLASSPATH_PROVIDER);
-		wc.setAttribute(IPDELauncherConstants.PRODUCT_FILE, fPath);
-		return refreshConfiguration(wc);		
-	}
-	
-	private String getComputedName(String prefix) {
-		ILaunchManager lm = DebugPlugin.getDefault().getLaunchManager();
-		return lm.generateUniqueLaunchConfigurationNameFrom(prefix);
-	}
-	
-	private ILaunchConfiguration[] getLaunchConfigurations() throws CoreException {
-		ArrayList result = new ArrayList();
-		ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager();
-		ILaunchConfigurationType type = manager.getLaunchConfigurationType(RuntimeWorkbenchShortcut.CONFIGURATION_TYPE);	
-		ILaunchConfiguration[] configs = manager.getLaunchConfigurations(type);
-		for (int i = 0; i < configs.length; i++) {
-			if (!DebugUITools.isPrivate(configs[i])) {
-				String path = configs[i].getAttribute(IPDELauncherConstants.PRODUCT_FILE, ""); //$NON-NLS-1$
-				if (new Path(fPath).equals(new Path(path))) {
-					result.add(configs[i]);
-				}
-			}
-		}
-		return (ILaunchConfiguration[]) result.toArray(new ILaunchConfiguration[result.size()]);
-	}
-	
-	protected ILaunchConfigurationType getWorkbenchLaunchConfigType() {
-		ILaunchManager lm = DebugPlugin.getDefault().getLaunchManager();
-		return lm.getLaunchConfigurationType(RuntimeWorkbenchShortcut.CONFIGURATION_TYPE);	
-	}	
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LaunchArgumentsHelper.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LaunchArgumentsHelper.java
deleted file mode 100644
index cdf6b12..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LaunchArgumentsHelper.java
+++ /dev/null

@@ -1,230 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.variables.IStringVariableManager;
-import org.eclipse.core.variables.VariablesPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.launching.ExecutionArguments;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.pde.core.plugin.IPlugin;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.ExternalModelManager;
-import org.eclipse.pde.internal.core.ModelEntry;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.TargetPlatform;
-import org.eclipse.pde.internal.core.TracingOptionsManager;
-import org.eclipse.pde.ui.launcher.IPDELauncherConstants;
-
-public class LaunchArgumentsHelper {
-
-	public static String getWorkspaceLocation(ILaunchConfiguration configuration) 
-				throws CoreException {
-		String location = configuration.getAttribute(IPDELauncherConstants.LOCATION, (String)null);
-		if (location == null) {
-			// backward compatibility
-			location = configuration.getAttribute(IPDELauncherConstants.LOCATION + "0", (String)null);  //$NON-NLS-1$
-			if (location != null) {
-				ILaunchConfigurationWorkingCopy wc = null;
-				if (configuration.isWorkingCopy()) {
-					wc = (ILaunchConfigurationWorkingCopy) configuration;
-				} else {
-					wc = configuration.getWorkingCopy();
-				}
-				wc.setAttribute(IPDELauncherConstants.LOCATION + "0", (String)null); //$NON-NLS-1$
-				wc.setAttribute(IPDELauncherConstants.LOCATION, location);
-				wc.doSave();
-			}
-		}
-		return getSubstitutedString(location);
-	}
-
-	public static String[] getUserProgramArgumentArray(ILaunchConfiguration configuration) throws CoreException {
-		String args = getUserProgramArguments(configuration);
-		return new ExecutionArguments("", getSubstitutedString(args)).getProgramArgumentsArray(); //$NON-NLS-1$
-	}
-	
-	public static String getUserProgramArguments(ILaunchConfiguration configuration) throws CoreException {
-		String args = configuration.getAttribute(
-				IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, 
-				(String)null);
-		if (args == null) {
-			// backward compatibility
-			args = configuration.getAttribute("progargs", (String)null); //$NON-NLS-1$
-			if (args != null) {
-				ILaunchConfigurationWorkingCopy wc = null;
-				if (configuration.isWorkingCopy()) {
-					wc = (ILaunchConfigurationWorkingCopy) configuration;
-				} else {
-					wc = configuration.getWorkingCopy();
-				}
-				wc.setAttribute("progargs", (String)null); //$NON-NLS-1$
-				wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, args);
-				wc.doSave();			
-			}
-		}
-		return args == null ? "" : args; //$NON-NLS-1$
-	}
-	
-	public static String[] getUserVMArgumentArray(ILaunchConfiguration configuration) throws CoreException {
-		String args = getUserVMArguments(configuration);
-		return new ExecutionArguments(getSubstitutedString(args), "").getVMArgumentsArray(); //$NON-NLS-1$
-	}
-	
-	public static String getUserVMArguments(ILaunchConfiguration configuration) throws CoreException {
-		String args = configuration.getAttribute(
-				IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, 
-				(String)null);
-		if (args == null) {
-			// backward compatibility
-			args = configuration.getAttribute("vmargs", (String)null); //$NON-NLS-1$
-			if (args != null) {
-				ILaunchConfigurationWorkingCopy wc = null;
-				if (configuration.isWorkingCopy()) {
-					wc = (ILaunchConfigurationWorkingCopy) configuration;
-				} else {
-					wc = configuration.getWorkingCopy();
-				}
-				wc.setAttribute("vmargs", (String)null); //$NON-NLS-1$
-				wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, args);
-				wc.doSave();			
-			}
-		}
-		return args == null ? "" : args; //$NON-NLS-1$
-	}
-	
-	public static File getWorkingDirectory(ILaunchConfiguration configuration) throws CoreException {
-		String working = configuration.getAttribute(
-				IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, 
-				LauncherUtils.getDefaultPath().toString());
-		File dir = new File(getSubstitutedString(working));
-		if (!dir.exists())
-			dir.mkdirs();
-		return dir;			
-	}
-	
-	public static Map getVMSpecificAttributesMap(ILaunchConfiguration config) throws CoreException {
-		Map map = new HashMap(2);
-		String javaCommand = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_JAVA_COMMAND, (String)null); 
-		map.put(IJavaLaunchConfigurationConstants.ATTR_JAVA_COMMAND, javaCommand);
-		if (TargetPlatform.getOS().equals("macosx")) { //$NON-NLS-1$
-			ModelEntry entry = PDECore.getDefault().getModelManager().findEntry("org.eclipse.jdt.debug"); //$NON-NLS-1$
-			if (entry != null) {
-				IPluginModelBase model = entry.getExternalModel();
-				if (model != null) {
-                    File file = new File(model.getInstallLocation());
-                    if (!file.isFile())
-                        file = new File(file, "jdi.jar"); //$NON-NLS-1$
-					if (file.exists())
-						map.put(IJavaLaunchConfigurationConstants.ATTR_BOOTPATH_PREPEND, new String[] {file.getAbsolutePath()});
-				}
-			}
-		}
-		return map;
-	}
-	
-	public static String getTracingFileArgument(
-			ILaunchConfiguration config,
-			String optionsFileName)
-			throws CoreException {
-		try {
-			TracingOptionsManager mng = PDECore.getDefault().getTracingOptionsManager();
-			Map options =
-				config.getAttribute(IPDELauncherConstants.TRACING_OPTIONS, (Map) null);
-			String selected = config.getAttribute(IPDELauncherConstants.TRACING_CHECKED, (String)null);
-			if (selected == null) {
-				mng.save(optionsFileName, options);
-			} else if (!selected.equals(IPDELauncherConstants.TRACING_NONE)) {
-				HashSet result = new HashSet();
-				StringTokenizer tokenizer = new StringTokenizer(selected, ","); //$NON-NLS-1$
-				while (tokenizer.hasMoreTokens()) {
-					result.add(tokenizer.nextToken());
-				}
-				mng.save(optionsFileName, options, result);
-			}
-		} catch (CoreException e) {
-			return ""; //$NON-NLS-1$
-		}
-		return optionsFileName;
-	}
-	
-	public static String[] constructClasspath(ILaunchConfiguration configuration) throws CoreException {
-		String jarPath = getStartupJarPath();
-		if (jarPath == null)
-			return null;
-		
-		ArrayList entries = new ArrayList();
-		entries.add(jarPath);
-		
-		String bootstrap = configuration.getAttribute(IPDELauncherConstants.BOOTSTRAP_ENTRIES, ""); //$NON-NLS-1$
-		StringTokenizer tok = new StringTokenizer(getSubstitutedString(bootstrap), ","); //$NON-NLS-1$
-		while (tok.hasMoreTokens())
-			entries.add(tok.nextToken().trim());
-		return (String[])entries.toArray(new String[entries.size()]);
-	}
-		
-	private static String getStartupJarPath() throws CoreException {
-		IPlugin plugin = PDECore.getDefault().findPlugin("org.eclipse.platform"); //$NON-NLS-1$
-		if (plugin != null && plugin.getModel().getUnderlyingResource() != null) {
-			IProject project = plugin.getModel().getUnderlyingResource().getProject();
-			if (project.hasNature(JavaCore.NATURE_ID)) {
-				IJavaProject jProject = JavaCore.create(project);
-				IPackageFragmentRoot[] roots = jProject.getPackageFragmentRoots();
-				for (int i = 0; i < roots.length; i++) {
-					if (roots[i].getKind() == IPackageFragmentRoot.K_SOURCE &&
-							roots[i].getPackageFragment("org.eclipse.core.launcher").exists()){ //$NON-NLS-1$
-						IPath path = jProject.getOutputLocation().removeFirstSegments(1);
-						return project.getLocation().append(path).toOSString();
-					}
-				}
-			}
-			if (project.getFile("startup.jar").exists()) //$NON-NLS-1$
-				return project.getFile("startup.jar").getLocation().toOSString(); //$NON-NLS-1$
-		}
-		File startupJar =
-			ExternalModelManager.getEclipseHome().append("startup.jar").toFile(); //$NON-NLS-1$
-		
-		// if something goes wrong with the preferences, fall back on the startup.jar 
-		// in the running eclipse.  
-		if (!startupJar.exists())
-			startupJar = new Path(ExternalModelManager.computeDefaultPlatformPath()).append("startup.jar").toFile(); //$NON-NLS-1$
-		
-		return startupJar.exists() ? startupJar.getAbsolutePath() : null;
-	}
-
-		
-	private static String getSubstitutedString(String text) throws CoreException {
-		if (text == null)
-			return ""; //$NON-NLS-1$
-		IStringVariableManager mgr = VariablesPlugin.getDefault().getStringVariableManager();
-		return mgr.performStringSubstitution(text);
-	}
-	
-	public static String getDefaultWorkspaceLocation(String uniqueName) {
-		return LauncherUtils.getDefaultPath().append("runtime-" + uniqueName.replaceAll("\\s", "")).toString();		//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LaunchConfigurationHelper.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LaunchConfigurationHelper.java
deleted file mode 100644
index 1379562..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LaunchConfigurationHelper.java
+++ /dev/null

@@ -1,348 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-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.core.variables.IStringVariableManager;
-import org.eclipse.core.variables.VariablesPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.osgi.service.resolver.BundleDescription;
-import org.eclipse.pde.core.plugin.IPluginElement;
-import org.eclipse.pde.core.plugin.IPluginExtension;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.core.plugin.IPluginObject;
-import org.eclipse.pde.internal.core.ExternalModelManager;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.TargetPlatform;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.ui.launcher.IPDELauncherConstants;
-
-public class LaunchConfigurationHelper {
-	
-	public static void synchronizeManifests(ILaunchConfiguration config, File configDir) {
-		if (!PDECore.getDefault().getModelManager().isOSGiRuntime())
-			return;
-		try {
-			String programArgs = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, 
-														""); //$NON-NLS-1$
-			if (programArgs.indexOf("-clean") != -1) //$NON-NLS-1$
-				return;
-		} catch (CoreException e) {
-		}
-		File dir = new File(configDir, "org.eclipse.osgi/manifests"); //$NON-NLS-1$
-		if (dir.exists() && dir.isDirectory()) {
-			PDECore.getDefault().getJavaElementChangeListener().synchronizeManifests(dir);	
-		}
-	}
-
-	public static File getConfigurationArea(ILaunchConfiguration config) {
-		File dir = getConfigurationLocation(config);
-		if (!dir.exists()) 
-			dir.mkdirs();		
-		return dir;		
-	}
-	
-	public static File getConfigurationLocation(ILaunchConfiguration config) {
-		File dir = new File(PDECore.getDefault().getStateLocation().toOSString(), config.getName());
-		try {
-			if (!config.getAttribute(IPDELauncherConstants.CONFIG_USE_DEFAULT_AREA, true)) {
-				String userPath = config.getAttribute(IPDELauncherConstants.CONFIG_LOCATION, (String)null);
-				if (userPath != null) {
-					userPath = getSubstitutedString(userPath);
-					dir = new File(userPath);
-				}
-			}
-		} catch (CoreException e) {
-		}		
-		return dir;		
-	}
-
-	private static String getSubstitutedString(String text) throws CoreException {
-		if (text == null)
-			return ""; //$NON-NLS-1$
-		IStringVariableManager mgr = VariablesPlugin.getDefault().getStringVariableManager();
-		return mgr.performStringSubstitution(text);
-	}
-	
-	public static Properties createConfigIniFile(ILaunchConfiguration configuration, String productID, Map map, File directory) throws CoreException {
-		Properties properties = null;
-		if (configuration.getAttribute(IPDELauncherConstants.CONFIG_GENERATE_DEFAULT, true)) {
-			properties = createNewPropertiesFile(productID, map);
-		} else {
-			String templateLoc = configuration.getAttribute(IPDELauncherConstants.CONFIG_TEMPLATE_LOCATION, (String)null);
-			if (templateLoc != null) {
-				properties = loadFromTemplate(getSubstitutedString(templateLoc));
-			}
-		}
-		if (properties == null)
-			properties = new Properties();
-		setBundleLocations(map, properties);
-		if (!directory.exists())
-			directory.mkdirs();
-		save(new File(directory, "config.ini"), properties); //$NON-NLS-1$
-		return properties;
-	}
-	
-	private static Properties createNewPropertiesFile(String productID, Map map) {
-		Properties properties = new Properties();
-		properties.setProperty("osgi.install.area", "file:" + ExternalModelManager.getEclipseHome().toOSString()); //$NON-NLS-1$ //$NON-NLS-2$
-		properties.setProperty("osgi.configuration.cascaded", "false"); //$NON-NLS-1$ //$NON-NLS-2$
-		properties.setProperty("osgi.framework", "org.eclipse.osgi"); //$NON-NLS-1$ //$NON-NLS-2$
-		if (productID != null)
-			addSplashLocation(properties, productID, map);
-		if (map.containsKey("org.eclipse.update.configurator")) { //$NON-NLS-1$
-			properties.setProperty("osgi.bundles", "org.eclipse.core.runtime@2:start,org.eclipse.update.configurator@3:start"); //$NON-NLS-1$ //$NON-NLS-2$
-		} else {
-			StringBuffer buffer = new StringBuffer();
-			Iterator iter = map.keySet().iterator();
-			while (iter.hasNext()) {
-				String id = iter.next().toString();
-				if ("org.eclipse.osgi".equals(id)) //$NON-NLS-1$
-					continue;
-				buffer.append(id);
-				if ("org.eclipse.core.runtime".equals(id)) { //$NON-NLS-1$
-					buffer.append("@2:start"); //$NON-NLS-1$
-				}
-				if (iter.hasNext())
-					buffer.append(","); //$NON-NLS-1$
-			}
-			properties.setProperty("osgi.bundles", buffer.toString()); //$NON-NLS-1$
-		}
-		properties.setProperty("osgi.bundles.defaultStartLevel", "4"); //$NON-NLS-1$ //$NON-NLS-2$
-		return properties;
-	}
-	
-	private static Properties loadFromTemplate(String templateLoc) throws CoreException {
-		Properties properties = new Properties();
-		File templateFile = new File(templateLoc);
-		if (templateFile.exists() && templateFile.isFile()) {
-			FileInputStream stream = null;
-			try {
-				stream = new FileInputStream(templateFile);
-				properties.load(stream);
-			} catch (Exception e) {
-				String message = e.getMessage();
-				if (message != null)
-					throw new CoreException(
-						new Status(
-							IStatus.ERROR,
-							PDEPlugin.getPluginId(),
-							IStatus.ERROR,
-							message,
-							e));
-			} finally {
-				if (stream != null) {
-					try {
-						stream.close();
-					} catch (IOException e) {
-					}
-				}
-			}
-		}
-		return properties;
-	}
-
-	private static void addSplashLocation(Properties properties, String productID, Map map)  {
-		Properties targetConfig = TargetPlatform.getConfigIniProperties("configuration/config.ini"); //$NON-NLS-1$
-		String targetProduct = targetConfig == null ? null : targetConfig.getProperty("eclipse.product"); //$NON-NLS-1$
-		String targetSplash = targetConfig == null ? null : targetConfig.getProperty("osgi.splashPath"); //$NON-NLS-1$
-		ArrayList locations = new ArrayList();
-		if (!productID.equals(targetProduct) || targetSplash == null) {
-			String plugin = getContributingPlugin(productID);
-			locations.add(plugin);
-			IPluginModelBase model = (IPluginModelBase)map.get(plugin);
-			if (model != null) {
-				BundleDescription desc = model.getBundleDescription();
-				if (desc != null) {
-					BundleDescription[] fragments = desc.getFragments();
-					for (int i = 0; i < fragments.length; i++)
-						locations.add(fragments[i].getSymbolicName());
-				}
-			}
-		} else {
-			StringTokenizer tok = new StringTokenizer(targetSplash, ","); //$NON-NLS-1$
-			while (tok.hasMoreTokens())
-				locations.add(tok.nextToken());			
-		}
-		
-		StringBuffer buffer = new StringBuffer();
-		for (int i = 0; i < locations.size(); i++) {
-			String location = (String)locations.get(i);
-			if (location.startsWith("platform:/base/plugins/")) { //$NON-NLS-1$
-				location = location.replaceFirst("platform:/base/plugins/", ""); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-			String url = TargetPlatform.getBundleURL(location, map);
-			if (url == null)
-				continue;
-			if (buffer.length() > 0)
-				buffer.append(","); //$NON-NLS-1$
-			buffer.append(url);
-		}
-		if (buffer.length() > 0)
-			properties.setProperty("osgi.splashPath", buffer.toString()); //$NON-NLS-1$
-	}
-	
-	
-	private static void setBundleLocations(Map map, Properties properties) {
-		String framework = properties.getProperty("osgi.framework"); //$NON-NLS-1$
-		if (framework != null) {
-			if (framework.startsWith("platform:/base/plugins/")) { //$NON-NLS-1$
-				framework.replaceFirst("platform:/base/plugins/", ""); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-			String url = TargetPlatform.getBundleURL(framework, map);
-			if (url != null)
-				properties.setProperty("osgi.framework", url); //$NON-NLS-1$
-		}
-		
-		String bundles = properties.getProperty("osgi.bundles"); //$NON-NLS-1$
-		if (bundles != null) {
-			StringBuffer buffer = new StringBuffer();
-			StringTokenizer tokenizer = new StringTokenizer(bundles, ","); //$NON-NLS-1$
-			while (tokenizer.hasMoreTokens()) {
-				String token = tokenizer.nextToken().trim();
-				String url = TargetPlatform.getBundleURL(token, map);
-				int index = -1;
-				if (url == null) {
-					index = token.indexOf('@');
-					if (index != -1) {
-						url = TargetPlatform.getBundleURL(token.substring(0,index), map);
-					}
-					if (url == null) {
-						index = token.indexOf(':');
-						if (index != -1) {
-							url = TargetPlatform.getBundleURL(token.substring(0,index), map);
-						}
-					}
-				}
-				if (url == null) {
-					buffer.append(token);
-				} else {
-					buffer.append("reference:" + url); //$NON-NLS-1$
-					if (index != -1)
-						buffer.append(token.substring(index));
-				}
-				if (tokenizer.hasMoreTokens())
-					buffer.append(","); //$NON-NLS-1$
-			}
-			properties.setProperty("osgi.bundles", buffer.toString()); //$NON-NLS-1$
-		}
-	}
-	
-	public static void save(File file, Properties properties) {
-		try {
-			FileOutputStream stream = new FileOutputStream(file);
-			properties.store(stream, "Configuration File"); //$NON-NLS-1$
-			stream.flush();
-			stream.close();
-		} catch (IOException e) {
-			PDECore.logException(e);
-		}
-	}
-
-	public static String getContributingPlugin(String productID) {
-		if (productID == null)
-			return null;
-		int index = productID.lastIndexOf('.');
-		return index == -1 ? productID : productID.substring(0, index);
-	}
-	
-	public static String getBootPath(IPluginModelBase bootModel) {
-		try {
-			IResource resource = bootModel.getUnderlyingResource();
-			if (resource != null) {
-				IProject project = resource.getProject();
-				if (project.hasNature(JavaCore.NATURE_ID)) {
-					resource = project.findMember("boot.jar"); //$NON-NLS-1$
-					if (resource != null)
-						return "file:" + resource.getLocation().toOSString(); //$NON-NLS-1$
-					IPath path = JavaCore.create(project).getOutputLocation();
-					if (path != null) {
-						IPath sourceBootPath =
-							project.getParent().getLocation().append(path);
-						return sourceBootPath.addTrailingSeparator().toOSString();
-					}
-				}
-			} else {
-				File bootJar = new File(bootModel.getInstallLocation(), "boot.jar"); //$NON-NLS-1$
-				if (bootJar.exists())
-					return "file:" + bootJar.getAbsolutePath(); //$NON-NLS-1$
-			}
-		} catch (CoreException e) {
-		}
-		return null;
-	}
-	
-	public static String getPrimaryPlugin() {
-		Properties properties = TargetPlatform.getConfigIniProperties("install.ini");		 //$NON-NLS-1$
-		return properties == null ? null : properties.getProperty("feature.default.id");		 //$NON-NLS-1$
-	}
-	
-	public static String getProductID(ILaunchConfiguration configuration) throws CoreException {
-		String result = null;
-		if (configuration.getAttribute(IPDELauncherConstants.USE_PRODUCT, false)) {
-			result = configuration.getAttribute(IPDELauncherConstants.PRODUCT, (String)null);
-		} else {
-			// find the product associated with the application, and return its contributing plug-in
-			String appID = configuration.getAttribute(IPDELauncherConstants.APPLICATION, getDefaultApplicationName());
-			IPluginModelBase[] plugins = PDECore.getDefault().getModelManager().getPlugins();
-			for (int i = 0; i < plugins.length; i++) {
-				String id = plugins[i].getPluginBase().getId();
-				IPluginExtension[] extensions = plugins[i].getPluginBase().getExtensions();
-				for (int j = 0; j < extensions.length; j++) {
-					String point = extensions[j].getPoint();
-					if (point != null && point.equals("org.eclipse.core.runtime.products")) {//$NON-NLS-1$
-						IPluginObject[] children = extensions[j].getChildren();
-						if (children.length != 1)
-							continue;
-						if (!"product".equals(children[0].getName())) //$NON-NLS-1$
-							continue;
-						if (appID.equals(((IPluginElement)children[0]).getAttribute("application").getValue())) { //$NON-NLS-1$
-							result = id;
-							break;
-						}
-					}
-				}
-			}
-		}
-		if (result != null)
-			return result;
-		
-		Properties properties = TargetPlatform.getConfigIniProperties("configuration/config.ini");		 //$NON-NLS-1$
-		return properties == null ? null : properties.getProperty("eclipse.product"); //$NON-NLS-1$
-	}
-
-	public static String getDefaultApplicationName() {
-		if (!PDECore.getDefault().getModelManager().isOSGiRuntime())
-			return "org.eclipse.ui.workbench"; //$NON-NLS-1$
-		
-		Properties properties = TargetPlatform.getConfigIniProperties("configuration/config.ini"); //$NON-NLS-1$
-		String appName = (properties != null) ? properties.getProperty("eclipse.application") : null; //$NON-NLS-1$
-		return (appName != null) ? appName : "org.eclipse.ui.ide.workbench"; //$NON-NLS-1$
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LaunchConfigurationListener.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LaunchConfigurationListener.java
deleted file mode 100644
index 4a30c2d..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LaunchConfigurationListener.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-
-import java.io.File;
-
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationListener;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.util.CoreUtility;
-
-
-public class LaunchConfigurationListener implements ILaunchConfigurationListener {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.ILaunchConfigurationListener#launchConfigurationAdded(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void launchConfigurationAdded(ILaunchConfiguration configuration) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.ILaunchConfigurationListener#launchConfigurationChanged(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void launchConfigurationChanged(ILaunchConfiguration configuration) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.ILaunchConfigurationListener#launchConfigurationRemoved(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void launchConfigurationRemoved(ILaunchConfiguration configuration) {
-		File configDir = new File(PDECore.getDefault().getStateLocation().toOSString(), configuration.getName());
-		if (configDir.exists()) {
-			CoreUtility.deleteContent(configDir);
-		}
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LaunchListener.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LaunchListener.java
deleted file mode 100644
index e24ec6a..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LaunchListener.java
+++ /dev/null

@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-
-import java.io.File;
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.IDebugEventSetListener;
-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.debug.core.model.IProcess;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.pde.internal.runtime.logview.LogView;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.swt.program.Program;
-import org.eclipse.swt.widgets.Display;
-
-
-public class LaunchListener implements ILaunchListener, IDebugEventSetListener {
-    private ArrayList managedLaunches;
-    // maximum log file size
-    public static final long MAX_FILE_LENGTH = 1024 * 1024;
-    // different ways to open the error log
-    public static final int OPEN_IN_ERROR_LOG_VIEW = 0;
-    public static final int OPEN_IN_SYSTEM_EDITOR = 1;
-
-    public LaunchListener() {
-        managedLaunches = new ArrayList();
-    }
-
-    public void manage(ILaunch launch) {
-        if (managedLaunches.size() == 0)
-            hookListener(true);
-        if (!managedLaunches.contains(launch))
-            managedLaunches.add(launch);
-    }
-
-    /**
-     * @see org.eclipse.debug.core.ILaunchesListener#launchesRemoved(org.eclipse.debug.core.ILaunch)
-     */
-    public void launchRemoved(ILaunch launch) {
-        update(launch, true);
-    }
-
-    /**
-     * @see org.eclipse.debug.core.ILaunchesListener#launchesAdded(org.eclipse.debug.core.ILaunch)
-     */
-    public void launchAdded(ILaunch launch) {
-    }
-
-    /**
-     * @see org.eclipse.debug.core.ILaunchesListener#launchesChanged(org.eclipse.debug.core.ILaunch)
-     */
-    public void launchChanged(ILaunch launch) {
-    }
-
-    private void update(ILaunch launch, boolean remove) {
-        if (managedLaunches.contains(launch)) {
-            if (remove || launch.isTerminated()) {
-                managedLaunches.remove(launch);
-                if (managedLaunches.size() == 0) {
-                    hookListener(false);
-                }
-            }
-        }
-    }
-
-    private void hookListener(boolean add) {
-        DebugPlugin debugPlugin = DebugPlugin.getDefault();
-        ILaunchManager launchManager = debugPlugin.getLaunchManager();
-        if (add) {
-            launchManager.addLaunchListener(this);
-            debugPlugin.addDebugEventListener(this);
-        } else {
-            launchManager.removeLaunchListener(this);
-            debugPlugin.removeDebugEventListener(this);
-        }
-    }
-
-    private void doRestart(ILaunch launch) {
-        ILaunchConfiguration config = launch.getLaunchConfiguration();
-        try {
-            config.launch(launch.getLaunchMode(), new NullProgressMonitor());
-        } catch (CoreException e) {
-            PDEPlugin.logException(e);
-        }
-    }
-
-    public void shutdown() {
-        hookListener(false);
-    }
-
-    /**
-     * @see org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(org.eclipse.debug.core.DebugEvent)
-     */
-    public void handleDebugEvents(DebugEvent[] events) {
-        for (int i = 0; i < events.length; i++) {
-            DebugEvent event = events[i];
-            Object source = event.getSource();
-            if (source instanceof IProcess && event.getKind() == DebugEvent.TERMINATE) {
-                IProcess process = (IProcess) source;
-                ILaunch launch = process.getLaunch();
-                if (launch != null) {
-                    try {
-                        launchTerminated(launch, process.getExitValue());
-                    } catch (DebugException e) {
-                    }
-                }
-            }
-        }
-    }
-
-    private void launchTerminated(final ILaunch launch, int returnValue) {
-        if (managedLaunches.contains(launch)) {
-            update(launch, true);
-            if (returnValue == 23) {
-                doRestart(launch);
-                return;
-            }
-            // launch failed because the associated workspace is in use
-            if (returnValue == 15) {
-                Display.getDefault().asyncExec(new Runnable() {
-                    public void run() {
-                        MessageDialog.openError(PDEPlugin.getActiveWorkbenchShell(),
-                                PDEUIMessages.Launcher_error_title, 
-                                PDEUIMessages.Launcher_error_code15); 
-                    }
-                });
-                return;
-            }
-            // launch failed for reasons printed to the log.
-            if (returnValue == 13) {
-                Display.getDefault().asyncExec(new Runnable() {
-                    public void run() {
-                        try {
-                            File log = getMostRecentLogFile(launch);
-                            if (log != null && log.exists()) {
-                        		MessageDialog dialog = new MessageDialog(
-                            		PDEPlugin.getActiveWorkbenchShell(),
-                            		PDEUIMessages.Launcher_error_title, 
-                            		null, // accept the default window icon
-                            		PDEUIMessages.Launcher_error_code13, 
-                            		MessageDialog.ERROR,
-                            		new String[] {
-                            			PDEUIMessages.Launcher_error_displayInLogView,
-                            			PDEUIMessages.Launcher_error_displayInSystemEditor,
-                            			PDEUIMessages.Launcher_error_displayNo}, 
-                            		OPEN_IN_ERROR_LOG_VIEW);
-                        		int dialog_value = dialog.open();
-                            	if (dialog_value == OPEN_IN_ERROR_LOG_VIEW) {
-                            		LogView errlog = (LogView)PDEPlugin.getActivePage()
-                            				.showView("org.eclipse.pde.runtime.LogView"); //$NON-NLS-1$
-                            		errlog.handleImportPath(log.getAbsolutePath());
-                            		errlog.sortByDateDescending();
-                            	} else if (dialog_value == OPEN_IN_SYSTEM_EDITOR) {
-                            		openSystemEditor(log);
-                            	} 
-                            }
-                        } catch (CoreException e) {
-                        }
-                    }
-                });
-            }
-        }
-    }
-    
-    private void openSystemEditor(File log) {
-    	boolean canLaunch = false;
-    	if (log.length() <= MAX_FILE_LENGTH) {
-            canLaunch = Program.launch(log.getAbsolutePath());
-            if (!canLaunch) {
-                Program p = Program.findProgram(".txt"); //$NON-NLS-1$
-                if (p != null)
-                    canLaunch = p.execute(log.getAbsolutePath());
-            }
-    	}
-    	if (!canLaunch) {
-	        OpenLogDialog dialog = new OpenLogDialog(PDEPlugin.getActiveWorkbenchShell(), log);
-	        dialog.create();
-	        dialog.open();
-    	}
-    }
-
-    private File getMostRecentLogFile(ILaunch launch) throws CoreException {
-    	ILaunchConfiguration configuration = launch.getLaunchConfiguration();
-        File latest = null;
-        String workspace = LaunchArgumentsHelper.getWorkspaceLocation(configuration);
-        if (workspace.length() > 0) {
-            latest = new File(workspace, ".metadata/.log"); //$NON-NLS-1$
-            if (!latest.exists())
-                latest = null;
-        }
-        File configDir = LaunchConfigurationHelper.getConfigurationLocation(configuration);
-        File[] children = configDir.listFiles();
-        if (children != null) {
-            for (int i = 0; i < children.length; i++) {
-                if (!children[i].isDirectory()
-                        && children[i].getName().endsWith(".log")) { //$NON-NLS-1$
-                    if (latest == null
-                            || latest.lastModified() < children[i].lastModified())
-                        latest = children[i];
-                }
-            }
-        }
-        return latest;
-    }
-    
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LaunchPluginValidator.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LaunchPluginValidator.java
deleted file mode 100644
index c77e02b..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LaunchPluginValidator.java
+++ /dev/null

@@ -1,268 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.TreeMap;
-import java.util.TreeSet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.SearchablePluginsManager;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.ui.launcher.IPDELauncherConstants;
-import org.eclipse.swt.widgets.Display;
-
-public class LaunchPluginValidator {
-	
-	public static void checkBackwardCompatibility(ILaunchConfiguration configuration, boolean save) throws CoreException {		
-		ILaunchConfigurationWorkingCopy wc = null;
-		if (configuration.isWorkingCopy()) {
-			wc = (ILaunchConfigurationWorkingCopy) configuration;
-		} else {
-			wc = configuration.getWorkingCopy();
-		}
-		
-		String value = configuration.getAttribute("wsproject", (String)null); //$NON-NLS-1$
-		if (value != null) {
-			wc.setAttribute("wsproject", (String)null); //$NON-NLS-1$
-			if (value.indexOf(';') != -1) {
-				value = value.replace(';', ',');
-			} else if (value.indexOf(':') != -1) {
-				value = value.replace(':', ',');
-			}
-			value = (value.length() == 0 || value.equals(",")) //$NON-NLS-1$
-						? null : value.substring(0, value.length() - 1);
-			
-			boolean automatic = configuration.getAttribute(IPDELauncherConstants.AUTOMATIC_ADD, true);
-			String attr = automatic 
-							? IPDELauncherConstants.DESELECTED_WORKSPACE_PLUGINS
-							: IPDELauncherConstants.SELECTED_WORKSPACE_PLUGINS;
-			wc.setAttribute(attr, value);
-		}
-
-		String value2 = configuration.getAttribute("extplugins", (String)null); //$NON-NLS-1$
-		if (value2 != null) {
-			wc.setAttribute("extplugins", (String)null); //$NON-NLS-1$
-			if (value2.indexOf(';') != -1)
-				value2 = value2.replace(';', ',');	
-			else if (value2.indexOf(':') != -1)
-				value2 = value2.replace(':', ',');
-			value2 = (value2.length() == 0 || value2.equals(",")) //$NON-NLS-1$
-						? null : value2.substring(0, value2.length() - 1);
-			wc.setAttribute(IPDELauncherConstants.SELECTED_TARGET_PLUGINS, value2);
-		}
-		
-		if (save && (value != null || value2 != null))
-			wc.doSave();
-	}
-	
-	public static IPluginModelBase[] getSelectedWorkspacePlugins(ILaunchConfiguration configuration)
-			throws CoreException {
-		
-		boolean usedefault = configuration.getAttribute(IPDELauncherConstants.USE_DEFAULT, true);
-		boolean useFeatures = configuration.getAttribute(IPDELauncherConstants.USEFEATURES, false);
-		
-		IPluginModelBase[] models = PDECore.getDefault().getModelManager().getWorkspaceModels();
-		
-		if (usedefault || useFeatures || models.length == 0)
-			return models;
-		
-		ArrayList list = new ArrayList();
-		if (configuration.getAttribute(IPDELauncherConstants.AUTOMATIC_ADD, true)) {
-			TreeSet deselected = parsePlugins(configuration,
-									IPDELauncherConstants.DESELECTED_WORKSPACE_PLUGINS);
-			if (deselected.size() == 0)
-				return models;
-			for (int i = 0; i < models.length; i++) {
-				String id = models[i].getPluginBase().getId();
-				if (id != null && !deselected.contains(id)) 
-					list.add(models[i]);
-			}		
-		} else {
-			TreeSet selected = parsePlugins(configuration, 
-									IPDELauncherConstants.SELECTED_WORKSPACE_PLUGINS);
-			for (int i = 0; i < models.length; i++) {
-				String id = models[i].getPluginBase().getId();
-				if (id != null && selected.contains(id)) 
-					list.add(models[i]);
-			}
-		}
-		return (IPluginModelBase[])list.toArray(new IPluginModelBase[list.size()]);
-	}
-
-	public static TreeSet parsePlugins(ILaunchConfiguration configuration, String attribute)
-			throws CoreException {
-		TreeSet set = new TreeSet();
-		String ids = configuration.getAttribute(attribute, (String) null);
-		if (ids != null) {
-			StringTokenizer tok = new StringTokenizer(ids, ","); //$NON-NLS-1$
-			while (tok.hasMoreTokens())
-				set.add(tok.nextToken());
-		}
-		return set;
-	}
-
-	public static Map validatePluginsToRun(Map map, ArrayList statusEntries) throws CoreException {
-		final String requiredPlugin;
-		if (PDECore.getDefault().getModelManager().isOSGiRuntime())
-			requiredPlugin = "org.eclipse.osgi"; //$NON-NLS-1$
-		else
-			requiredPlugin = "org.eclipse.core.boot"; //$NON-NLS-1$
-
-		if (!map.containsKey(requiredPlugin)) {
-			final Display display = getDisplay();
-			display.syncExec(new Runnable() {
-				public void run() {
-					MessageDialog.openError(
-									display.getActiveShell(),
-									PDEUIMessages.WorkbenchLauncherConfigurationDelegate_title,
-									NLS.bind(PDEUIMessages.WorkbenchLauncherConfigurationDelegate_missingRequired,
-											requiredPlugin));
-				}
-			});
-			return null;
-		}
-
-		// alert user if any plug-ins are not loaded correctly.
-		if (statusEntries.size() > 0) {
-			final MultiStatus multiStatus = new MultiStatus(PDEPlugin.getPluginId(),
-					IStatus.OK, (IStatus[]) statusEntries
-							.toArray(new IStatus[statusEntries.size()]),
-					PDEUIMessages.WorkbenchLauncherConfigurationDelegate_brokenPlugins,
-					null);
-			if (!ignoreValidationErrors(multiStatus)) {
-				return null;
-			}
-		}
-		return map;
-	}
-	
-	public static Map getPluginsToRun(ILaunchConfiguration config)
-			throws CoreException {
-		TreeMap map = null;
-		ArrayList statusEntries = new ArrayList();
-
-		if (config.getAttribute(IPDELauncherConstants.USE_DEFAULT, true)) {
-			map = validatePlugins(PDECore.getDefault().getModelManager().getPlugins(),
-					statusEntries);
-		} else {
-			map = validatePlugins(getSelectedPlugins(config), statusEntries);
-		}
-
-		return validatePluginsToRun(map, statusEntries);
-	}
-
-	public static IPluginModelBase[] getSelectedPlugins(ILaunchConfiguration config)
-			throws CoreException {
-		Map map = getSelectedPluginMap(config);
-		return (IPluginModelBase[]) map.values().toArray(new IPluginModelBase[map.size()]);
-	}
-	
-	public static Map getSelectedPluginMap(ILaunchConfiguration config)
-			throws CoreException {
-
-		checkBackwardCompatibility(config, true);
-				
-		TreeMap map = new TreeMap();
-		IPluginModelBase[] wsmodels = getSelectedWorkspacePlugins(config);
-		for (int i = 0; i < wsmodels.length; i++) {
-			String id = wsmodels[i].getPluginBase().getId();
-			if (id != null)
-				map.put(id, wsmodels[i]);
-		}
-
-		Set exModels = parsePlugins(config, IPDELauncherConstants.SELECTED_TARGET_PLUGINS);
-		IPluginModelBase[] exmodels = PDECore.getDefault().getModelManager().getExternalModels();
-		for (int i = 0; i < exmodels.length; i++) {
-			String id = exmodels[i].getPluginBase().getId();
-			if (id != null && exModels.contains(id) && !map.containsKey(id))
-				map.put(id, exmodels[i]);
-		}
-		return map;
-	}
-
-	public static IProject[] getAffectedProjects(ILaunchConfiguration config)
-			throws CoreException {
-		ArrayList projects = new ArrayList();
-		IPluginModelBase[] models = getSelectedWorkspacePlugins(config);
-		for (int i = 0; i < models.length; i++) {
-			IProject project = models[i].getUnderlyingResource().getProject();
-			if (project.hasNature(JavaCore.NATURE_ID))
-				projects.add(project);			
-		}
-
-		// add fake "Java Search" project
-		SearchablePluginsManager manager = PDECore.getDefault().getModelManager()
-				.getSearchablePluginsManager();
-		IJavaProject proxy = manager.getProxyProject();
-		if (proxy != null) {
-			IProject project = proxy.getProject();
-			if (project.isOpen())
-				projects.add(project);
-		}
-		return (IProject[]) projects.toArray(new IProject[projects.size()]);
-	}
-
-	private static TreeMap validatePlugins(IPluginModelBase[] models,
-			ArrayList statusEntries) {
-		TreeMap map = new TreeMap();
-		for (int i = 0; i < models.length; i++) {
-			if (models[i].isLoaded()) {
-				map.put(models[i].getPluginBase().getId(), models[i]);								
-			} else {
-				statusEntries.add(new Status(IStatus.WARNING, 
-						PDEPlugin.getPluginId(), 
-						IStatus.OK, 
-						models[i].getPluginBase().getId(), 
-						null));
-			}
-		}
-		return map;
-	}
-
-	private static boolean ignoreValidationErrors(final MultiStatus status) {
-		final boolean[] result = new boolean[1];
-		getDisplay().syncExec(new Runnable() {
-			public void run() {
-				result[0] = MessageDialog.openConfirm(getDisplay().getActiveShell(),
-						PDEUIMessages.WorkbenchLauncherConfigurationDelegate_title,
-						status.getMessage());
-			}
-		});
-		return result[0];
-	}
-	
-	private static Display getDisplay() {
-		Display display = Display.getCurrent();
-		if (display == null) {
-			display = Display.getDefault();
-		}
-		return display;
-	}
-
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LauncherUtils.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LauncherUtils.java
deleted file mode 100644
index c1ac154..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LauncherUtils.java
+++ /dev/null

@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-
-import java.io.File;
-
-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.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.internal.core.util.CoreUtility;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.ui.launcher.IPDELauncherConstants;
-import org.eclipse.swt.widgets.Display;
-
-public class LauncherUtils {
-	
-	public static IPath getDefaultPath() {
-		String userHome = System.getProperty("user.home"); //$NON-NLS-1$
-		if (userHome != null && userHome.length() > 0)
-			return new Path("${system_property:user.home}"); //$NON-NLS-1$
-		return PDEPlugin.getWorkspace().getRoot().getLocation().removeLastSegments(1);
-	}
-	
-	public static Display getDisplay() {
-		Display display = Display.getCurrent();
-		if (display == null) {
-			display = Display.getDefault();
-		}
-		return display;
-	}
-	
-	
-	public static void setDefaultSourceLocator(ILaunchConfiguration configuration)
-			throws CoreException {
-		ILaunchConfigurationWorkingCopy wc = null;
-		if (configuration.isWorkingCopy()) {
-			wc = (ILaunchConfigurationWorkingCopy) configuration;
-		} else {
-			wc = configuration.getWorkingCopy();
-		}
-		
-		// set any old source locators to null.  Source locator is now declared in the plugin.xml
-		String locator = configuration.getAttribute(ILaunchConfiguration.ATTR_SOURCE_LOCATOR_ID, (String) null);
-		if (locator != null)
-			wc.setAttribute(ILaunchConfiguration.ATTR_SOURCE_LOCATOR_ID,(String) null);
-		
-		// set source path provider on pre-2.1 configurations
-		String id = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_SOURCE_PATH_PROVIDER, (String) null);
-		if (id == null) 
-			wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_SOURCE_PATH_PROVIDER, "org.eclipse.pde.ui.workbenchClasspathProvider"); //$NON-NLS-1$
-		
-		if (locator != null || id == null)
-			wc.doSave();
-	}
-	
-	public static boolean clearWorkspace(ILaunchConfiguration configuration, String workspace, IProgressMonitor monitor) throws CoreException {
-		if (workspace.length() == 0)
-			return false;
-		
-		File workspaceFile = new Path(workspace).toFile();
-		if (configuration.getAttribute(IPDELauncherConstants.DOCLEAR, false) && workspaceFile.exists()) {
-			boolean doClear = !configuration.getAttribute(IPDELauncherConstants.ASKCLEAR, true);
-			if (!doClear) {
-				int result = confirmDeleteWorkspace(workspaceFile);
-				if (result == 2) {
-					monitor.done();
-					return false;
-				}
-				doClear = result == 0;
-			}
-			if (doClear) {
-				CoreUtility.deleteContent(workspaceFile);
-			}
-		}
-		monitor.done();
-		return true;
-	}
-	
-	private static int confirmDeleteWorkspace(final File workspaceFile) {
-		final int[] result = new int[1];
-		getDisplay().syncExec(new Runnable() {
-			public void run() {
-				String title = PDEUIMessages.WorkbenchLauncherConfigurationDelegate_title;
-				String message =
-					NLS.bind(PDEUIMessages.WorkbenchLauncherConfigurationDelegate_confirmDeleteWorkspace, workspaceFile.getPath());
-				MessageDialog dialog = new MessageDialog(getDisplay().getActiveShell(), title, null,
-						message, MessageDialog.QUESTION, new String[]{IDialogConstants.YES_LABEL,
-								IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL}, 0);
-				result[0] = dialog.open();
-			}
-		});
-		return result[0];
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/MainMethodSearchEngine.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/MainMethodSearchEngine.java
deleted file mode 100644
index 6b2fbed..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/MainMethodSearchEngine.java
+++ /dev/null

@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-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.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-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.jdt.ui.IJavaElementSearchConstants;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.pde.internal.ui.*;
-
-public class MainMethodSearchEngine{
-	
-	private class MethodCollector extends SearchRequestor {
-		private List fResult;
-		private int fStyle;
-
-		public MethodCollector(int style) {
-			fResult = new ArrayList(200);
-			fStyle= style;
-		}
-
-		public List getResult() {
-			return fResult;
-		}
-
-		private boolean considerExternalJars() {
-			return (fStyle & IJavaElementSearchConstants.CONSIDER_EXTERNAL_JARS) != 0;
-		}
-				
-		private boolean considerBinaries() {
-			return (fStyle & IJavaElementSearchConstants.CONSIDER_BINARIES) != 0;
-		}		
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jdt.core.search.SearchRequestor#acceptSearchMatch(org.eclipse.jdt.core.search.SearchMatch)
-		 */
-		public void acceptSearchMatch(SearchMatch match) throws CoreException {
-			Object enclosingElement = match.getElement();
-			if (enclosingElement instanceof IMethod) { // defensive code
-				try {
-					IMethod curr= (IMethod) enclosingElement;
-					if (curr.isMainMethod()) {
-						if (!considerExternalJars()) {
-							IPackageFragmentRoot root= getPackageFragmentRoot(curr);
-							if (root == null || root.isArchive()) {
-								return;
-							}
-						}
-						if (!considerBinaries() && curr.isBinary()) {
-							return;
-						}
-						IType declaringType = curr.getDeclaringType();
-						fResult.add(declaringType);
-					}
-				} catch (JavaModelException e) {
-					PDEPlugin.log(e.getStatus());
-				}
-			}
-		}
-	}
-
-	/**
-	 * Searches for all main methods in the given scope.
-	 * Valid styles are IJavaElementSearchConstants.CONSIDER_BINARIES and
-	 * IJavaElementSearchConstants.CONSIDER_EXTERNAL_JARS
-	 * 
-	 * @param pm progress monitor
-	 * @param scope search scope
-	 * @param style search style
-	 * @param includeSubtypes whether to consider types that inherit a main method
-	 */	
-	public IType[] searchMainMethods(IProgressMonitor pm, IJavaSearchScope scope, int style, boolean includeSubtypes) {
-		pm.beginTask(PDEUIMessages.MainMethodSearchEngine_search, 100);  
-		int searchTicks = 100;
-		if (includeSubtypes) {
-			searchTicks = 25;
-		}
-		
-		SearchPattern pattern = SearchPattern.createPattern("main(String[]) void", IJavaSearchConstants.METHOD, IJavaSearchConstants.DECLARATIONS, SearchPattern.R_EXACT_MATCH | SearchPattern.R_CASE_SENSITIVE); //$NON-NLS-1$
-		SearchParticipant[] participants = new SearchParticipant[] {SearchEngine.getDefaultSearchParticipant()};
-		MethodCollector collector = new MethodCollector(style);
-		IProgressMonitor searchMonitor = new SubProgressMonitor(pm, searchTicks);
-		try {
-			new SearchEngine().search(pattern, participants, scope, collector, searchMonitor);
-		} catch (CoreException ce) {
-			PDEPlugin.log(ce);
-		}
-
-		List result = collector.getResult();
-		if (includeSubtypes) {
-			IProgressMonitor subtypesMonitor = new SubProgressMonitor(pm, 75);
-			subtypesMonitor.beginTask(PDEUIMessages.MainMethodSearchEngine_search, result.size()); 
-			Set set = addSubtypes(result, subtypesMonitor, scope);
-			return (IType[]) set.toArray(new IType[set.size()]);
-		}
-		return (IType[]) result.toArray(new IType[result.size()]);
-	}
-
-	private Set addSubtypes(List types, IProgressMonitor monitor, IJavaSearchScope scope) {
-		Iterator iterator = types.iterator();
-		Set result = new HashSet(types.size());
-		while (iterator.hasNext()) {
-			IType type = (IType) iterator.next();
-			if (result.add(type)) {
-				ITypeHierarchy hierarchy = null;
-				try {
-					hierarchy = type.newTypeHierarchy(monitor);
-					IType[] subtypes = hierarchy.getAllSubtypes(type);
-					for (int i = 0; i < subtypes.length; i++) {
-						IType t = subtypes[i];
-						if (scope.encloses(t)) {
-							result.add(t);
-						}
-					}				
-				} catch (JavaModelException e) {
-					PDEPlugin.log(e);
-				}
-			}
-			monitor.worked(1);
-		}
-		return result;
-	}
-	
-	
-	/**
-	 * Returns the package fragment root of <code>IJavaElement</code>. If the given
-	 * element is already a package fragment root, the element itself is returned.
-	 */
-	public static IPackageFragmentRoot getPackageFragmentRoot(IJavaElement element) {
-		return (IPackageFragmentRoot) element.getAncestor(IJavaElement.PACKAGE_FRAGMENT_ROOT);
-	}	
-	
-	/**
-	 * Searches for all main methods in the given scope.
-	 * Valid styles are IJavaElementSearchConstants.CONSIDER_BINARIES and
-	 * IJavaElementSearchConstants.CONSIDER_EXTERNAL_JARS
-	 * 
-	 * @param includeSubtypes whether to consider types that inherit a main method
-	 */
-	public IType[] searchMainMethods(IRunnableContext context, final IJavaSearchScope scope, final int style, final boolean includeSubtypes) throws InvocationTargetException, InterruptedException  {
-		int allFlags=  IJavaElementSearchConstants.CONSIDER_EXTERNAL_JARS | IJavaElementSearchConstants.CONSIDER_BINARIES;
-		Assert.isTrue((style | allFlags) == allFlags);
-		
-		final IType[][] res= new IType[1][];
-		
-		IRunnableWithProgress runnable= new IRunnableWithProgress() {
-			public void run(IProgressMonitor pm) throws InvocationTargetException {
-				res[0]= searchMainMethods(pm, scope, style, includeSubtypes);
-			}
-		};
-		context.run(true, true, runnable);
-		
-		return res[0];
-	}
-			
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/MainTypeSelectionDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/MainTypeSelectionDialog.java
deleted file mode 100644
index 747cb97..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/MainTypeSelectionDialog.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-
- 
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.dialogs.TwoPaneElementSelector;
-
-public class MainTypeSelectionDialog extends TwoPaneElementSelector {
-
-	/** The main types. */
-	private final 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());
-		}
-	}
-
-	public MainTypeSelectionDialog(Shell shell, IType[] types) {
-
-		super(shell, new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_BASICS | JavaElementLabelProvider.SHOW_OVERLAY_ICONS), 
-			new PackageRenderer());
-
-		Assert.isNotNull(types);
-		fTypes= types;
-		setMessage(PDEUIMessages.MainTypeSelectionDialog_chooseType);		 
-		setUpperListLabel(PDEUIMessages.MainTypeSelectionDialog_matching); 
-		setLowerListLabel(PDEUIMessages.MainTypeSelectionDialog_qualifier);  
-	}
-
-	/**
-	 * Returns the main types.
-	 */
-	public IType[] getTypes() {
-		return fTypes;
-	}
-	
-	/*
-	 * @see Window#open()
-	 */
-	public int open() {
-
-		if (fTypes == null)
-			return CANCEL;
-		
-		setElements(fTypes);
-		return super.open();
-	}
-	
-	/**
-	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-	 */
-	public Control createDialogArea(Composite parent) {
-		Control control= super.createDialogArea(parent);
-		applyDialogFont(control);
-		return control;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/OpenLogDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/OpenLogDialog.java
deleted file mode 100644
index b23ae0b..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/OpenLogDialog.java
+++ /dev/null

@@ -1,252 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.launcher;
-
-import java.io.*;
-import java.lang.reflect.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.operation.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * Displays the error log in non-Win32 platforms - see bug 55314.
- */
-public final class OpenLogDialog extends Dialog {
-    // input log file
-    private File logFile;
-    // location/size configuration
-    private IDialogSettings dialogSettings;
-    private Point dialogLocation;
-    private Point dialogSize;
-    private int DEFAULT_WIDTH = 750;
-    private int DEFAULT_HEIGHT = 800;
-
-    public OpenLogDialog(Shell parentShell, File logFile) {
-        super(parentShell);
-        this.logFile = logFile;
-        setShellStyle(SWT.DIALOG_TRIM | SWT.RESIZE | SWT.MAX | SWT.MIN | SWT.MODELESS);
-        
-    }
-
-    /*
-     * (non-Javadoc) Method declared on Window.
-     */
-    protected void configureShell(Shell newShell) {
-        super.configureShell(newShell);
-        newShell.setText(PDEUIMessages.OpenLogDialog_title); 
-        readConfiguration();
-    }
-
-    /*
-     * (non-Javadoc) Method declared on Dialog.
-     */
-    protected void createButtonsForButtonBar(Composite parent) {
-        createButton(parent, IDialogConstants.CLOSE_ID, IDialogConstants.CLOSE_LABEL,
-                true);
-    }
-
-    public void create() {
-        super.create();
-        // dialog location
-        if (dialogLocation != null)
-            getShell().setLocation(dialogLocation);
-        // dialog size
-        if (dialogSize != null)
-            getShell().setSize(dialogSize);
-        else
-            getShell().setSize(DEFAULT_WIDTH, DEFAULT_HEIGHT);
-        getButton(IDialogConstants.CLOSE_ID).setFocus();
-    }
-
-    /*
-     * (non-Javadoc) Method declared on Dialog.
-     */
-    protected Control createDialogArea(Composite parent) {
-        Composite outer = (Composite) super.createDialogArea(parent);
-        Text text = new Text(outer, SWT.MULTI | SWT.BORDER | SWT.READ_ONLY | SWT.V_SCROLL
-                | SWT.NO_FOCUS | SWT.H_SCROLL);
-        text.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND));
-        GridData gridData = new GridData(GridData.HORIZONTAL_ALIGN_FILL
-                | GridData.VERTICAL_ALIGN_FILL);
-        gridData.grabExcessVerticalSpace = true;
-        gridData.grabExcessHorizontalSpace = true;
-        text.setLayoutData(gridData);
-        text.setText(getLogSummary());
-        return outer;
-    }
-
-    private String getLogSummary() {
-        StringWriter out = new StringWriter();
-        PrintWriter writer = new PrintWriter(out);
-        if (logFile.length() > LaunchListener.MAX_FILE_LENGTH) {
-            readLargeFileWithMonitor(writer);
-        } else {
-            readFileWithMonitor(writer);
-        }
-        writer.close();
-        return out.toString();
-    }
-
-    // reading file within MAX_FILE_LENGTH size
-    private void readFile(PrintWriter writer) throws FileNotFoundException, IOException {
-        BufferedReader bReader = new BufferedReader(new FileReader(logFile));
-        while (bReader.ready())
-            writer.println(bReader.readLine());
-    }
-
-    // reading large files
-    private void readLargeFile(PrintWriter writer) throws FileNotFoundException,
-            IOException {
-        RandomAccessFile random = null;
-        boolean hasStarted = false;
-        try {
-            random = new RandomAccessFile(logFile, "r"); //$NON-NLS-1$
-            random.seek(logFile.length() - LaunchListener.MAX_FILE_LENGTH);
-            for (;;) {
-                String line = random.readLine();
-                if (line == null)
-                    break;
-                line = line.trim();
-                if (line.length() == 0)
-                    continue;
-                if (!hasStarted
-                        && (line.startsWith("!ENTRY") || line.startsWith("!SESSION"))) //$NON-NLS-1$ //$NON-NLS-2$
-                    hasStarted = true;
-                if (hasStarted)
-                    writer.println(line);
-                continue;
-            }
-        } finally {
-            try {
-                if (random != null)
-                    random.close();
-            } catch (IOException e1) {
-            }
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.jface.dialogs.Dialog#buttonPressed(int)
-     */
-    protected void buttonPressed(int buttonId) {
-        if (buttonId == IDialogConstants.CLOSE_ID) {
-            storeSettings();
-            close();
-        }
-        super.buttonPressed(buttonId);
-    }
-
-    private void readLargeFileWithMonitor(final PrintWriter writer) {
-        IRunnableWithProgress runnable = new IRunnableWithProgress() {
-            public void run(IProgressMonitor monitor) throws InvocationTargetException,
-                    InterruptedException {
-                monitor
-                        .beginTask(
-                                PDEUIMessages.OpenLogDialog_message, IProgressMonitor.UNKNOWN); 
-                try {
-                    readLargeFile(writer);
-                } catch (IOException e) {
-                    writer.println(PDEUIMessages.OpenLogDialog_cannotDisplay); 
-                }
-            }
-        };
-        ProgressMonitorDialog dialog = new ProgressMonitorDialog(getParentShell());
-        try {
-            dialog.run(true, true, runnable);
-        } catch (InvocationTargetException e) {
-        } catch (InterruptedException e) {
-        }
-    }
-
-    private void readFileWithMonitor(final PrintWriter writer) {
-        IRunnableWithProgress runnable = new IRunnableWithProgress() {
-            public void run(IProgressMonitor monitor) throws InvocationTargetException,
-                    InterruptedException {
-                monitor
-                        .beginTask(
-                                PDEUIMessages.OpenLogDialog_message, IProgressMonitor.UNKNOWN); 
-                try {
-                    readFile(writer);
-                } catch (IOException e) {
-                    writer.println(PDEUIMessages.OpenLogDialog_cannotDisplay); 
-                }
-            }
-        };
-        ProgressMonitorDialog dialog = new ProgressMonitorDialog(getParentShell());
-        try {
-            dialog.run(true, true, runnable);
-        } catch (InvocationTargetException e) {
-        } catch (InterruptedException e) {
-        }
-    }
-
-    //--------------- configuration handling --------------
-    /**
-     * Stores the current state in the dialog settings.
-     * 
-     * @since 2.0
-     */
-    private void storeSettings() {
-        writeConfiguration();
-    }
-
-    /**
-     * Returns the dialog settings object used to share state between several
-     * event detail dialogs.
-     * 
-     * @return the dialog settings to be used
-     */
-    private IDialogSettings getDialogSettings() {
-        IDialogSettings settings = PDEPlugin.getDefault().getDialogSettings();
-        dialogSettings = settings.getSection(getClass().getName());
-        if (dialogSettings == null)
-            dialogSettings = settings.addNewSection(getClass().getName());
-        return dialogSettings;
-    }
-
-    /**
-     * Initializes itself from the dialog settings with the same state as at the
-     * previous invocation.
-     */
-    private void readConfiguration() {
-        IDialogSettings s = getDialogSettings();
-        try {
-            int x = s.getInt("x"); //$NON-NLS-1$
-            int y = s.getInt("y"); //$NON-NLS-1$
-            dialogLocation = new Point(x, y);
-            x = s.getInt("width"); //$NON-NLS-1$
-            y = s.getInt("height"); //$NON-NLS-1$
-            dialogSize = new Point(x, y);
-        } catch (NumberFormatException e) {
-            dialogLocation = null;
-            dialogSize = null;
-        }
-    }
-
-    private void writeConfiguration() {
-        IDialogSettings s = getDialogSettings();
-        Point location = getShell().getLocation();
-        s.put("x", location.x); //$NON-NLS-1$
-        s.put("y", location.y); //$NON-NLS-1$
-        Point size = getShell().getSize();
-        s.put("width", size.x); //$NON-NLS-1$
-        s.put("height", size.y); //$NON-NLS-1$
-    }
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/PluginBlock.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/PluginBlock.java
deleted file mode 100644
index 3d21cc5..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/PluginBlock.java
+++ /dev/null

@@ -1,177 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-
-import java.util.TreeSet;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.ui.launcher.AbstractLauncherTab;
-import org.eclipse.pde.ui.launcher.IPDELauncherConstants;
-
-public class PluginBlock extends AbstractPluginBlock {
-
-	private String fProduct;
-	private String fApplication;
-
-	public PluginBlock(AbstractLauncherTab tab) {
-		super(tab);
-	}
-	
-	public void initializeFrom(ILaunchConfiguration config, boolean defaultSelection) throws CoreException {
-		super.initializeFrom(config);
-		initializeProductFrom(config, defaultSelection);
-		if (defaultSelection) {
-			handleRestoreDefaults();
-		} else {
-			initWorkspacePluginsState(config);
-			initExternalPluginsState(config);
-		}
-		enableViewer(!defaultSelection);
-		updateCounter();
-		fTab.updateLaunchConfigurationDialog();
-	}
-
-	public void activated(ILaunchConfigurationWorkingCopy config, boolean isJUnit) {
-		initializeProductFrom(config, isJUnit);
-	}
-	
-	public void initializeProductFrom(ILaunchConfiguration config, boolean isJUnit) {
-		try {
-			if (config.getAttribute(IPDELauncherConstants.USE_PRODUCT, false)) {
-				fProduct = config.getAttribute(IPDELauncherConstants.PRODUCT, (String)null);
-				fApplication = null;
-			} else {
-				String appToRun = config.getAttribute(IPDELauncherConstants.APPLICATION, LaunchConfigurationHelper.getDefaultApplicationName());
-				if (!isJUnit)
-					fApplication = appToRun;
-				else {
-					if(JUnitLaunchConfiguration.CORE_APPLICATION.equals(appToRun)){
-						fApplication = null;
-					} else {
-						fApplication = config.getAttribute(IPDELauncherConstants.APP_TO_TEST, LaunchConfigurationHelper.getDefaultApplicationName());
-					}
-				}
-				fProduct = null;
-			}
-		} catch (CoreException e) {
-		}
-	}
-	
-	protected PluginValidationOperation createValidationOperation() {
-		return new PluginValidationOperation(getPluginsToValidate(), fProduct, fApplication);
-	}
-	
-	/*
-	 * if the "automatic add" option is selected, then we save the ids of plugins
-	 * that have been "deselected" by the user.
-	 * When we initialize the tree, we first set the workspace plugins subtree to 'checked',
-	 * then we check the plugins that had been deselected and saved in the config.
-	 *
-	 * If the "automatic add" option is not selected, then we save the ids of plugins
-	 * that were "selected" by the user.
-	 * When we initialize the tree, we first set the workspace plugins subtree to 'unchecked',
-	 * then we check the plugins that had been selected and saved in the config.
-	 */
-	protected void initWorkspacePluginsState(ILaunchConfiguration configuration) throws CoreException {
-		boolean automaticAdd = configuration.getAttribute(IPDELauncherConstants.AUTOMATIC_ADD, true);		
-		fPluginTreeViewer.setSubtreeChecked(fWorkspacePlugins, automaticAdd);
-		fNumWorkspaceChecked = automaticAdd ? fWorkspaceModels.length : 0;
-		
-		String attribute = automaticAdd
-							? IPDELauncherConstants.DESELECTED_WORKSPACE_PLUGINS
-							: IPDELauncherConstants.SELECTED_WORKSPACE_PLUGINS;
-		TreeSet ids = LaunchPluginValidator.parsePlugins(configuration, attribute);
-		for (int i = 0; i < fWorkspaceModels.length; i++) {
-			String id = fWorkspaceModels[i].getPluginBase().getId();
-			if (id == null)
-				continue;
-			if (automaticAdd && ids.contains(id)) {
-				if (fPluginTreeViewer.setChecked(fWorkspaceModels[i], false))
-					fNumWorkspaceChecked -= 1;
-			} else if (!automaticAdd && ids.contains(id)) {
-				if (fPluginTreeViewer.setChecked(fWorkspaceModels[i], true))
-					fNumWorkspaceChecked += 1;
-			} 
-		}			
-
-		fPluginTreeViewer.setChecked(fWorkspacePlugins, fNumWorkspaceChecked > 0);
-		fPluginTreeViewer.setGrayed(
-			fWorkspacePlugins,
-			fNumWorkspaceChecked > 0 && fNumWorkspaceChecked < fWorkspaceModels.length);
-	}
-	
-	protected void initExternalPluginsState(ILaunchConfiguration config)
-			throws CoreException {
-		fNumExternalChecked = 0;
-
-		fPluginTreeViewer.setSubtreeChecked(fExternalPlugins, false);
-		TreeSet selected = LaunchPluginValidator.parsePlugins(config,
-								IPDELauncherConstants.SELECTED_TARGET_PLUGINS);
-		for (int i = 0; i < fExternalModels.length; i++) {
-			if (selected.contains(fExternalModels[i].getPluginBase().getId())) {
-				if (fPluginTreeViewer.setChecked(fExternalModels[i], true))
-					fNumExternalChecked += 1;
-			}
-		}
-
-		fPluginTreeViewer.setChecked(fExternalPlugins, fNumExternalChecked > 0);
-		fPluginTreeViewer.setGrayed(fExternalPlugins, fNumExternalChecked > 0
-				&& fNumExternalChecked < fExternalModels.length);
-	}
-
-	protected void savePluginState(ILaunchConfigurationWorkingCopy config) {
-		if (isEnabled()) {
-			// store deselected projects
-			StringBuffer wbuf = new StringBuffer();
-			for (int i = 0; i < fWorkspaceModels.length; i++) {
-				IPluginModelBase model = fWorkspaceModels[i];
-				// if "automatic add" option is selected, save "deselected" workspace plugins
-				// Otherwise, save "selected" workspace plugins
-				if (fPluginTreeViewer.getChecked(model) != fAddWorkspaceButton.getSelection()) {
-					if (wbuf.length() > 0)
-						wbuf.append(","); //$NON-NLS-1$
-					wbuf.append(model.getPluginBase().getId());
-				}
-			}
-			
-			String value = wbuf.length() > 0 ? wbuf.toString() : null;
-			if (fAddWorkspaceButton.getSelection()) {
-				config.setAttribute(IPDELauncherConstants.DESELECTED_WORKSPACE_PLUGINS, value);
-				config.setAttribute(IPDELauncherConstants.SELECTED_WORKSPACE_PLUGINS, (String)null);
-			} else {
-				config.setAttribute(IPDELauncherConstants.SELECTED_WORKSPACE_PLUGINS, value);
-			}
-			// Store selected external models
-			StringBuffer exbuf = new StringBuffer();
-			Object[] checked = fPluginTreeViewer.getCheckedElements();
-			for (int i = 0; i < checked.length; i++) {
-				if (checked[i] instanceof IPluginModelBase) {
-					IPluginModelBase model = (IPluginModelBase) checked[i];
-					if (model.getUnderlyingResource() == null) {
-						if (exbuf.length() > 0)
-							exbuf.append(","); //$NON-NLS-1$
-						exbuf.append(model.getPluginBase().getId());
-					}
-				}
-			}
-			value = exbuf.length() > 0 ? exbuf.toString() : null;
-			config.setAttribute(IPDELauncherConstants.SELECTED_TARGET_PLUGINS, value);
-		} else {
-			config.setAttribute(IPDELauncherConstants.SELECTED_TARGET_PLUGINS, (String) null);
-			config.setAttribute(IPDELauncherConstants.SELECTED_WORKSPACE_PLUGINS, (String) null);
-			config.setAttribute(IPDELauncherConstants.DESELECTED_WORKSPACE_PLUGINS, (String)null);
-		}
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/PluginStatusDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/PluginStatusDialog.java
deleted file mode 100644
index e65e3ce..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/PluginStatusDialog.java
+++ /dev/null

@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-
-
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-
-public class PluginStatusDialog extends Dialog {
-	
-
-	private PluginValidationOperation fOperation;
-
-	public PluginStatusDialog(Shell parentShell, PluginValidationOperation op) {
-		super(parentShell);
-		setShellStyle(getShellStyle() | SWT.RESIZE);
-		fOperation = op;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite)
-	 */
-	protected void createButtonsForButtonBar(Composite parent) {
-		createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-	}
-	
-	protected Control createDialogArea(Composite parent) {
-		Composite container = (Composite) super.createDialogArea(parent);
-		GridLayout layout = new GridLayout();
-		layout.marginWidth = layout.marginHeight = 9;
-		container.setLayout(layout);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.widthHint = 400;
-		gd.heightHint = 300;
-		container.setLayoutData(gd);
-
-		Label label = new Label(container, SWT.NONE);
-		label.setText(PDEUIMessages.PluginStatusDialog_label); 
-		
-		TreeViewer treeViewer = new TreeViewer(container);
-		treeViewer.setContentProvider(fOperation.getContentProvider());
-		treeViewer.setLabelProvider(fOperation.getLabelProvider());
-		treeViewer.setSorter(new ViewerSorter());
-		treeViewer.setInput(fOperation.getState());
-		treeViewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
-		
-		getShell().setText(PDEUIMessages.PluginStatusDialog_pluginValidation); 
-		Dialog.applyDialogFont(container);
-		return container;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/PluginValidationOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/PluginValidationOperation.java
deleted file mode 100644
index 0ed623f..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/PluginValidationOperation.java
+++ /dev/null

@@ -1,270 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-
-import java.lang.reflect.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.operation.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.osgi.service.resolver.*;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.elements.*;
-import org.eclipse.swt.graphics.*;
-
-
-public class PluginValidationOperation implements IRunnableWithProgress {
-	
-	private IPluginModelBase[] fModels;
-	private MinimalState fState;
-	private ArrayList fInvalidModels = new ArrayList();
-	private String fProductID;
-	private String fApplicationID;
-
-	class InvalidNode {
-		public String toString() {
-			if (fInvalidModels.size() > 1)
-				return PDEUIMessages.PluginValidationOperation_invalidPlural; 
-			return PDEUIMessages.PluginValidationOperation_invalidSingular; 
-		}
-	}
-	
-	class MissingCore {
-		public String toString() {
-			return NLS.bind(PDEUIMessages.PluginValidationOperation_missingCore, getCorePluginID()); 
-		}
-	}
-	
-	class MissingApplication {
-		public String toString() {
-			String pluginID = getApplicationPlugin();
-			if (getState().getBundles(pluginID).length == 0)
-				return NLS.bind(PDEUIMessages.PluginValidationOperation_missingApp, (new String[] {fApplicationID, pluginID})); 
-			return NLS.bind(PDEUIMessages.PluginValidationOperation_missingApp2, (new String[] {fApplicationID, pluginID})); 
-		}
-	}
-	
-	class MissingProduct {
-		public String toString() {
-			String pluginID = getProductPlugin();
-			if (getState().getBundles(pluginID).length == 0)
-				return NLS.bind(PDEUIMessages.PluginValidationOperation_missingProduct, (new String[] {fProductID, pluginID})); 
-			return NLS.bind(PDEUIMessages.PluginValidationOperation_missingProduct2, (new String[] {fProductID, pluginID})); 
-		}
-	}
-	
-	class ConstraintLabelProvider extends PDELabelProvider {
-		
-		private Image fImage;
-		private Image fInfo;
-
-		public ConstraintLabelProvider() {
-			PDEPlugin.getDefault().getLabelProvider().connect(this);
-			fImage = PDEPluginImages.DESC_ERROR_ST_OBJ.createImage();
-			fInfo = PDEPluginImages.DESC_INFO_ST_OBJ.createImage();
-		}
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)
-		 */
-		public String getText(Object element) {
-			if (element instanceof BundleDescription) {
-				String id = ((BundleDescription)element).getSymbolicName();
-				if (((BundleDescription)element).getHost() != null)
-					return NLS.bind(PDEUIMessages.PluginValidationOperation_disableFragment, id); 
-				return NLS.bind(PDEUIMessages.PluginValidationOperation_disablePlugin, id); 
-			}
-			if (element instanceof IPluginModelBase) {
-				IPluginModelBase model = (IPluginModelBase)element;
-				return model.getPluginBase().getId();
-			}
-			return element.toString();
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object)
-		 */
-		public Image getImage(Object element) {
-			if (element instanceof IPluginModelBase)
-				return super.getImage(element);
-			/*if (element instanceof String)
-				return fInfo;*/
-			return fImage;
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.LabelProvider#dispose()
-		 */
-		public void dispose() {
-			fImage.dispose();
-			fInfo.dispose();
-			PDEPlugin.getDefault().getLabelProvider().disconnect(this);
-		}
-	}
-	
-	class ContentProvider extends DefaultContentProvider implements ITreeContentProvider {
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
-		 */
-		public Object[] getChildren(Object parent) {
-			ArrayList list = new ArrayList();
-			if (parent instanceof BundleDescription) {
-				StateHelper helper = PDECore.getDefault().acquirePlatform().getStateHelper();		
-				VersionConstraint[] unsatisfiedConstraints = helper.getUnsatisfiedConstraints((BundleDescription)parent);
-				for (int i = 0; i < unsatisfiedConstraints.length; i++) {
-					list.add(toString(unsatisfiedConstraints[i]));
-				}
-			} else if (parent instanceof InvalidNode) {
-				return fInvalidModels.toArray();
-			}
-			return list.toArray();
-		}
-		
-		private String toString(VersionConstraint constraint) {
-			State state = getState();
-			String name = constraint.getName();
-			if (constraint instanceof BundleSpecification) {
-				if (state.getBundles(name).length == 0)
-					return NLS.bind(PDEUIMessages.PluginValidationOperation_missingRequired, name); 
-				return NLS.bind(PDEUIMessages.PluginValidationOperation_disabledRequired, name); 
-			}
-			if (constraint instanceof ImportPackageSpecification)
-				return NLS.bind(PDEUIMessages.PluginValidationOperation_missingImport, name); 
-			if (constraint instanceof HostSpecification)  {
-				if (state.getBundles(name).length == 0)
-					return NLS.bind(PDEUIMessages.PluginValidationOperation_missingParent, name); 
-				return NLS.bind(PDEUIMessages.PluginValidationOperation_disabledParent, name); 
-			}
-			return name;
-		}
-
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
-		 */
-		public Object getParent(Object element) {
-			return null;
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
-		 */
-		public boolean hasChildren(Object element) {
-			return element instanceof BundleDescription || element instanceof InvalidNode;
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-		 */
-		public Object[] getElements(Object inputElement) {
-			ArrayList result = new ArrayList();
-			if (isProductMissing())
-				result.add(new MissingProduct());
-			if (isApplicationMissing())
-				result.add(new MissingApplication());
-			if (isCoreMissing())
-				result.add(new MissingCore());
-			if (fInvalidModels.size() > 0)
-				result.add(new InvalidNode());
-			BundleDescription[] all = getState().getBundles();
-			for (int i = 0; i < all.length; i++) {
-				if (!all[i].isResolved())
-					result.add(all[i]);
-			}
-			return result.toArray();
-		}
-	}
-	
-	public PluginValidationOperation(IPluginModelBase[] models) {
-		this(models, null, null);
-	}
-	
-	public PluginValidationOperation(IPluginModelBase[] models, String product, String application) {
-		fModels = models;
-		fProductID = product;
-		fApplicationID = application;
-		fState = new MinimalState();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.operation.IRunnableWithProgress#run(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void run(IProgressMonitor monitor) throws InvocationTargetException,
-			InterruptedException {
-		for (int i = 0; i < fModels.length; i++) {
-			if (fState.addBundle(fModels[i], -1) == null)
-				fInvalidModels.add(fModels[i]);
-		}
-		fState.resolveState(false);
-	}
-	
-	public State getState() {
-		return fState.getState();
-	}
-	
-	public boolean hasErrors() {
-		State state = getState();
-		if (fInvalidModels.size() > 0 || state.getBundles().length > state.getResolvedBundles().length)
-			return true;	
-		return isApplicationMissing() || isProductMissing();	
-	}
-	
-	private boolean isProductMissing() {
-		if (fProductID == null)
-			return false;
-		
-		BundleDescription[] desc = getState().getBundles(getProductPlugin());
-		for (int i = 0; i < desc.length; i++) {
-			if (desc[i].isResolved()) 
-				return false;
-		}
-		return true;
-	}
-	private boolean isApplicationMissing() {
-		if (fApplicationID == null)
-			return false;
-		BundleDescription[] desc = getState().getBundles(getApplicationPlugin());
-		for (int i = 0; i < desc.length; i++) {
-			if (desc[i].isResolved()) 
-				return false;
-		}
-		return true;
-	}
-	
-	private String getProductPlugin() {
-		return fProductID.substring(0, fProductID.lastIndexOf('.'));
-	}
-	
-	private String getApplicationPlugin() {
-		return fApplicationID.substring(0, fApplicationID.lastIndexOf('.'));
-	}
-	
-	private boolean isCoreMissing() {
-		return (getState().getBundles(getCorePluginID()).length == 0);
-	}
-	
-	private String getCorePluginID() {
-		return PDECore.getDefault().getModelManager().isOSGiRuntime() ? "org.eclipse.osgi" : "org.eclipse.core.boot"; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public IContentProvider getContentProvider() {
-		return new ContentProvider();
-	}
-	
-	public ILabelProvider getLabelProvider() {
-		return new ConstraintLabelProvider();
-	}
-
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/ProgramBlock.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/ProgramBlock.java
deleted file mode 100644
index 83bb7ec..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/ProgramBlock.java
+++ /dev/null

@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.TargetPlatform;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.ui.launcher.AbstractLauncherTab;
-import org.eclipse.pde.ui.launcher.IPDELauncherConstants;
-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.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-
-public class ProgramBlock {
-
-	protected Combo fApplicationCombo;
-	private Button fProductButton;
-	private Combo fProductCombo;
-	private Button fApplicationButton;
-	private AbstractLauncherTab fTab;
-	private Listener fListener = new Listener();
-
-	class Listener extends SelectionAdapter {		
-		public void widgetSelected(SelectionEvent e) {
-			Object source = e.getSource();
-			if (source == fProductButton) {
-				boolean enabled = fProductButton.getSelection();
-				fProductCombo.setEnabled(enabled);
-				fApplicationCombo.setEnabled(!enabled);
-			}			
-			fTab.updateLaunchConfigurationDialog();
-		}
-	}
-	
-	public ProgramBlock(AbstractLauncherTab tab) {
-		fTab = tab;
-	}
-	
-	public void createControl(Composite parent) {
-		Group group = new Group(parent, SWT.NONE);
-		group.setText(PDEUIMessages.ProgramBlock_programToRun); 
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		group.setLayout(layout);
-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-				
-		createProductSection(group);		
-		createApplicationSection(group);
-	}
-	
-	protected void createProductSection(Composite parent) {
-		fProductButton = new Button(parent, SWT.RADIO);
-		fProductButton.setText(PDEUIMessages.ProgramBlock_runProduct); 
-		fProductButton.addSelectionListener(fListener);
-		
-		fProductCombo = new Combo(parent, SWT.READ_ONLY|SWT.DROP_DOWN);
-		fProductCombo.setItems(TargetPlatform.getProductNames());
-		fProductCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fProductCombo.addSelectionListener(fListener);
-	}
-	
-	protected void createApplicationSection(Composite parent) {
-		fApplicationButton = new Button(parent, SWT.RADIO);
-		fApplicationButton.setText(PDEUIMessages.ProgramBlock_runApplication); 
-			
-		fApplicationCombo = new Combo(parent, SWT.READ_ONLY|SWT.DROP_DOWN);
-		fApplicationCombo.setItems(getApplicationNames());
-		fApplicationCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fApplicationCombo.addSelectionListener(fListener);
-	}
-		
-	public void initializeFrom(ILaunchConfiguration config) throws CoreException {
-		initializeProductSection(config);
-		initializeApplicationSection(config);
-		
-		boolean useProduct = 
-					config.getAttribute(IPDELauncherConstants.USE_PRODUCT, false)
-					&& PDECore.getDefault().getModelManager().isOSGiRuntime() 
-					&& fProductCombo.getItemCount() > 0;
-		fApplicationButton.setSelection(!useProduct);
-		fApplicationCombo.setEnabled(!useProduct);
-		fProductButton.setSelection(useProduct);
-		fProductButton.setEnabled(fProductCombo.getItemCount() > 0);
-		fProductCombo.setEnabled(useProduct);
-	}
-	
-	protected void initializeProductSection(ILaunchConfiguration config) throws CoreException {
-		if (fProductCombo.getItemCount() > 0) {
-			String productName = config.getAttribute(IPDELauncherConstants.PRODUCT, (String)null);
-			int index = productName == null ? -1 : fProductCombo.indexOf(productName);
-			if (index == -1)
-				index = 0;
-			fProductCombo.setText(fProductCombo.getItem(index));
-		}
-	}
-
-	protected void initializeApplicationSection(ILaunchConfiguration config) throws CoreException {
-		
-		String attribute = getApplicationAttribute();
-		
-		// first see if the application name has been set on the launch config
-		String application = config.getAttribute(attribute, (String) null);
-		if (application == null
-			|| fApplicationCombo.indexOf(application) == -1) {
-			application = null;
-			
-			// check if the user has entered the -application arg in the program arg field
-			StringTokenizer tokenizer =
-				new StringTokenizer(config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, "")); //$NON-NLS-1$
-			while (tokenizer.hasMoreTokens()) {
-				String token = tokenizer.nextToken();
-				if (token.equals("-application") && tokenizer.hasMoreTokens()) { //$NON-NLS-1$
-					application = tokenizer.nextToken();
-					break;
-				}
-			}
-			
-			int index = -1;
-			if (application != null)
-				index = fApplicationCombo.indexOf(application);
-			
-			// use default application as specified in the install.ini of the target platform
-			if (index == -1)
-				index = fApplicationCombo.indexOf(LaunchConfigurationHelper.getDefaultApplicationName());
-			
-			if (index != -1) {
-				fApplicationCombo.setText(fApplicationCombo.getItem(index));
-			} else if (fApplicationCombo.getItemCount() > 0) {
-				fApplicationCombo.setText(fApplicationCombo.getItem(0));
-			}
-		} else {
-			fApplicationCombo.setText(application);
-		}
-	}
-	
-	public void performApply(ILaunchConfigurationWorkingCopy config) {
-		saveApplicationSection(config);
-		saveProductSection(config);
-	}
-	
-	protected void saveProductSection(ILaunchConfigurationWorkingCopy config) {
-		config.setAttribute(IPDELauncherConstants.USE_PRODUCT, fProductButton.getSelection());
-		config.setAttribute(IPDELauncherConstants.PRODUCT, fProductCombo.getText());
-	}
-
-	protected void saveApplicationSection(ILaunchConfigurationWorkingCopy config) {
-		String text = fApplicationCombo.getText();
-		String attribute = getApplicationAttribute();
-		if (text.length() == 0 || text.equals(LaunchConfigurationHelper.getDefaultApplicationName()))
-			config.setAttribute(attribute, (String) null);
-		else
-			config.setAttribute(attribute, text);
-	}
-	
-	public void setDefaults(ILaunchConfigurationWorkingCopy config) {		
-		String product = TargetPlatform.getDefaultProduct();
-		if (product != null) {
-			config.setAttribute(IPDELauncherConstants.USE_PRODUCT, true);
-			config.setAttribute(IPDELauncherConstants.PRODUCT, product); 
-		}
-	}
-	
-	protected String[] getApplicationNames() {
-		return TargetPlatform.getApplicationNames();
-	}
-	
-	protected String getApplicationAttribute() {
-		return IPDELauncherConstants.APPLICATION;
-	}
-		
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/RunWorkbenchAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/RunWorkbenchAction.java
deleted file mode 100644
index 794bab9..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/RunWorkbenchAction.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.ui.PlatformUI;
-/**
- * Action for launching the workbench using the 
- * shortcut. This action is suitable for referencing from 
- * welcome and cheat sheet files.
- */
-public class RunWorkbenchAction extends Action {
-	public void run() {
-		final RuntimeWorkbenchShortcut shortcut = new RuntimeWorkbenchShortcut();
-		BusyIndicator.showWhile(PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow().getShell().getDisplay(),
-				new Runnable() {
-					public void run() {
-						shortcut.launch(new StructuredSelection(),
-								ILaunchManager.RUN_MODE);
-						notifyResult(true);
-					}
-				});
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/RuntimeWorkbenchShortcut.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/RuntimeWorkbenchShortcut.java
deleted file mode 100644
index b4a7882..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/RuntimeWorkbenchShortcut.java
+++ /dev/null

@@ -1,373 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-
-import java.util.ArrayList;
-import java.util.TreeMap;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-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.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.pde.core.plugin.IFragmentModel;
-import org.eclipse.pde.core.plugin.IPluginAttribute;
-import org.eclipse.pde.core.plugin.IPluginBase;
-import org.eclipse.pde.core.plugin.IPluginElement;
-import org.eclipse.pde.core.plugin.IPluginExtension;
-import org.eclipse.pde.core.plugin.IPluginImport;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.ModelEntry;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.PluginModelManager;
-import org.eclipse.pde.internal.core.TargetPlatform;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.ui.launcher.IPDELauncherConstants;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.dialogs.ElementListSelectionDialog;
- 
-/**
- * A launch short cut for the run-time workspace.
- */
-public class RuntimeWorkbenchShortcut implements ILaunchShortcut {
-	
-	public static final String CLASSPATH_PROVIDER = "org.eclipse.pde.ui.workbenchClasspathProvider"; //$NON-NLS-1$
-	public static final String CONFIGURATION_TYPE = "org.eclipse.pde.ui.RuntimeWorkbench"; //$NON-NLS-1$
-
-	private IPluginModelBase fModel = null;
-	
-	public void run(IProject project) {
-		launch(PDECore.getDefault().getModelManager().findModel(project), ILaunchManager.RUN_MODE);
-	}
-	
-	public void debug(IProject project) {
-		launch(PDECore.getDefault().getModelManager().findModel(project), ILaunchManager.DEBUG_MODE);
-	}
-	
-	/*
-	 * @see ILaunchShortcut#launch(IEditorPart, String)
-	 */
-	public void launch(IEditorPart editor, String mode) {
-		launch(mode, null);
-	}
-
-	/*
-	 * @see ILaunchShortcut#launch(ISelection, String)
-	 */
-	public void launch(ISelection selection, String mode) {
-		launch(getSelectedModel(selection), mode);
-	}
-	
-	private void launch(IPluginModelBase model, String mode) {
-		fModel = model;
-		if (fModel != null) {
-			String[] applicationNames = getAvailableApplications();
-			if (applicationNames.length == 0) {
-				launch(mode, null);
-			} else if (applicationNames.length == 1) {
-				launch(mode, applicationNames[0]);
-			} else {		
-				ApplicationSelectionDialog dialog = new ApplicationSelectionDialog(
-						PDEPlugin.getActiveWorkbenchShell().getShell(), applicationNames,
-						mode);
-				if (dialog.open() == Dialog.OK) {
-					launch(mode, dialog.getSelectedApplication());
-				}
-			}
-		} else {
-			launch(mode, null);
-		}
-	}
-	
-	private IPluginModelBase getSelectedModel(ISelection selection) {
-		if (selection instanceof IStructuredSelection) {
-			IStructuredSelection ssel = (IStructuredSelection)selection;
-			if (!ssel.isEmpty()) {
-				Object object = ssel.getFirstElement();
-				if (object instanceof IAdaptable) {
-					IProject project = (IProject)((IAdaptable)object).getAdapter(IProject.class);
-					if (project != null && project.isOpen())
-						return PDECore.getDefault().getModelManager().findModel(project);
-				}
-			}
-		}
-		return null;
-	}
-	
-	private String[] getAvailableApplications() {
-		IPluginBase plugin = fModel.getPluginBase();
-		String id = plugin.getId();
-		if (id == null || id.trim().length() == 0)
-			return new String[0];
-		
-		IPluginExtension[] extensions = plugin.getExtensions();
-		ArrayList result = new ArrayList();
-		for (int i = 0; i < extensions.length; i++) {
-			IPluginExtension extension = extensions[i];
-			if ("org.eclipse.core.runtime.applications".equals(extension.getPoint())) { //$NON-NLS-1$
-				String extensionID = extension.getId();
-				if (extensionID != null && extensionID.trim().length() > 0) {
-					result.add(id.trim() + "." + extensionID.trim()); //$NON-NLS-1$
-				}
-			}
-		}
-		return (String[])result.toArray(new String[result.size()]);
-	}
-		
-	/**
-	 * Launches a configuration in the given mode
-	 */
-	protected void launch(String mode, String applicationName) {
-		ILaunchConfiguration config = findLaunchConfiguration(mode, applicationName);
-		if (config != null) {
-			DebugUITools.launch(config, mode);
-		}			
-	}
-	
-	/**
-	 * Locate a configuration to relaunch.  If one cannot be found, create one.
-	 * 
-	 * @return a re-useable config or <code>null</code> if none
-	 */
-	protected ILaunchConfiguration findLaunchConfiguration(String mode, String applicationName) {
-		ILaunchConfiguration[] configs = getLaunchConfigurations(getWorkbenchLaunchConfigType(), applicationName);
-			
-		if (configs.length == 0)
-			return createConfiguration(applicationName);
-
-		if (configs.length == 1)
-			return configs[0];
-
-		// Prompt the user to choose a config. 
-		return chooseConfiguration(configs, mode);
-	}
-	
-	private ILaunchConfiguration[] getLaunchConfigurations(ILaunchConfigurationType configType, String applicationName) {
-		ArrayList result = new ArrayList();
-		try {
-			ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager();
-			ILaunchConfiguration[] configs = manager.getLaunchConfigurations(configType);
-			for (int i = 0; i < configs.length; i++) {
-				if (!DebugUITools.isPrivate(configs[i])) {
-					if (!configs[i].getAttribute(IPDELauncherConstants.USE_PRODUCT, false)) {
-						String configApp = configs[i].getAttribute(IPDELauncherConstants.APPLICATION, (String)null);
-						if ((configApp == null && applicationName == null)
-							|| (configApp != null && applicationName != null && configApp.equals(applicationName))) {
-							result.add(configs[i]);
-						}
-					} else {
-						String thisProduct = configs[i].getAttribute(IPDELauncherConstants.PRODUCT, (String)null);
-						if (thisProduct != null && thisProduct.equals(getProduct(applicationName))) {
-							result.add(configs[i]);
-						}
-					}
-					
-				}
-			}
-		} catch (CoreException e) {
-		}
-		return (ILaunchConfiguration[]) result.toArray(new ILaunchConfiguration[result.size()]);
-	}
-	
-	/**
-	 * Shows 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(ILaunchConfiguration[] configs, String mode) {
-		IDebugModelPresentation labelProvider = DebugUITools.newDebugModelPresentation();
-		ElementListSelectionDialog dialog= new ElementListSelectionDialog(getShell(), labelProvider);
-		dialog.setElements(configs);
-		dialog.setTitle(PDEUIMessages.RuntimeWorkbenchShortcut_title);  
-		if (mode.equals(ILaunchManager.DEBUG_MODE)) {
-			dialog.setMessage(PDEUIMessages.RuntimeWorkbenchShortcut_select_debug); 
-		} else {
-			dialog.setMessage(PDEUIMessages.RuntimeWorkbenchShortcut_select_run);  
-		}
-		dialog.setMultipleSelection(false);
-		int result= dialog.open();
-		labelProvider.dispose();
-		if (result == ElementListSelectionDialog.OK) {
-			return (ILaunchConfiguration)dialog.getFirstResult();
-		}
-		return null;		
-	}
-	
-	/**
-	 * Creates a new configuration with default values.
-	 */
-	protected ILaunchConfiguration createConfiguration(String applicationName) {
-		ILaunchConfiguration config = null;
-		try {
-			ILaunchConfigurationType configType = getWorkbenchLaunchConfigType();
-			String computedName = getComputedName(configType.getName());
-			ILaunchConfigurationWorkingCopy wc = configType.newInstance(null, computedName);  
-			wc.setAttribute(IPDELauncherConstants.LOCATION, LaunchArgumentsHelper.getDefaultWorkspaceLocation(computedName)); //$NON-NLS-1$
-			wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, ""); //$NON-NLS-1$
-			wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, ""); //$NON-NLS-1$
-			wc.setAttribute(IPDELauncherConstants.USEFEATURES, false);
-			wc.setAttribute(IPDELauncherConstants.DOCLEAR, false);
-			wc.setAttribute(IPDELauncherConstants.ASKCLEAR, true);
-			wc.setAttribute(IPDELauncherConstants.TRACING_CHECKED, IPDELauncherConstants.TRACING_NONE);
-			wc.setAttribute(IPDELauncherConstants.USE_DEFAULT, applicationName == null);
-			if (applicationName != null) {
-				String product = getProduct(applicationName);
-				if (product == null) {
-					wc.setAttribute(IPDELauncherConstants.APPLICATION, applicationName);
-				} else {
-					wc.setAttribute(IPDELauncherConstants.USE_PRODUCT, true);
-					wc.setAttribute(IPDELauncherConstants.PRODUCT, product);
-				}
-				wc.setAttribute(IPDELauncherConstants.AUTOMATIC_ADD, false);
-				TreeMap map = new TreeMap();
-				addPluginAndDependencies(fModel, map);
-				Object[] models = map.values().toArray();
-				StringBuffer wsplugins = new StringBuffer();
-				StringBuffer explugins = new StringBuffer();
-				for (int i = 0; i < models.length; i++) {
-					IPluginModelBase model = (IPluginModelBase)models[i];
-					String id = model.getPluginBase().getId();
-					if (model.getUnderlyingResource() == null) {
-						if (explugins.length() > 0)
-							explugins.append(","); //$NON-NLS-1$
-						explugins.append(id);
-					} else {
-						if (wsplugins.length() > 0)
-							wsplugins.append(","); //$NON-NLS-1$
-						wsplugins.append(id);
-					}
-				}
-				wc.setAttribute(IPDELauncherConstants.SELECTED_WORKSPACE_PLUGINS, wsplugins.toString());
-				wc.setAttribute(IPDELauncherConstants.SELECTED_TARGET_PLUGINS, explugins.toString());
-			} else {
-				String defaultProduct = TargetPlatform.getDefaultProduct();
-				if (defaultProduct != null) {
-					wc.setAttribute(IPDELauncherConstants.USE_DEFAULT, true);
-					wc.setAttribute(IPDELauncherConstants.USE_PRODUCT, true);
-					wc.setAttribute(IPDELauncherConstants.PRODUCT, defaultProduct);
-				}
-			}
-
-			wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_SOURCE_PATH_PROVIDER, CLASSPATH_PROVIDER);
-			config= wc.doSave();		
-		} catch (CoreException ce) {
-			PDEPlugin.logException(ce);
-		} 
-		return config;
-	}
-	
-	private String getProduct(String appName) {
-		if (appName == null)
-			return TargetPlatform.getDefaultProduct();
-		if (fModel != null && appName != null) {
-			IPluginExtension[] extensions = fModel.getPluginBase().getExtensions();
-			for (int i = 0; i < extensions.length; i++) {
-				IPluginExtension ext = extensions[i];
-				String point = ext.getPoint();
-				if ("org.eclipse.core.runtime.products".equals(point)) { //$NON-NLS-1$
-					if (ext.getChildCount() == 1) {
-						IPluginElement prod = (IPluginElement)ext.getChildren()[0];
-						if (prod.getName().equals("product")) { //$NON-NLS-1$
-							IPluginAttribute attr = prod.getAttribute("application"); //$NON-NLS-1$
-							if (attr != null && appName.equals(attr.getValue())) {
-								return fModel.getPluginBase().getId() + "." + ext.getId(); //$NON-NLS-1$
-							}
-						}
-					}
-				}
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * Returns the workbench config type
-	 */
-	protected ILaunchConfigurationType getWorkbenchLaunchConfigType() {
-		ILaunchManager lm = DebugPlugin.getDefault().getLaunchManager();
-		return lm.getLaunchConfigurationType(CONFIGURATION_TYPE);	
-	}	
-	
-	private String getComputedName(String prefix) {
-		ILaunchManager lm = DebugPlugin.getDefault().getLaunchManager();
-		return lm.generateUniqueLaunchConfigurationNameFrom(prefix);
-	}
-	
-	/**
-	 * Convenience method to get the window that owns this action's Shell.
-	 */
-	protected Shell getShell() {
-		return PDEPlugin.getActiveWorkbenchShell();
-	}
-	
-	public static void addPluginAndDependencies(IPluginModelBase model, TreeMap map) {
-		if (model == null)
-			return;
-
-		String id = model.getPluginBase().getId();
-		if (map.containsKey(id))
-			return;
-
-		map.put(id, model);
-
-		if (model instanceof IFragmentModel) {
-			IPluginModelBase parent =
-				findPlugin(((IFragmentModel) model).getFragment().getPluginId());
-			addPluginAndDependencies(parent, map);
-		} else {
-			IFragmentModel[] fragments = findFragments(model.getPluginBase());
-			for (int i = 0; i < fragments.length; i++) {
-				String fragmentID = fragments[i].getPluginBase().getId();
-				if (!"org.eclipse.ui.workbench.compatibility".equals(fragmentID)) //$NON-NLS-1$
-					addPluginAndDependencies(fragments[i], map);
-			}
-		}
-
-		IPluginImport[] imports = model.getPluginBase().getImports();
-		for (int i = 0; i < imports.length; i++) {
-			addPluginAndDependencies(findPlugin(imports[i].getId()), map);
-		}	
-	}
-	
-	private static IPluginModelBase findPlugin(String id) {
-		PluginModelManager manager = PDECore.getDefault().getModelManager();
-		ModelEntry entry = manager.findEntry(id);
-		return (entry != null) ? entry.getActiveModel() : null;
-	}
-	
-	private static IFragmentModel[] findFragments(IPluginBase plugin) {
-		ModelEntry[] entries = PDECore.getDefault().getModelManager().getEntries();
-		ArrayList result = new ArrayList();
-		for (int i = 0; i < entries.length; i++) {
-			ModelEntry entry = entries[i];
-			IPluginModelBase model = entry.getActiveModel();
-			if (model instanceof IFragmentModel) {
-				String id = ((IFragmentModel) model).getFragment().getPluginId();
-				if (id.equals(plugin.getId())) {
-					result.add(model);
-				}
-			}
-		}
-		return (IFragmentModel[]) result.toArray(new IFragmentModel[result.size()]);
-	}	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/SWTApplicationLaunchShortcut.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/SWTApplicationLaunchShortcut.java
deleted file mode 100644
index f61308a..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/SWTApplicationLaunchShortcut.java
+++ /dev/null

@@ -1,293 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-
-import java.lang.reflect.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.debug.core.*;
-import org.eclipse.debug.ui.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.core.search.*;
-import org.eclipse.jdt.launching.*;
-import org.eclipse.jdt.ui.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.window.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.dialogs.*;
-
-public class SWTApplicationLaunchShortcut implements ILaunchShortcut {
-
-	/**
-	 * @param search the java elements to search for a main type
-	 * @param mode the mode to launch in
-	 * @param editor activated on an editor (or from a selection in a viewer)
-	 */
-	public void searchAndLaunch(Object[] search, String mode, boolean editor) {
-		IType[] types = null;
-		if (search != null) {
-			try {
-				IJavaElement[] elements = getJavaElements(search);
-				MainMethodSearchEngine engine = new MainMethodSearchEngine();
-				IJavaSearchScope scope = SearchEngine.createJavaSearchScope(elements, false);
-				types = engine.searchMainMethods(PlatformUI.getWorkbench().getProgressService(),
-						scope, IJavaElementSearchConstants.CONSIDER_BINARIES | IJavaElementSearchConstants.CONSIDER_EXTERNAL_JARS,
-						true);
-			} catch (InterruptedException e) {
-				return;
-			} catch (InvocationTargetException e) {
-				MessageDialog.openError(getShell(), PDEUIMessages.SWTApplicationLaunchShortcut_failed, e.getMessage()); 
-				return;
-			}
-			IType type = null;
-			if (types.length == 0) {
-				String message = null;
-				if (editor) {
-					message = PDEUIMessages.SWTApplicationLaunchShortcut_noMainInEditor;  
-				} else {
-					message = PDEUIMessages.SWTApplicationLaunchShortcut_noMainInSelection; 
-				}
-				MessageDialog.openError(getShell(), PDEUIMessages.SWTApplicationLaunchShortcut_failed, message); 
-			} else if (types.length > 1) {
-				type = chooseType(types, mode);
-			} else {
-				type = types[0];
-			}
-			if (type != null) {
-				launch(type, mode);
-			}
-		}
-
-	}	
-	
-	/**
-	 * Returns the Java elements corresponding to the given objects.
-	 * 
-	 * @param objects selected objects
-	 * @return corresponding Java elements
-	 */
-	private IJavaElement[] getJavaElements(Object[] objects) {
-		ArrayList list= new ArrayList(objects.length);
-		for (int i = 0; i < objects.length; i++) {
-			Object object = objects[i];
-			if (object instanceof IAdaptable) {
-				IJavaElement element = (IJavaElement) ((IAdaptable)object).getAdapter(IJavaElement.class);
-				if (element != null) {
-					if (element instanceof IMember) {
-						// Use the declaring type if available
-						IJavaElement type= ((IMember)element).getDeclaringType();
-						if (type != null) {
-							element= type;
-						}
-					}
-					// for projects consider only src and not external libs
-					if (element instanceof IJavaProject) {
-						IJavaProject project = (IJavaProject) element;
-						try {
-							IClasspathEntry[] cpEntries = project
-									.getRawClasspath();
-							for (int j = 0; j < cpEntries.length; j++) {
-								if (cpEntries[j].getEntryKind() == IClasspathEntry.CPE_SOURCE
-										|| cpEntries[j].getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
-									IPackageFragmentRoot[] roots = project.findPackageFragmentRoots(cpEntries[j]);
-									for(int r=0; r< roots.length; r++){
-										list.add(roots[r]);
-									}
-								}
-							}
-						} catch (JavaModelException jme) {
-						}
-					} else {
-						list.add(element);
-					}
-				}
-			}
-		}
-		return (IJavaElement[]) list.toArray(new IJavaElement[list.size()]);
-	}
-
-	/**
-	 * Prompts the user to select a type
-	 * 
-	 * @return the selected type or <code>null</code> if none.
-	 */
-	protected IType chooseType(IType[] types, String mode) {
-		MainTypeSelectionDialog dialog= new MainTypeSelectionDialog(getShell(), types);		
-		if (mode.equals(ILaunchManager.DEBUG_MODE)) {
-			dialog.setTitle(PDEUIMessages.SWTApplicationLaunchShortcut_debug); 
-		} else {
-			dialog.setTitle(PDEUIMessages.SWTApplicationLaunchShortcut_run); 
-		}
-		dialog.setMultipleSelection(false);
-		if (dialog.open() == Window.OK) {
-			return (IType)dialog.getFirstResult();
-		}
-		return null;
-	}
-	
-	/**
-	 * Launches a configuration for the given type
-	 */
-	protected void launch(IType type, String mode) {
-		ILaunchConfiguration config = findLaunchConfiguration(type, mode);
-		if (config != null) {
-			DebugUITools.launch(config, mode);
-		}			
-	}
-	
-	/**
-	 * Locate a configuration to relaunch for the given type.  If one cannot be found, create one.
-	 * 
-	 * @return a re-useable config or <code>null</code> if none
-	 */
-	protected ILaunchConfiguration findLaunchConfiguration(IType type, String mode) {
-		ILaunchConfigurationType configType = getSWTLaunchConfigType();
-		java.util.List candidateConfigs = Collections.EMPTY_LIST;
-		try {
-			ILaunchConfiguration[] configs = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurations(configType);
-			candidateConfigs = new ArrayList(configs.length);
-			for (int i = 0; i < configs.length; i++) {
-				ILaunchConfiguration config = configs[i];
-				if (config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, "").equals(type.getFullyQualifiedName())) { //$NON-NLS-1$
-					if (config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, "").equals(type.getJavaProject().getElementName())) { //$NON-NLS-1$
-						candidateConfigs.add(config);
-					}
-				}
-			}
-		} catch (CoreException e) {
-			PDEPlugin.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 createConfiguration(type);
-		} 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(java.util.List configList, String mode) {
-		IDebugModelPresentation labelProvider = DebugUITools.newDebugModelPresentation();
-		ElementListSelectionDialog dialog= new ElementListSelectionDialog(getShell(), labelProvider);
-		dialog.setElements(configList.toArray());
-		dialog.setTitle(PDEUIMessages.SWTApplicationLaunchShortcut_launch);  
-		if (mode.equals(ILaunchManager.DEBUG_MODE)) {
-			dialog.setMessage(PDEUIMessages.SWTApplicationLaunchShortcut_chooseRun); 
-		} else {
-			dialog.setMessage(PDEUIMessages.SWTApplicationLaunchShortcut_chooseDebug); 
-		}
-		dialog.setMultipleSelection(false);
-		int result = dialog.open();
-		labelProvider.dispose();
-		if (result == Window.OK) {
-			return (ILaunchConfiguration) dialog.getFirstResult();
-		}
-		return null;		
-	}
-	
-	/**
-	 * Create & return a new configuration based on the specified <code>IType</code>.
-	 */
-	protected ILaunchConfiguration createConfiguration(IType type) {
-		ILaunchConfiguration config = null;
-		ILaunchConfigurationWorkingCopy wc = null;
-		try {
-			ILaunchConfigurationType configType = getSWTLaunchConfigType();
-			wc = configType.newInstance(null, getLaunchManager().generateUniqueLaunchConfigurationNameFrom(type.getElementName()));
-		} catch (CoreException exception) {
-			reportCreatingConfiguration(exception);
-			return null;		
-		} 
-		wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, type.getFullyQualifiedName());
-		wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, type.getJavaProject().getElementName());
-		try {
-			config = wc.doSave();		
-		} catch (CoreException exception) {
-			reportCreatingConfiguration(exception);			
-		}
-		return config;
-	}
-	
-	protected void reportCreatingConfiguration(final CoreException exception) {
-		Display.getDefault().asyncExec(new Runnable() {
-			public void run() {
-				ErrorDialog.openError(getShell(), PDEUIMessages.SWTApplicationLaunchShortcut_error, PDEUIMessages.SWTApplicationLaunchShortcut_exception, exception.getStatus());  // 
-			}
-		});
-	}
-	
-	/**
-	 * Returns the local java launch config type
-	 */
-	protected ILaunchConfigurationType getSWTLaunchConfigType() {
-		return getLaunchManager().getLaunchConfigurationType("org.eclipse.pde.ui.swtLaunchConfig");		 //$NON-NLS-1$
-	}
-	
-	protected ILaunchManager getLaunchManager() {
-		return DebugPlugin.getDefault().getLaunchManager();
-	}
-	
-	/**
-	 * Convenience method to get the window that owns this action's Shell.
-	 */
-	protected Shell getShell() {
-		return PDEPlugin.getActiveWorkbenchShell();
-	}
-	
-	/**
-	 * @see ILaunchShortcut#launch(IEditorPart, String)
-	 */
-	public void launch(IEditorPart editor, String mode) {
-		IEditorInput input = editor.getEditorInput();
-		IJavaElement je = (IJavaElement) input.getAdapter(IJavaElement.class);
-		if (je != null) {
-			searchAndLaunch(new Object[] {je}, mode, true);
-		} else {
-			MessageDialog.openError(getShell(), PDEUIMessages.SWTApplicationLaunchShortcut_failed, PDEUIMessages.SWTApplicationLaunchShortcut_noMainInEditor);   
-		}
-		
-	}
-
-	/**
-	 * @see ILaunchShortcut#launch(ISelection, String)
-	 */
-	public void launch(ISelection selection, String mode) {
-		if (selection instanceof IStructuredSelection) {
-			searchAndLaunch(((IStructuredSelection)selection).toArray(), mode, false);
-		} else {
-			MessageDialog.openError(getShell(), PDEUIMessages.SWTApplicationLaunchShortcut_failed, PDEUIMessages.SWTApplicationLaunchShortcut_noMainInSelection);  
-		}
-	}
-
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/SWTLaunchConfiguration.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/SWTLaunchConfiguration.java
deleted file mode 100644
index fabcca7..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/SWTLaunchConfiguration.java
+++ /dev/null

@@ -1,312 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Map;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipException;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.launching.AbstractJavaLaunchConfigurationDelegate;
-import org.eclipse.jdt.launching.ExecutionArguments;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMRunner;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.launching.VMRunnerConfiguration;
-import org.eclipse.osgi.framework.adaptor.core.AbstractFrameworkAdaptor;
-import org.eclipse.osgi.service.environment.Constants;
-import org.eclipse.osgi.service.resolver.BundleDescription;
-import org.eclipse.pde.core.plugin.IFragmentModel;
-import org.eclipse.pde.core.plugin.IPluginLibrary;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.ClasspathUtilCore;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.TargetPlatform;
-import org.eclipse.pde.internal.core.util.CoreUtility;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.osgi.framework.Version;
-
-public class SWTLaunchConfiguration extends
-		AbstractJavaLaunchConfigurationDelegate {
-
-	public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
-		if (monitor == null) {
-			monitor = new NullProgressMonitor();
-		}
-		
-		monitor.beginTask(MessageFormat.format("{0}...", new String[]{configuration.getName()}), 3); //$NON-NLS-1$
-		// check for cancellation
-		if (monitor.isCanceled()) {
-			return;
-		}
-		
-		String mainTypeName = verifyMainTypeName(configuration);
-
-		IVMInstall vm = verifyVMInstall(configuration);
-
-		IVMRunner runner = vm.getVMRunner(mode);
-		if (runner == null) {
-			monitor.setCanceled(true);
-		}
-
-		File workingDir = verifyWorkingDirectory(configuration);
-		String workingDirName = null;
-		if (workingDir != null) {
-			workingDirName = workingDir.getAbsolutePath();
-		}
-		
-		// Environment variables
-		String[] envp= DebugPlugin.getDefault().getLaunchManager().getEnvironment(configuration);
-		
-		// Program & VM args
-		String pgmArgs = getProgramArguments(configuration);
-		String vmArgs = getVMArguments(configuration);
-		ExecutionArguments execArgs = new ExecutionArguments(vmArgs, pgmArgs);
-		
-		// Find SWT Fragment for the target platform
-		BundleDescription fragment = findFragment();
-		
-		// VM-specific attributes
-		Map vmAttributesMap = getVMSpecificAttributesMap(configuration);
-		
-		// Classpath
-		String[] classpath = getClasspath(fragment, configuration);
-		
-		// Create VM config
-		VMRunnerConfiguration runConfig = new VMRunnerConfiguration(mainTypeName, classpath);
-		runConfig.setProgramArguments(execArgs.getProgramArgumentsArray());
-		runConfig.setEnvironment(envp);
-		runConfig.setVMArguments(getVMArguments(fragment, execArgs));
-		runConfig.setWorkingDirectory(workingDirName);
-		runConfig.setVMSpecificAttributesMap(vmAttributesMap);
-
-		// Bootpath
-		runConfig.setBootClassPath(getBootpath(configuration));
-		
-		// check for cancellation
-		if (monitor.isCanceled()) {
-			return;
-		}		
-		
-		// stop in main
-		prepareStopInMain(configuration);
-		
-		// done the verification phase
-		monitor.worked(1);
-		
-		// set the default source locator if required
-		setDefaultSourceLocator(launch, configuration);
-		monitor.worked(1);		
-		
-		// Launch the configuration - 1 unit of work
-		runner.run(runConfig, launch, monitor);
-		
-		// check for cancellation
-		if (monitor.isCanceled()) {
-			return;
-		}	
-		
-		monitor.done();
-	}
-	
-	private String[] getVMArguments(BundleDescription fragment, ExecutionArguments execArgs) {
-		if (fragment == null)
-			return execArgs.getVMArgumentsArray();
-		
-		String location = getNativeLibrariesLocation(fragment);
-		String[] vmArgs = execArgs.getVMArgumentsArray();
-		for (int i = vmArgs.length - 1; i >= 0; i--) {
-			if (vmArgs[i].startsWith("-Djava.library.path")) { //$NON-NLS-1$
-				vmArgs[i] +=  File.pathSeparatorChar + location; 
-				return vmArgs;
-			}
-		}
-		String[] all = new String[vmArgs.length + 1];
-		all[0] = "-Djava.library.path=" + location;  //$NON-NLS-1$
-		System.arraycopy(vmArgs, 0, all, 1, vmArgs.length);
-		return all;
-	}
-	
-	public static BundleDescription findFragment() {
-		IPluginModelBase model = PDECore.getDefault().getModelManager().findModel("org.eclipse.swt"); //$NON-NLS-1$
-		if (model != null && model.isEnabled()) {
-			BundleDescription desc = model.getBundleDescription();
-			if (desc.getContainingState() != null) {
-				BundleDescription[] fragments = desc.getFragments();
-				if (fragments.length > 0) {
-					return fragments[0];
-				}
-			}
-		}
-		return null;
-	}
-
-	private String getNativeLibrariesLocation(BundleDescription fragment) {
-		Version version = fragment.getVersion();
-		if (version.getMajor() < 3 || version.getMinor() < 1)
-			return getLegacyNativeLibrariesLocation(fragment);
-		
-		File file = new File(fragment.getLocation());
-		return file.isDirectory() ? fragment.getLocation() : getExtractionLocation(file);
-	}
-	
-	private String getExtractionLocation(File file) {
-		long timestamp = file.lastModified() ^ file.getAbsolutePath().hashCode();
-		File metadata = PDEPlugin.getDefault().getStateLocation().toFile();
-		File cache = new File(metadata, Long.toString(timestamp) + ".swt"); //$NON-NLS-1$
-		if (!cache.exists()){
-			deleteStaleCache(metadata);
-			cache.mkdirs();
-			extractZipFile(file, cache);
-		}		
-		return cache.getAbsolutePath();
-	}
-	
-	private void deleteStaleCache(File metadata) {
-		if (!metadata.exists())
-			return;
-		
-		File[] children = metadata.listFiles();
-		if (children == null)
-			return;
-		for (int i = 0; i < children.length; i++) {
-			if (children[i].isDirectory() && children[i].getName().endsWith(".swt")) { //$NON-NLS-1$
-				CoreUtility.deleteContent(children[i]);
-			}
-		}
-	}
-	
-	private void extractZipFile(File fragment, File destination) {
-		ZipFile zipFile = null;
-		try {
-			zipFile = new ZipFile(fragment);
-			for (Enumeration zipEntries = zipFile.entries(); zipEntries.hasMoreElements();) {
-				ZipEntry zipEntry = (ZipEntry) zipEntries.nextElement();
-				if (zipEntry.isDirectory())
-					continue;
-				if (isInterestingFile(zipEntry.getName())) {
-					InputStream in = null;
-					try {
-						in = zipFile.getInputStream(zipEntry);
-						if (in != null) {
-							File file = new File(destination, zipEntry.getName());
-							AbstractFrameworkAdaptor.readFile(in, file);
-							if (!Platform.getOS().equals(Constants.OS_WIN32))
-								Runtime.getRuntime().exec(new String[] {"chmod", "755", file.getAbsolutePath()}).waitFor(); //$NON-NLS-1$ //$NON-NLS-2$
-						}
-					} catch (IOException e) {
-					} catch (InterruptedException e) {
-					} finally {
-						try {
-							if (in != null)
-								in.close();
-						} catch (IOException e1) {
-						}						
-					}
-				}
-			}
-		} catch (ZipException e) {
-		} catch (IOException e) {
-		} finally {
-			try {
-				if (zipFile != null)
-					zipFile.close();
-			} catch (IOException e) {
-			}
-		}
-	}
-	
-	private boolean isInterestingFile(String name) {
-		Path path = new Path(name);
-		if (path.segmentCount() > 1)
-			return false;
-		return name.endsWith(".dll") //$NON-NLS-1$
-				|| name.endsWith(".jnilib") //$NON-NLS-1$
-				|| name.endsWith(".sl") //$NON-NLS-1$
-				|| name.endsWith(".a") //$NON-NLS-1$
-				|| name.indexOf(".so") != -1; //$NON-NLS-1$
-	}
-	
-	private String getLegacyNativeLibrariesLocation(BundleDescription fragment) {
-		StringBuffer buffer = new StringBuffer();
-		IPath path = new Path(fragment.getLocation());
-		buffer.append(path.removeTrailingSeparator().toString());
-		buffer.append(IPath.SEPARATOR);
-		buffer.append("os"); //$NON-NLS-1$
-		buffer.append(IPath.SEPARATOR);
-		buffer.append(TargetPlatform.getOS());
-		buffer.append(IPath.SEPARATOR);
-		buffer.append(TargetPlatform.getOSArch());
-		return buffer.toString();
-	}
-		
-	private String[] getClasspath(BundleDescription desc, ILaunchConfiguration configuration) throws CoreException {
-		String[] entries = getClasspath(configuration);
-		
-		IFragmentModel fragment = PDECore.getDefault().getModelManager().findFragmentModel(desc.getSymbolicName());
-		
-		if (fragment == null)
-			return entries;
-		
-		ArrayList extra = new ArrayList();
-		IResource resource = fragment.getUnderlyingResource();
-		if (resource != null) {
-			IProject project = resource.getProject();
-			if (project.hasNature(JavaCore.NATURE_ID)) {
-				IJavaProject jProject = JavaCore.create(project);
-				extra.add(JavaRuntime.newProjectRuntimeClasspathEntry(jProject).getPath());
-				IClasspathEntry[] classEntries = jProject.getRawClasspath();
-				for (int i = 0; i < classEntries.length; i++) {
-					int kind = classEntries[i].getEntryKind();
-					if (kind == IClasspathEntry.CPE_LIBRARY) {
-						extra.add(JavaRuntime.newArchiveRuntimeClasspathEntry(classEntries[i].getPath()).getLocation());
-					} 
-				}
-			}
-		} else {
-			IPluginLibrary[] libraries = fragment.getFragment().getLibraries();
-			String location = fragment.getInstallLocation();
-			for (int i = 0; i < libraries.length; i++) {
-				String name = ClasspathUtilCore.expandLibraryName(libraries[i].getName());
-				extra.add(new Path(location).append(name).toOSString());
-			}
-		}
-		if (extra.size() > 0) {
-			String[] all = new String[entries.length + extra.size()];
-			System.arraycopy(entries, 0, all, 0, entries.length);
-			for (int i = 0; i < extra.size(); i++) {
-				all[i+entries.length] = extra.get(i).toString();
-			}
-			return all;
-		}
-		return entries;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/SWTLauncherTabGroup.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/SWTLauncherTabGroup.java
deleted file mode 100644
index de510b3..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/SWTLauncherTabGroup.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-
-import org.eclipse.debug.ui.*;
-import org.eclipse.debug.ui.sourcelookup.*;
-import org.eclipse.jdt.debug.ui.launchConfigurations.*;
-
-public class SWTLauncherTabGroup extends AbstractLaunchConfigurationTabGroup {
-
-	public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
-		ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] {
-				new JavaMainTab(),
-				new JavaArgumentsTab(),
-				new JavaJRETab(),
-				new JavaClasspathTab(),
-				new SourceLookupTab(),
-				new EnvironmentTab(),
-				new CommonTab()
-		};
-		setTabs(tabs);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/SWTSourcePathComputer.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/SWTSourcePathComputer.java
deleted file mode 100644
index 0fb877e..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/SWTSourcePathComputer.java
+++ /dev/null

@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-
-import java.io.*;
-import java.util.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.debug.core.*;
-import org.eclipse.debug.core.sourcelookup.*;
-import org.eclipse.debug.core.sourcelookup.containers.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.launching.sourcelookup.containers.*;
-import org.eclipse.osgi.service.resolver.BundleDescription;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.*;
-
-public class SWTSourcePathComputer extends JavaSourcePathComputer {
-	
-	private static final String ID = "org.eclipse.pde.ui.swtSourcePathComputer"; //$NON-NLS-1$
-
-	public String getId() {
-		return ID;
-	}
-	
-	public ISourceContainer[] computeSourceContainers(ILaunchConfiguration configuration, IProgressMonitor monitor) throws CoreException {
-		ISourceContainer[] containers =  super.computeSourceContainers(configuration, monitor);
-
-		BundleDescription desc = SWTLaunchConfiguration.findFragment();
-		IFragment fragment = null;
-		if (desc != null) {
-			IFragmentModel model = PDECore.getDefault().getModelManager().findFragmentModel(desc.getSymbolicName());
-			fragment = model != null ? model.getFragment() : null;
-		}
-		
-		if (fragment == null)
-			return containers;
-		
-		IPath fragmentPath = new Path(fragment.getModel().getInstallLocation());
-		for (int i = 0; i < containers.length; i++) {
-			if (containers[i] instanceof PackageFragmentRootSourceContainer) {
-				PackageFragmentRootSourceContainer container = (PackageFragmentRootSourceContainer)containers[i];
-				IPackageFragmentRoot root = container.getPackageFragmentRoot();
-				if (root.getSourceAttachmentPath() == null) {
-					int matchCount = fragmentPath.matchingFirstSegments(root.getPath());
-					if (matchCount == fragmentPath.segmentCount()) {
-						IPath libPath = root.getPath().removeFirstSegments(matchCount);
-						String libLocation = getLibrarySourceLocation(fragment, libPath);
-						if (libLocation != null) {
-							containers[i] = new ExternalArchiveSourceContainer(libLocation, false);
-						}
-					}
-				}
-			}
-		}
-		ArrayList extra = new ArrayList();
-		IResource resource = fragment.getModel().getUnderlyingResource();
-		if (resource != null) {
-			IProject project = resource.getProject();
-			if (project.hasNature(JavaCore.NATURE_ID)) {
-				IJavaProject jProject = JavaCore.create(project);
-				extra.add(new JavaProjectSourceContainer(jProject));
-				IPackageFragmentRoot[] roots = jProject.getPackageFragmentRoots();
-				for (int i = 0; i < roots.length; i++) {
-					if (roots[i].getKind() == IPackageFragmentRoot.K_BINARY 
-							&& roots[i].getRawClasspathEntry().getEntryKind() == IClasspathEntry.CPE_LIBRARY) 
-						extra.add(new PackageFragmentRootSourceContainer(roots[i]));
-				}
-			}
-		} else {
-			IPluginLibrary[] libraries = fragment.getLibraries();
-			for (int i = 0; i < libraries.length; i++) {
-				String name = ClasspathUtilCore.expandLibraryName(libraries[i].getName());
-				String location = getLibrarySourceLocation(fragment, new Path(name));
-				if (location != null)
-					extra.add(new ExternalArchiveSourceContainer(location, false));
-			}
-		}
-		if (extra.size() > 0) {
-			ISourceContainer[] all = new ISourceContainer[containers.length + extra.size()];
-			System.arraycopy(containers, 0, all, 0, containers.length);
-			for (int i = 0; i < extra.size(); i++) {
-				all[i+containers.length] = (ISourceContainer) extra.get(i);
-			}
-			return all;
-		}
-		return containers;
-	}
-	
-	private String getLibrarySourceLocation(IFragment fragment, IPath path) {
-		String library = path.segmentCount() == 0 ? "." : path.setDevice(null).toString(); //$NON-NLS-1$
-		SourceLocationManager manager = PDECore.getDefault().getSourceLocationManager();
-		int dot = library.lastIndexOf('.');
-		if (dot != -1) {
-			library = library.substring(0, dot) + "src.zip"; //$NON-NLS-1$
-		}
-		File file = manager.findSourceFile(fragment, new Path(library));
-		return file == null ? null : file.getAbsolutePath();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/TracingBlock.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/TracingBlock.java
deleted file mode 100644
index 485eebd..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/TracingBlock.java
+++ /dev/null

@@ -1,384 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Properties;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-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.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.ModelEntry;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.PluginModelManager;
-import org.eclipse.pde.internal.core.TracingOptionsManager;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.util.SWTUtil;
-import org.eclipse.pde.internal.ui.wizards.ListUtil;
-import org.eclipse.pde.ui.launcher.AbstractLauncherTab;
-import org.eclipse.pde.ui.launcher.IPDELauncherConstants;
-import org.eclipse.pde.ui.launcher.TracingTab;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.FillLayout;
-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.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ScrolledPageBook;
-
-public class TracingBlock {
-
-	private TracingTab fTab;
-	private Button fTracingCheck;
-	private CheckboxTableViewer fPluginViewer;
-	private IPluginModelBase[] fTraceableModels;
-	private Properties fMasterOptions = new Properties();
-	private Button fSelectAllButton;
-	private Button fDeselectAllButton;
-	private Label fPropertyLabel;
-	private Hashtable fPropertySources = new Hashtable();
-	private FormToolkit fToolkit;
-	private ScrolledPageBook fPageBook;
-
-	public TracingBlock(TracingTab tab) {
-		fTab = tab;
-	}
-	
-	public AbstractLauncherTab getTab() {
-		return fTab;
-	}
-	
-	public void createControl(Composite parent) {
-		fTracingCheck = new Button(parent, SWT.CHECK);
-		fTracingCheck.setText(PDEUIMessages.TracingLauncherTab_tracing); 
-		fTracingCheck.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fTracingCheck.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				masterCheckChanged(true);
-				fTab.updateLaunchConfigurationDialog();
-			}
-		});
-
-		Label separator = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
-		separator.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		createSashSection(parent);
-
-		createButtonSection(parent);
-	}
-	
-	private void createSashSection(Composite container) {
-		SashForm sashForm = new SashForm(container, SWT.HORIZONTAL);
-		sashForm.setLayoutData(new GridData(GridData.FILL_BOTH));
-		createPluginViewer(sashForm);
-		createPropertySheetClient(sashForm);
-	}
-	
-	private void createPluginViewer(Composite sashForm) {
-		Composite composite = new Composite(sashForm, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.marginWidth = layout.marginHeight = 1;
-		composite.setLayout(layout);
-		
-		Label label = new Label(composite, SWT.NULL);
-		label.setText(PDEUIMessages.TracingLauncherTab_plugins); 
-		
-		fPluginViewer = CheckboxTableViewer.newCheckList(composite, SWT.BORDER);
-		fPluginViewer.setContentProvider(new ArrayContentProvider());
-		fPluginViewer.setLabelProvider(PDEPlugin.getDefault().getLabelProvider());
-		fPluginViewer.setSorter(new ListUtil.PluginSorter());
-		fPluginViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent e) {
-				pluginSelected(getSelectedModel());
-			}
-		});
-		fPluginViewer.addCheckStateListener(new ICheckStateListener() {
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				fTab.updateLaunchConfigurationDialog();
-			}
-		});
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.widthHint = 125;
-		gd.heightHint = 100;
-		fPluginViewer.getTable().setLayoutData(gd);
-		fPluginViewer.setInput(getTraceableModels());
-	}
-	
-	private void createPropertySheetClient(Composite sashForm) {
-		Composite tableChild = new Composite(sashForm, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = layout.marginWidth = 0;
-		tableChild.setLayout(layout);
-		fPropertyLabel = new Label(tableChild, SWT.NULL);
-		fPropertyLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		updatePropertyLabel(null);
-		int margin = createPropertySheet(tableChild);
-		layout.marginWidth = layout.marginHeight = margin;
-	}
-	
-	private void createButtonSection(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		container.setLayout(layout);
-		
-		fSelectAllButton = new Button(container, SWT.PUSH);
-		fSelectAllButton.setText(PDEUIMessages.TracingLauncherTab_selectAll); 
-		fSelectAllButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
-		SWTUtil.setButtonDimensionHint(fSelectAllButton);
-		fSelectAllButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				fPluginViewer.setAllChecked(true);
-				fTab.updateLaunchConfigurationDialog();
-			}
-		});
-		
-		fDeselectAllButton = new Button(container, SWT.PUSH);
-		fDeselectAllButton.setText(PDEUIMessages.TracinglauncherTab_deselectAll); 
-		fDeselectAllButton.setLayoutData(new GridData(
-				GridData.HORIZONTAL_ALIGN_BEGINNING));
-		SWTUtil.setButtonDimensionHint(fDeselectAllButton);
-		fDeselectAllButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				fPluginViewer.setAllChecked(false);
-				fTab.updateLaunchConfigurationDialog();
-			}
-		});
-	}
-	
-	protected int createPropertySheet(Composite parent) {
-		fToolkit = new FormToolkit(parent.getDisplay());
-		int toolkitBorderStyle = fToolkit.getBorderStyle();
-		int style = toolkitBorderStyle == SWT.BORDER ? SWT.NULL : SWT.BORDER;
-		
-		Composite container = new Composite(parent, style);
-		FillLayout flayout = new FillLayout();
-		flayout.marginWidth = 1;
-		flayout.marginHeight = 1;
-		container.setLayout(flayout);
-		container.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		fPageBook = new ScrolledPageBook(container, style | SWT.V_SCROLL | SWT.H_SCROLL);
-		fToolkit.adapt(fPageBook, false, false);	
-		
-		if (style == SWT.NULL) {
-			fPageBook.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TREE_BORDER);
-			fToolkit.paintBordersFor(container);
-		}
-		return style == SWT.NULL ? 2 : 0;
-	}
-	
-	public void initializeFrom(ILaunchConfiguration config) {
-		fMasterOptions.clear();
-		disposePropertySources();
-		try {
-			fTracingCheck.setSelection(config.getAttribute(IPDELauncherConstants.TRACING, false));
-			Map options = config.getAttribute(IPDELauncherConstants.TRACING_OPTIONS, (Map) null);
-			if (options == null)
-				options = PDECore.getDefault().getTracingOptionsManager().getTracingTemplateCopy();
-			else
-				options = PDECore.getDefault().getTracingOptionsManager().getTracingOptions(options);
-			fMasterOptions.putAll(options);
-			masterCheckChanged(false);
-			IPluginModelBase model = getLastSelectedPlugin(config);
-			if (model != null) {
-				fPluginViewer.setSelection(new StructuredSelection(model));
-			} else {
-				pluginSelected(null);
-			}
-			String checked = config.getAttribute(IPDELauncherConstants.TRACING_CHECKED, (String) null);
-			if (checked == null) {
-				fPluginViewer.setAllChecked(true);
-			} else if (checked.equals(IPDELauncherConstants.TRACING_NONE)) {
-				fPluginViewer.setAllChecked(false);
-			} else {
-				StringTokenizer tokenizer = new StringTokenizer(checked, ","); //$NON-NLS-1$
-				ArrayList list = new ArrayList();
-				PluginModelManager manager = PDECore.getDefault()
-						.getModelManager();
-				while (tokenizer.hasMoreTokens()) {
-					String id = tokenizer.nextToken();
-					ModelEntry entry = manager.findEntry(id);
-					if (entry != null) {
-						list.add(entry.getActiveModel());
-					}
-				}
-				fPluginViewer.setCheckedElements(list.toArray());
-			}
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-	
-	public void performApply(ILaunchConfigurationWorkingCopy config) {
-		boolean tracingEnabled = fTracingCheck.getSelection();
-		config.setAttribute(IPDELauncherConstants.TRACING, tracingEnabled);
-		if (tracingEnabled) {
-			IPluginModelBase model = getSelectedModel();
-			String id = (model == null) ? null : model.getPluginBase().getId();
-			config.setAttribute(IPDELauncherConstants.TRACING_SELECTED_PLUGIN, id);
-			boolean changes = false;
-			for (Enumeration elements = fPropertySources.elements(); elements
-					.hasMoreElements();) {
-				TracingPropertySource source = (TracingPropertySource) elements
-						.nextElement();
-				if (source.isModified()) {
-					changes = true;
-					source.save();
-				}
-			}
-			if (changes)
-				config.setAttribute(IPDELauncherConstants.TRACING_OPTIONS, fMasterOptions);
-		} else {
-			config.setAttribute(IPDELauncherConstants.TRACING_SELECTED_PLUGIN, (String) null);
-		}
-		Object[] checked = fPluginViewer.getCheckedElements();
-		if (checked.length == fPluginViewer.getTable().getItemCount()) {
-			config.setAttribute(IPDELauncherConstants.TRACING_CHECKED, (String) null);
-		} else if (checked.length == 0) {
-			config.setAttribute(IPDELauncherConstants.TRACING_CHECKED, IPDELauncherConstants.TRACING_NONE);
-		} else {
-			StringBuffer buffer = new StringBuffer();
-			for (int i = 0; i < checked.length; i++) {
-				IPluginModelBase model = (IPluginModelBase) checked[i];
-				buffer.append(model.getPluginBase().getId());
-				if (i < checked.length - 1)
-					buffer.append(',');
-			}
-			config.setAttribute(IPDELauncherConstants.TRACING_CHECKED, buffer.toString());
-		}
-	}
-	
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
-		configuration.setAttribute(IPDELauncherConstants.TRACING, false);
-		configuration.setAttribute(IPDELauncherConstants.TRACING_CHECKED, IPDELauncherConstants.TRACING_NONE);
-	}
-	
-	public void activated(ILaunchConfigurationWorkingCopy workingCopy) {
-		fPageBook.getParent().getParent().layout(true);
-	}
-	
-	public void dispose() {
-		if (fToolkit != null)
-			fToolkit.dispose();
-	}
-	
-	public FormToolkit getToolkit() {
-		return fToolkit;
-	}
-	
-	private IPluginModelBase getSelectedModel() {
-		if (fTracingCheck.isEnabled()) {
-			Object item = ((IStructuredSelection) fPluginViewer.getSelection()).getFirstElement();
-			if (item instanceof IPluginModelBase)
-				return ((IPluginModelBase) item);
-		}
-		return null;
-	}
-	
-	private void pluginSelected(IPluginModelBase model) {
-		TracingPropertySource source = getPropertySource(model);
-		if (source == null) {
-			fPageBook.showEmptyPage();
-		} else {
-			if (!fPageBook.hasPage(model)) {
-				Composite parent = fPageBook.createPage(model);
-				source.createContents(parent);
-			}
-			fPageBook.showPage(model);
-		}
-		updatePropertyLabel(model);
-	}
-
-	private void updatePropertyLabel(IPluginModelBase model) {
-		String text = (model == null) 
-						? PDEUIMessages.TracingLauncherTab_options 
-						: PDEPlugin.getDefault().getLabelProvider().getText(model);
-		fPropertyLabel.setText(text);
-	}
-
-	private IPluginModelBase[] getTraceableModels() {
-		if (fTraceableModels == null) {
-			PluginModelManager manager = PDECore.getDefault().getModelManager();
-			IPluginModelBase[] models = manager.getPlugins();
-			ArrayList result = new ArrayList();
-			for (int i = 0; i < models.length; i++) {
-				if (TracingOptionsManager.isTraceable(models[i]))
-					result.add(models[i]);
-			}
-			fTraceableModels = (IPluginModelBase[]) result.toArray(new IPluginModelBase[result.size()]);
-		}
-		return fTraceableModels;
-	}
-	
-	private IPluginModelBase getLastSelectedPlugin(ILaunchConfiguration config)
-			throws CoreException {
-		String pluginID = config.getAttribute(IPDELauncherConstants.TRACING_SELECTED_PLUGIN, (String) null);
-		if (pluginID != null) {
-			ModelEntry entry = PDECore.getDefault().getModelManager().findEntry(pluginID);
-			return (entry == null) ? null : entry.getActiveModel();
-		}
-		return null;
-	}
-
-	private TracingPropertySource getPropertySource(IPluginModelBase model) {
-		if (model == null)
-			return null;
-		TracingPropertySource source = (TracingPropertySource) fPropertySources.get(model);
-		if (source == null) {
-			String id = model.getPluginBase().getId();
-			Hashtable defaults = PDECore.getDefault().getTracingOptionsManager().getTemplateTable(id);
-			source = new TracingPropertySource(model, fMasterOptions, defaults, this);
-			fPropertySources.put(model, source);
-		}
-		return source;
-	}
-	
-	private void masterCheckChanged(boolean userChange) {
-		boolean enabled = fTracingCheck.getSelection();
-		fPluginViewer.getTable().setEnabled(enabled);
-		Control currentPage = fPageBook.getCurrentPage();
-		if (currentPage != null)
-			currentPage.setEnabled(enabled);
-		fSelectAllButton.setEnabled(enabled);
-		fDeselectAllButton.setEnabled(enabled);
-	}
-
-	private void disposePropertySources() {
-		Enumeration elements = fPropertySources.elements();
-		while (elements.hasMoreElements()) {
-			TracingPropertySource source = (TracingPropertySource) elements.nextElement();
-			fPageBook.removePage(source.getModel());			
-		}
-		fPropertySources.clear();
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/TracingPropertySource.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/TracingPropertySource.java
deleted file mode 100644
index 70efc51..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/TracingPropertySource.java
+++ /dev/null

@@ -1,221 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Locale;
-import java.util.Properties;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-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.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
-
-
-public class TracingPropertySource {
-	private IPluginModelBase fModel;
-	private Vector fDescriptors;
-	private Hashtable fTemplate;
-	private Hashtable fValues;
-	private Hashtable fDvalues;
-	private static final String[] fBooleanChoices = {"false", "true"}; //$NON-NLS-1$ //$NON-NLS-2$
-	private Properties fMasterOptions;
-	private boolean fModified;
-	private TracingBlock fBlock;
-	private abstract class PropertyEditor {
-		private String key;
-		private String label;
-		public PropertyEditor(String key, String label) {
-			this.key = key;
-			this.label = label;
-		}
-		public String getKey() {
-			return key;
-		}
-		public String getLabel() {
-			return label;
-		}
-		abstract void create(Composite parent);
-		abstract void update();
-		abstract void initialize();
-		protected void valueModified(Object value) {
-			fValues.put(getKey(), value);
-			fModified = true;
-			fBlock.getTab().updateLaunchConfigurationDialog();
-		}
-	}
-	private class BooleanEditor extends PropertyEditor {
-		private Button checkbox;
-		public BooleanEditor(String key, String label) {
-			super(key, label);
-		}
-		public void create(Composite parent) {
-			checkbox = fBlock.getToolkit().createButton(parent, getLabel(),
-					SWT.CHECK);
-			TableWrapData td = new TableWrapData();
-			td.colspan = 2;
-			checkbox.setLayoutData(td);
-		}
-		public void update() {
-			Integer value = (Integer) fValues.get(getKey());
-			checkbox.setSelection(value.intValue() == 1);
-		}
-		public void initialize() {
-			update();
-			checkbox.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					int value = checkbox.getSelection() ? 1 : 0;
-					valueModified(new Integer(value));
-				}
-			});
-		}
-	}
-	private class TextEditor extends PropertyEditor {
-		private Text text;
-		public TextEditor(String key, String label) {
-			super(key, label);
-		}
-		public void create(Composite parent) {
-			Label label = fBlock.getToolkit().createLabel(parent, getLabel());
-			TableWrapData td = new TableWrapData();
-			td.valign = TableWrapData.MIDDLE;
-			label.setLayoutData(td);
-			text = fBlock.getToolkit().createText(parent, ""); //$NON-NLS-1$
-			td = new TableWrapData(TableWrapData.FILL_GRAB);
-			//gd.widthHint = 100;
-			text.setLayoutData(td);
-		}
-		public void update() {
-			String value = (String) fValues.get(getKey());
-			text.setText(value);
-		}
-		public void initialize() {
-			update();
-			text.addModifyListener(new ModifyListener() {
-				public void modifyText(ModifyEvent e) {
-					valueModified(text.getText());
-				}
-			});
-		}
-	}
-	public TracingPropertySource(IPluginModelBase model,
-			Properties masterOptions, Hashtable template,
-			TracingBlock block) {
-		fModel = model;
-		fMasterOptions = masterOptions;
-		fTemplate = template;
-		fBlock = block;
-		fValues = new Hashtable();
-		fDvalues = new Hashtable();
-	}
-	public IPluginModelBase getModel() {
-		return fModel;
-	}
-	private Object[] getSortedKeys(int size) {
-		Object[] keyArray = new Object[size];
-		int i = 0;
-		for (Enumeration keys = fTemplate.keys(); keys.hasMoreElements();) {
-			String key = (String) keys.nextElement();
-			keyArray[i++] = key;
-		}
-		Arrays.sort(keyArray, new Comparator() {
-			public int compare(Object o1, Object o2) {
-				return compareKeys(o1, o2);
-			}
-		});
-		return keyArray;
-	}
-	private int compareKeys(Object o1, Object o2) {
-		String s1 = (String) o1;
-		String s2 = (String) o2;
-		// equal
-		return s1.compareTo(s2);
-	}
-
-	public void createContents(Composite parent) {
-		fDescriptors = new Vector();
-		TableWrapLayout layout = new TableWrapLayout();
-		layout.numColumns = 2;
-		parent.setLayout(layout);
-		boolean bordersNeeded=false;
-		Object[] sortedKeys = getSortedKeys(fTemplate.size());
-		for (int i = 0; i < sortedKeys.length; i++) {
-			String key = (String) sortedKeys[i];
-			IPath path = new Path(key);
-			path = path.removeFirstSegments(1);
-			String shortKey = path.toString();
-			String value = (String) fTemplate.get(key);
-			String lvalue = null;
-			String masterValue = fMasterOptions.getProperty(key);
-			PropertyEditor editor;
-			if (value != null)
-				lvalue = value.toLowerCase(Locale.ENGLISH);
-			if (lvalue != null
-					&& (lvalue.equals("true") || lvalue.equals("false"))) { //$NON-NLS-1$ //$NON-NLS-2$
-				editor = new BooleanEditor(shortKey, shortKey);
-				Integer dvalue = new Integer(lvalue.equals("true") ? 1 : 0); //$NON-NLS-1$
-				fDvalues.put(shortKey, dvalue);
-				if (masterValue != null) {
-					Integer mvalue = new Integer(masterValue.equals("true") //$NON-NLS-1$
-							? 1
-							: 0);
-					fValues.put(shortKey, mvalue);
-				}
-			} else {
-				editor = new TextEditor(shortKey, shortKey);
-				fDvalues.put(shortKey, value != null ? value : ""); //$NON-NLS-1$
-				if (masterValue != null) {
-					fValues.put(shortKey, masterValue);
-				}
-				bordersNeeded=true;
-			}
-			editor.create(parent);
-			editor.initialize();
-			fDescriptors.add(editor);
-			if (bordersNeeded)
-				fBlock.getToolkit().paintBordersFor(parent);
-		}
-	}
-
-	/**
-	 */
-	public void save() {
-		String pid = fModel.getPluginBase().getId();
-		for (Enumeration keys = fValues.keys(); keys.hasMoreElements();) {
-			String shortKey = (String) keys.nextElement();
-			Object value = fValues.get(shortKey);
-			String svalue = value.toString();
-			if (value instanceof Integer)
-				svalue = fBooleanChoices[((Integer) value).intValue()];
-			IPath path = new Path(pid).append(shortKey);
-			fMasterOptions.setProperty(path.toString(), svalue);
-		}
-		fModified = false;
-	}
-	public void dispose() {
-	}
-	public boolean isModified() {
-		return fModified;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/VMHelper.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/VMHelper.java
deleted file mode 100644
index b81a979..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/VMHelper.java
+++ /dev/null

@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-
-import java.util.ArrayList;
-import java.util.TreeSet;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMInstall2;
-import org.eclipse.jdt.launching.IVMInstallType;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.ui.launcher.IPDELauncherConstants;
-
-public class VMHelper {
-	
-	public static IVMInstall findMatchingJREInstall(String compliance) {
-		IVMInstallType[] installTypes = JavaRuntime.getVMInstallTypes();
-		for (int i = 0; i < installTypes.length; i++) {
-			IVMInstall[] installs = installTypes[i].getVMInstalls();
-			for (int k = 0; k < installs.length; k++) {
-				if (hasMatchingCompliance(installs[k], compliance)) {
-					return installs[k];
-				}
-			}
-		}
-		return null;
-	}
-
-	public static boolean hasMatchingCompliance(IVMInstall inst, String compliance) {
-		if (!(inst instanceof IVMInstall2))
-			return false;
-
-		String version = ((IVMInstall2) inst).getJavaVersion();
-		return version != null && compliance.compareTo(version) <= 0;
-	}
-	
-	public static String[] getAvailableComplianceLevels() {
-		TreeSet set = new TreeSet();
-		IVMInstall[] installs = getAllVMInstances();
-		for (int i = 0; i < installs.length; i++) {
-			if (installs[i] instanceof IVMInstall2) {
-				String version =((IVMInstall2)installs[i]).getJavaVersion();
-				if (version != null) {
-					if (version.startsWith(JavaCore.VERSION_1_5)) {
-						set.add("5.0"); //$NON-NLS-1$
-						set.add(JavaCore.VERSION_1_4);
-						set.add(JavaCore.VERSION_1_3);
-					} else if (version.startsWith(JavaCore.VERSION_1_4)) {
-						set.add(JavaCore.VERSION_1_4);
-						set.add(JavaCore.VERSION_1_3);
-					} else if (version.startsWith(JavaCore.VERSION_1_3)) {
-						set.add(JavaCore.VERSION_1_3);
-					}
-				}			
-			}
-		}
-		return (String[])set.toArray(new String[set.size()]);
-	}
-
-	public static IVMInstall[] getAllVMInstances() {
-		ArrayList res = new ArrayList();
-		IVMInstallType[] types = JavaRuntime.getVMInstallTypes();
-		for (int i = 0; i < types.length; i++) {
-			IVMInstall[] installs = types[i].getVMInstalls();
-			for (int k = 0; k < installs.length; k++) {
-				res.add(installs[k]);
-			}
-		}
-		return (IVMInstall[]) res.toArray(new IVMInstall[res.size()]);
-	}
-	
-	public static String[] getVMInstallNames() {
-		IVMInstall[] installs = getAllVMInstances();
-		String[] names = new String[installs.length];
-		for (int i = 0; i < installs.length; i++) {
-			names[i] = installs[i].getName();
-		}
-		return names;
-	}
-	
-	public static String getDefaultVMInstallName() {
-		IVMInstall install = JavaRuntime.getDefaultVMInstall();
-		if (install != null)
-			return install.getName();
-		return null;
-	}
-	
-	public static IVMInstall getVMInstall(String name) {
-		if (name != null) {
-			IVMInstall[] installs = getAllVMInstances();
-			for (int i = 0; i < installs.length; i++) {
-				if (installs[i].getName().equals(name))
-					return installs[i];
-			}
-		}
-		return JavaRuntime.getDefaultVMInstall();
-	}
-
-	public static IVMInstall createLauncher(
-			ILaunchConfiguration configuration)
-			throws CoreException {
-		String vm = configuration.getAttribute(IPDELauncherConstants.VMINSTALL, (String) null);
-		IVMInstall launcher = getVMInstall(vm);
-
-		if (launcher == null) 
-			throw new CoreException(
-				createErrorStatus(NLS.bind(PDEUIMessages.WorkbenchLauncherConfigurationDelegate_noJRE, vm)));
-		
-		if (!launcher.getInstallLocation().exists()) 
-			throw new CoreException(
-				createErrorStatus(PDEUIMessages.WorkbenchLauncherConfigurationDelegate_jrePathNotFound));
-		
-		return launcher;
-	}
-
-	public static IStatus createErrorStatus(String message) {
-		return new Status(
-			IStatus.ERROR,
-			PDEPlugin.getPluginId(),
-			IStatus.OK,
-			message,
-			null);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/WorkbenchSourcePathProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/WorkbenchSourcePathProvider.java
deleted file mode 100644
index 42a4d7f..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/WorkbenchSourcePathProvider.java
+++ /dev/null

@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-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.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-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.StandardSourcePathProvider;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.ui.launcher.IPDELauncherConstants;
-/**
- * Generates a source lookup path for Runtime Workbench launch configurations.
- */
-public class WorkbenchSourcePathProvider extends StandardSourcePathProvider {
-	/**
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathProvider#computeUnresolvedClasspath(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public IRuntimeClasspathEntry[] computeUnresolvedClasspath(
-			ILaunchConfiguration configuration) throws CoreException {
-		boolean defaultPath = configuration.getAttribute(
-				IJavaLaunchConfigurationConstants.ATTR_DEFAULT_SOURCE_PATH,
-				true);
-		if (!defaultPath) {
-			return recoverRuntimePath(configuration,
-					IJavaLaunchConfigurationConstants.ATTR_SOURCE_PATH);
-		}
-		List sourcePath = new ArrayList();
-		// first on the source lookup path, goes the class libraries for the
-		// JRE
-		String vmInstallName = configuration.getAttribute(
-				IPDELauncherConstants.VMINSTALL, VMHelper
-						.getDefaultVMInstallName());
-		IVMInstall[] vmInstallations = VMHelper.getAllVMInstances();
-		IVMInstall jre = null;
-		for (int i = 0; i < vmInstallations.length; i++) {
-			if (vmInstallName.equals(vmInstallations[i].getName())) {
-				jre = vmInstallations[i];
-				break;
-			}
-		}
-		if (jre != null) {
-			// add container that corresponds to JRE
-			IPath containerPath = new Path(JavaRuntime.JRE_CONTAINER);
-			containerPath = containerPath
-					.append(jre.getVMInstallType().getId());
-			containerPath = containerPath.append(jre.getName());
-			IRuntimeClasspathEntry entry = JavaRuntime
-					.newRuntimeContainerClasspathEntry(containerPath,
-							IRuntimeClasspathEntry.BOOTSTRAP_CLASSES);
-			sourcePath.add(entry);
-		}
-		IProject[] projects = getJavaProjects(configuration);
-		for (int i = 0; i < projects.length; i++) {
-			sourcePath.add(JavaRuntime
-					.newProjectRuntimeClasspathEntry(JavaCore.create(projects[i])));
-		}
-		return (IRuntimeClasspathEntry[]) sourcePath
-				.toArray(new IRuntimeClasspathEntry[sourcePath.size()]);
-	}
-	/**
-	 * Converts plugin models to java projects
-	 */
-	private IProject[] getJavaProjects(ILaunchConfiguration configuration)
-			throws CoreException {
-		IProject[] projects = LaunchPluginValidator.getAffectedProjects(configuration);
-		return PDEPlugin.getWorkspace().computeProjectOrder(projects).projects;
-	}
-	/**
-	 * @see IRuntimeClasspathProvider#resolveClasspath(IRuntimeClasspathEntry[],
-	 *      ILaunchConfiguration)
-	 */
-	public IRuntimeClasspathEntry[] resolveClasspath(
-			IRuntimeClasspathEntry[] entries, ILaunchConfiguration configuration)
-			throws CoreException {
-		List all = new ArrayList(entries.length);
-		for (int i = 0; i < entries.length; i++) {
-			if (entries[i].getType() == IRuntimeClasspathEntry.PROJECT) {
-				// a project resolves to itself for source lookup (rather than
-				// the class file output locations)
-				all.add(entries[i]);
-				// also add non-JRE libraries
-				IResource resource = entries[i].getResource();
-				if (resource instanceof IProject) {
-					IJavaProject project = JavaCore.create((IProject) resource);
-					IPackageFragmentRoot[] roots = project
-							.getPackageFragmentRoots();
-					for (int j = 0; j < roots.length; j++) {
-						if (roots[j].getKind() == IPackageFragmentRoot.K_BINARY && !isJRELibrary(roots[j])) {
-							IRuntimeClasspathEntry rte = JavaRuntime
-									.newArchiveRuntimeClasspathEntry(roots[j]
-											.getPath());
-							IPath path = roots[j].getSourceAttachmentPath();
-							if (path != null) {
-								rte.setSourceAttachmentPath(path);
-								rte.setSourceAttachmentRootPath(roots[j]
-										.getSourceAttachmentRootPath());
-							}
-							if (!all.contains(rte))
-								all.add(rte);
-						}
-					}
-				}
-			} else {
-				IRuntimeClasspathEntry[] resolved = JavaRuntime
-						.resolveRuntimeClasspathEntry(entries[i], configuration);
-				for (int j = 0; j < resolved.length; j++) {
-					all.add(resolved[j]);
-				}
-			}
-		}
-		return (IRuntimeClasspathEntry[]) all
-				.toArray(new IRuntimeClasspathEntry[all.size()]);
-	}
-	private boolean isJRELibrary(IPackageFragmentRoot root) {
-		try {
-			IPath path = root.getRawClasspathEntry().getPath();
-			if (path.equals(new Path(JavaRuntime.JRE_CONTAINER))
-					|| path.equals(new Path(JavaRuntime.JRELIB_VARIABLE))) {
-				return true;
-			}
-		} catch (JavaModelException e) {
-		}
-		return false;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/WorkspaceDataBlock.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/WorkspaceDataBlock.java
deleted file mode 100644
index 46f5ead..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/WorkspaceDataBlock.java
+++ /dev/null

@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.launcher;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.ui.launcher.AbstractLauncherTab;
-import org.eclipse.pde.ui.launcher.IPDELauncherConstants;
-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.Group;
-
-public class WorkspaceDataBlock extends BaseBlock {
-
-	private Button fClearWorkspaceCheck;
-	private Button fAskClearCheck;
-	
-	public WorkspaceDataBlock(AbstractLauncherTab tab) {
-		super(tab);
-	}
-	
-	public void createControl(Composite parent) {
-		Group group = new Group(parent, SWT.NONE);
-		group.setText(PDEUIMessages.WorkspaceDataBlock_workspace); 
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		group.setLayout(layout);
-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		createText(group, PDEUIMessages.WorkspaceDataBlock_location, 0);
-		
-		Composite buttons = new Composite(group, SWT.NONE);
-		layout = new GridLayout(4, false);
-		layout.marginHeight = layout.marginWidth = 0;
-		buttons.setLayout(layout);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		buttons.setLayoutData(gd);
-		
-		fClearWorkspaceCheck = new Button(buttons, SWT.CHECK);
-		fClearWorkspaceCheck.setText(PDEUIMessages.WorkspaceDataBlock_clear);	
-		fClearWorkspaceCheck.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fClearWorkspaceCheck.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				fAskClearCheck.setEnabled(fClearWorkspaceCheck.getSelection());
-				fTab.updateLaunchConfigurationDialog();
-			}
-		});
-		
-		createButtons(buttons);
-		
-		fAskClearCheck = new Button(group, SWT.CHECK);
-		fAskClearCheck.setText(PDEUIMessages.WorkspaceDataBlock_askClear);
-		gd = new GridData();
-		gd.horizontalSpan = 2;
-		fAskClearCheck.setLayoutData(gd);
-		fAskClearCheck.addSelectionListener(fListener);
-	}
-	
-	public void performApply(ILaunchConfigurationWorkingCopy config) {
-		config.setAttribute(IPDELauncherConstants.LOCATION, getLocation());
-		config.setAttribute(IPDELauncherConstants.DOCLEAR, fClearWorkspaceCheck.getSelection());
-		config.setAttribute(IPDELauncherConstants.ASKCLEAR, fAskClearCheck.getSelection());
-	}
-	
-	public void initializeFrom(ILaunchConfiguration configuration, boolean isJUnit) throws CoreException {
-		fLocationText.setText(configuration.getAttribute(IPDELauncherConstants.LOCATION, 
-														LaunchArgumentsHelper.getDefaultWorkspaceLocation(configuration.getName())));
-		fClearWorkspaceCheck.setSelection(configuration.getAttribute(IPDELauncherConstants.DOCLEAR, isJUnit));
-		fAskClearCheck.setSelection(configuration.getAttribute(IPDELauncherConstants.ASKCLEAR, !isJUnit));
-		fAskClearCheck.setEnabled(fClearWorkspaceCheck.getSelection());
-	}
-		
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration, boolean isJUnit) {		
-		configuration.setAttribute(IPDELauncherConstants.LOCATION, 
-				LaunchArgumentsHelper.getDefaultWorkspaceLocation(configuration.getName())); 
-		configuration.setAttribute(IPDELauncherConstants.DOCLEAR, isJUnit);
-		configuration.setAttribute(IPDELauncherConstants.ASKCLEAR, !isJUnit);
-	}
-
-	protected String getName() {
-		return PDEUIMessages.WorkspaceDataBlock_name;
-	}
-	
-	protected void handleBrowseWorkspace() {
-		super.handleBrowseWorkspace();
-		if (fClearWorkspaceCheck.getSelection())
-			fClearWorkspaceCheck.setSelection(false);
-	}
-	
-	protected void handleBrowseFileSystem() {
-		super.handleBrowseFileSystem();
-		if (fClearWorkspaceCheck.getSelection())
-			fClearWorkspaceCheck.setSelection(false);
-	}
-	
-	public String validate() {
-		int length = getLocation().length();
-		fClearWorkspaceCheck.setEnabled(length > 0);
-		fAskClearCheck.setEnabled(fClearWorkspaceCheck.getSelection() && length > 0);
-		if (length == 0)
-			fClearWorkspaceCheck.setSelection(false);
-		return null;
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsLabelProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsLabelProvider.java
deleted file mode 100644
index 0bfeed1..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsLabelProvider.java
+++ /dev/null

@@ -1,44 +0,0 @@
-package org.eclipse.pde.internal.ui.nls;
-
-import org.eclipse.jface.resource.FontRegistry;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.viewers.IFontProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-
-public class ExternalizeStringsLabelProvider  extends LabelProvider implements ITableLabelProvider, IFontProvider {
-
-	private FontRegistry fFontRegistry;
-	
-	public ExternalizeStringsLabelProvider() {
-		fFontRegistry = JFaceResources.getFontRegistry();
-	}
-
-	public String getColumnText(Object element, int columnIndex) {
-		if (element instanceof ModelChangeElement) {
-			ModelChangeElement changeElement = (ModelChangeElement)element;
-			if (columnIndex == ExternalizeStringsWizardPage.VALUE) {
-				return StringHelper.unwindEscapeChars(changeElement.getValue());
-			} else if (columnIndex == ExternalizeStringsWizardPage.KEY) {
-				return StringHelper.unwindEscapeChars(changeElement.getKey());
-			}
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	public Image getColumnImage(Object element, int columnIndex) {
-		return null;
-	}
-	
-	public Font getFont(Object element) {
-		if (element instanceof ModelChangeElement) {
-			ModelChangeElement changeElement = (ModelChangeElement) element;
-			if (changeElement.isExternalized()) {
-				return fFontRegistry.getBold(JFaceResources.DIALOG_FONT);
-			}
-		}
-		return null;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsOperation.java
deleted file mode 100644
index c34f858..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsOperation.java
+++ /dev/null

@@ -1,140 +0,0 @@
-package org.eclipse.pde.internal.ui.nls;
-
-import java.io.ByteArrayInputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Iterator;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.TextUtilities;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.text.edits.InsertEdit;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.text.edits.ReplaceEdit;
-import org.eclipse.text.edits.TextEdit;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.osgi.framework.Constants;
-
-public class ExternalizeStringsOperation extends WorkspaceModifyOperation {
-
-	private Object[] fChangeFiles;
-	
-	public ExternalizeStringsOperation(Object[] changeFiles) {
-		fChangeFiles = changeFiles;
-	}
-	protected void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
-		for (int i = 0; i < fChangeFiles.length; i++) {
-			if (fChangeFiles[i] instanceof ModelChangeFile) {
-				ModelChangeFile changeFile = (ModelChangeFile)fChangeFiles[i];
-				ModelChange change = changeFile.getModel();
-				IFile pFile = change.getPropertiesFile();
-				if (!pFile.exists()) {
-					IPluginModelBase model = change.getParentModel();
-					String propertiesFileComment = "# properties file for "  //$NON-NLS-1$
-						+ model.getUnderlyingResource().getProject().getName();
-					ByteArrayInputStream pStream = new ByteArrayInputStream(propertiesFileComment.getBytes());
-					pFile.create(pStream, true, monitor);
-					if (!change.localizationSet()) {
-						addBundleLocalization(pFile.getProject(), change.getBundleLocalization(), monitor);
-					}
-				}
-				
-				ITextFileBufferManager pManager = FileBuffers.getTextFileBufferManager();
-				try {
-					pManager.connect(pFile.getFullPath(), monitor);
-					ITextFileBuffer pBuffer = pManager.getTextFileBuffer(pFile.getFullPath());
-					IDocument pDoc = pBuffer.getDocument();
-					MultiTextEdit pEdit = new MultiTextEdit();
-					
-					doReplace(changeFile, pDoc, pEdit, monitor);
-					
-					pEdit.apply(pDoc);
-					pBuffer.commit(monitor, true);
-					
-				} catch (MalformedTreeException e) {
-				} catch (BadLocationException e) {
-				} finally {
-					pManager.disconnect(pFile.getFullPath(), monitor);
-				}
-			}
-		}
-	}
-	private void doReplace(ModelChangeFile changeFile, IDocument pDoc, MultiTextEdit pEdit, IProgressMonitor monitor) throws CoreException {
-		IFile uFile = changeFile.getFile();
-		ITextFileBufferManager uManager = FileBuffers.getTextFileBufferManager();
-		try {
-			uManager.connect(uFile.getFullPath(), monitor);
-			ITextFileBuffer uBuffer = uManager.getTextFileBuffer(uFile.getFullPath());
-			IDocument uDoc = uBuffer.getDocument();
-			MultiTextEdit uEdit = new MultiTextEdit();
-			
-			String nl = TextUtilities.getDefaultLineDelimiter(pDoc);
-			Iterator iter = changeFile.getChanges().iterator();
-			
-			while (iter.hasNext()) {
-				ModelChangeElement changeElement = (ModelChangeElement)iter.next();
-				if (changeElement.isExternalized()) {
-					uEdit.addChild(new ReplaceEdit(changeElement.getOffset(),
-							changeElement.getLength(), 
-							changeElement.getExternKey()));
-					pEdit.addChild(new InsertEdit(pDoc.getLength(), 
-							nl + changeElement.getKey() + " = " +  //$NON-NLS-1$
-							StringHelper.preparePropertiesString(changeElement.getValue(), nl.toCharArray())));
-				}
-			}
-			uEdit.apply(uDoc);
-			uBuffer.commit(monitor, true);
-			
-		} catch (MalformedTreeException e) {
-		} catch (BadLocationException e) {
-		} finally {
-			uManager.disconnect(uFile.getFullPath(), monitor);
-		}
- 	}
-	
-	private void addBundleLocalization(IProject project, String localization, IProgressMonitor monitor) throws CoreException {
-		IFile mFile = project.getFile(GetNonExternalizedStringsOperation.MANIFEST_LOCATION);
-		if (!mFile.exists()) return;
-		ITextFileBufferManager mManager = FileBuffers.getTextFileBufferManager();
-		try {
-			mManager.connect(mFile.getFullPath(), monitor);
-			ITextFileBuffer mBuffer = mManager.getTextFileBuffer(mFile.getFullPath());
-			IDocument mDoc = mBuffer.getDocument();
-			
-			String nl = TextUtilities.getDefaultLineDelimiter(mDoc);
-
-			TextEdit mEdit = checkTrailingNewline(mDoc, nl);
-			if (mEdit != null)
-				mEdit.apply(mDoc);
-			
-			mEdit = new InsertEdit(mDoc.getLength(), 
-					Constants.BUNDLE_LOCALIZATION + ": " + localization + nl); //$NON-NLS-1$
-			mEdit.apply(mDoc);
-			mBuffer.commit(monitor, true);
-			
-		} catch (MalformedTreeException e) {
-		} catch (BadLocationException e) {
-		} finally {
-			mManager.disconnect(mFile.getFullPath(), monitor);
-		}
-	}
-	
-	private TextEdit checkTrailingNewline(IDocument document, String ld) {
-		try {
-			int len = ld.length();
-			if (!document.get(document.getLength() - len, len).equals(ld)) {
-				return new InsertEdit(document.getLength(), ld);
-			}
-		} catch (BadLocationException e) {
-		}
-		return null;
-	}
- }

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsWizard.java
deleted file mode 100644
index 4ece5ac..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsWizard.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.nls;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-
-public class ExternalizeStringsWizard extends Wizard {
-	private ExternalizeStringsWizardPage page1;
-	private ModelChangeTable fModelChangeTable;
-
-	public ExternalizeStringsWizard(ModelChangeTable changeTable) {
-		setWindowTitle(PDEUIMessages.ExternalizeStringsWizard_title);
-		setDefaultPageImageDescriptor(PDEPluginImages.DESC_EXTSTR_WIZ);
-		setNeedsProgressMonitor(true);
-		fModelChangeTable = changeTable;
-	}
-	
-	public boolean performFinish() {
-		try {
-			getContainer().run(false, false,
-					new ExternalizeStringsOperation(page1.getChangeFiles()));
-		} catch (InvocationTargetException e) {
-			return false;
-		} catch (InterruptedException e) {
-			return false;
-		}
-		return true;
-	}
-	
-	public void addPages() {
-		page1 = new ExternalizeStringsWizardPage(fModelChangeTable);
-		addPage(page1);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsWizardPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsWizardPage.java
deleted file mode 100644
index 83b4691..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ExternalizeStringsWizardPage.java
+++ /dev/null

@@ -1,541 +0,0 @@
-package org.eclipse.pde.internal.ui.nls;
-
-import java.util.Properties;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.source.SourceViewer;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.IContentProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.SashForm;
-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.Control;
-import org.eclipse.swt.widgets.Label;
-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.swt.widgets.TreeItem;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.ui.dialogs.ContainerCheckedTreeViewer;
-
-public class ExternalizeStringsWizardPage extends WizardPage {
-
-	public static final String PAGE_NAME = "ExternalizeStringsWizardPage"; //$NON-NLS-1$
-	
-	public static final int EXTERN = 0;
-	public static final int VALUE = 1;
-	public static final int KEY = 2;
-	private static final int SIZE = 3; // column counter
-	private static final String[] TABLE_PROPERTIES = new String[SIZE];
-	private static final String[] TABLE_COLUMNS = new String[SIZE];
-	
-	static {
-		TABLE_PROPERTIES[EXTERN] = "extern"; //$NON-NLS-1$
-		TABLE_PROPERTIES[VALUE] = "value"; //$NON-NLS-1$
-		TABLE_PROPERTIES[KEY] = "key"; //$NON-NLS-1$
-		TABLE_COLUMNS[EXTERN] = ""; //$NON-NLS-1$
-		TABLE_COLUMNS[VALUE] = "Value"; //$NON-NLS-1$
-		TABLE_COLUMNS[KEY] = "Substitution Key"; //$NON-NLS-1$
-	}
-
-	private class ModelChangeContentProvider implements ITreeContentProvider, IContentProvider {
-		
-		public Object[] getElements(Object parent) {
-			return fModelChangeTable.getAllModelChanges().toArray();
-		}
-
-		public Object[] getChildren(Object parentElement) {
-			if (!(parentElement instanceof ModelChange))
-				return new Object[0];
-			return ((ModelChange)parentElement).getModelChangeFiles();
-		}
-
-		public Object getParent(Object element) {
-			if (element instanceof ModelChangeFile) {
-				return ((ModelChangeFile)element).getModel();
-			}
-			return null;
-		}
-
-		public boolean hasChildren(Object element) {
-			return element instanceof ModelChange;
-		}
-
-		public void dispose() {
-		}
-
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		}
-	}
-
-	private class ExternalizeStringsCellModifier implements ICellModifier {
-
-		public boolean canModify(Object element, String property) {
-			return (property != null &&
-					(element instanceof ModelChangeElement) &&
-					!TABLE_PROPERTIES[VALUE].equals(property) &&
-					(isPageComplete() || element.equals(fErrorElement)) &&
-					(TABLE_PROPERTIES[KEY].equals(property) && ((ModelChangeElement)element).isExternalized()));
-
-		}
-
-		public Object getValue(Object element, String property) {
-			if (element instanceof ModelChangeElement) {
-				ModelChangeElement changeElement = (ModelChangeElement) element;
-				if (TABLE_PROPERTIES[KEY].equals(property)) {
-					return StringHelper.unwindEscapeChars(changeElement.getKey());
-				}
-			}
-			return ""; //$NON-NLS-1$
-		}
-
-		public void modify(Object element, String property, Object value) {
-			if (element instanceof TableItem) {
-				Object data = ((TableItem) element).getData();
-				if (data instanceof ModelChangeElement) {
-					ModelChangeElement changeElement = (ModelChangeElement) data;
-					if (TABLE_PROPERTIES[KEY].equals(property)) {
-						String newKey = StringHelper.windEscapeChars((String)value);
-						validateKey(newKey, changeElement);
-						changeElement.setKey(newKey);
-						fPropertiesViewer.update(data, null);
-					}
-				}
-			}
-		}
-	}
-	
-	
-	
-	private ModelChangeTable fModelChangeTable;
-	
-	private ContainerCheckedTreeViewer fInputViewer;
-	private Button fSelectAll;
-	private Button fDeselectAll;
-	private Label fProjectLabel;
-	private Text fLocalizationText;
-	private CheckboxTableViewer fPropertiesViewer;
-	private Table fTable;
-	private SourceViewer fSourceViewer;
-	
-	private ViewerFilter fErrorElementFilter;
-	private ModifyListener fModifyListener;
-	
-	private Object fCurrSelection;
-	private ModelChangeElement fErrorElement;
-	private String fPreErrorKey;
-
-	private IDocument fEmptyDoc;
-//	private ColorManager fColorManager;
-	
-	protected ExternalizeStringsWizardPage(ModelChangeTable changeTable) {
-		super(PAGE_NAME);
-		setTitle(PDEUIMessages.ExternalizeStringsWizardPage_pageTitle);
-		setDescription(PDEUIMessages.ExternalizeStringsWizardPage_pageDescription);
-		fModelChangeTable = changeTable;
-		fErrorElementFilter = new ViewerFilter() {
-			public boolean select(Viewer viewer, Object parentElement, Object element) {
-				if (!(element instanceof ModelChangeElement))
-					return false;
-				ModelChangeElement change = (ModelChangeElement) element;
-				return change.equals(fErrorElement);
-			}
-		};
-		fModifyListener = new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				String localization = fLocalizationText.getText();
-				if (StringHelper.isValidLocalization(localization)) {
-					setEnabled(fLocalizationText, true);
-					setPageComplete(hasCheckedElements());
-					setErrorMessage(null);
-					if (fCurrSelection instanceof ModelChange) {
-						((ModelChange)fCurrSelection).setBundleLocalization(fLocalizationText.getText());
-					} else if (fCurrSelection instanceof ModelChangeFile) {
-						((ModelChangeFile)fCurrSelection).getModel().setBundleLocalization(fLocalizationText.getText());
-					}
-				} else {
-					setEnabled(fLocalizationText, false);
-					setPageComplete(false);
-					setErrorMessage(PDEUIMessages.ExternalizeStringsWizardPage_badLocalizationError);
-				}
-			}
-		};
-	}
-	
-//	public void dispose() {
-//		if (fColorManager != null)
-//			fColorManager.dispose();
-//		super.dispose();
-//	}
-	
-	public void createControl(Composite parent) {
-
-		SashForm superSash = new SashForm(parent, SWT.HORIZONTAL);
-		superSash.setFont(parent.getFont());
-		superSash.setLayoutData(new GridData(GridData.FILL_BOTH));
-		
-		createInputContents(superSash);
-		
-		SashForm sash = new SashForm(superSash, SWT.VERTICAL);
-		sash.setFont(superSash.getFont());
-		sash.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		createTableViewer(sash);
-		createSourceViewer(sash);
-		
-		setPageComplete(hasCheckedElements());
-		
-		superSash.setWeights(new int[] {4,7});
-		setControl(superSash);
-		Dialog.applyDialogFont(superSash);
-
-		// TODO ADD HELP
-//		PlatformUI.getWorkbench().getHelpSystem().setHelp(superSash, IHelpContextIds.UPDATE_CLASSPATH);
-	}
-
-	private void createInputContents(Composite composite) {
-		Composite fileComposite = new Composite(composite, SWT.NONE);
-		fileComposite.setLayout(new GridLayout());
-		fileComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		Label label = new Label(fileComposite, SWT.NONE);
-		label.setText(PDEUIMessages.ExternalizeStringsWizardPage_resourcelabel);
-		fInputViewer = new ContainerCheckedTreeViewer(fileComposite, SWT.V_SCROLL | SWT.H_SCROLL | SWT.SINGLE | SWT.BORDER);
-		fInputViewer.setContentProvider(new ModelChangeContentProvider());
-		fInputViewer.setLabelProvider(new ModelChangeLabelProvider());
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.heightHint = 250;
-		fInputViewer.getTree().setLayoutData(gd);
-		fInputViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				handleSelectionChanged(event);
-			}
-		});
-		fInputViewer.addCheckStateListener(new ICheckStateListener() {
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				setPageComplete(hasCheckedElements());
-			}
-		});
-		
-		Composite buttonComposite = new Composite(fileComposite, SWT.NONE);
-		GridLayout layout = new GridLayout(2, true);
-		layout.marginHeight = layout.marginWidth = 0;
-		buttonComposite.setLayout(layout);
-		buttonComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		fSelectAll = new Button(buttonComposite, SWT.PUSH);
-		fSelectAll.setText(PDEUIMessages.ExternalizeStringsWizardPage_selectAllButton);
-		fSelectAll.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fSelectAll.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				fInputViewer.setCheckedElements(fModelChangeTable.getAllModelChanges().toArray());
-				setPageComplete(hasCheckedElements());
-			}
-		});
-		fDeselectAll = new Button(buttonComposite, SWT.PUSH);
-		fDeselectAll.setText(PDEUIMessages.ExternalizeStringsWizardPage_deselectAllButton);
-		fDeselectAll.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fDeselectAll.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				fInputViewer.setCheckedElements(new Object[0]);
-				setPageComplete(hasCheckedElements());
-			}
-		});
-		
-		Composite infoComposite = new Composite(fileComposite, SWT.NONE);
-		layout = new GridLayout();
-		layout.marginHeight = 0;
-		infoComposite.setLayout(layout);
-		infoComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		Label project = new Label(infoComposite, SWT.NONE);
-		project.setText(PDEUIMessages.ExternalizeStringsWizardPage_projectLabel);
-		fProjectLabel = new Label(infoComposite, SWT.NONE);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalIndent = 10;
-		fProjectLabel.setLayoutData(gd);
-		fProjectLabel.setText(PDEUIMessages.ExternalizeStringsWizardPage_noUnderlyingResource);
-		
-		Label properties = new Label(infoComposite, SWT.NONE);
-		properties.setText(PDEUIMessages.ExternalizeStringsWizardPage_localizationLabel);
-		fLocalizationText = new Text(infoComposite, SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalIndent = 10;
-		fLocalizationText.setLayoutData(gd);
-		fLocalizationText.setText(PDEUIMessages.ExternalizeStringsWizardPage_noUnderlyingResource);
-		fLocalizationText.addModifyListener(fModifyListener);
-		
-		fInputViewer.setInput(PDEPlugin.getDefault());
-		fInputViewer.setCheckedElements(fModelChangeTable.getPreSelected());
-	}
-
-	private void createTableViewer(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setFont(parent.getFont());
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		composite.setLayout(new GridLayout());
-				
-		Label label = new Label(composite, SWT.NONE);
-		label.setText(PDEUIMessages.ExternalizeStringsWizardPage_propertiesLabel); 
-		label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		fPropertiesViewer = CheckboxTableViewer.newCheckList(composite, 
-				SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION | SWT.HIDE_SELECTION | SWT.BORDER);
-		fTable = fPropertiesViewer.getTable();
-		fTable.setFont(composite.getFont());
-		fTable.setLayoutData(new GridData(GridData.FILL_BOTH));
-		fTable.setLayout(new GridLayout());
-		fTable.setLinesVisible(true);
-		fTable.setHeaderVisible(true);
-
-		for (int i= 0; i < TABLE_COLUMNS.length; i++) {
-			TableColumn tc = new TableColumn(fTable, SWT.NONE);
-			tc.setText(TABLE_COLUMNS[i]);
-			tc.setResizable(i != 0);
-			tc.setWidth(i == 0 ? 20 : 200);
-		}
-		
-		fPropertiesViewer.setUseHashlookup(true);
-		fPropertiesViewer.setCellEditors(createCellEditors());
-		fPropertiesViewer.setColumnProperties(TABLE_PROPERTIES);
-		fPropertiesViewer.setCellModifier(new ExternalizeStringsCellModifier());
-		fPropertiesViewer.setContentProvider(new IStructuredContentProvider() {
-			public Object[] getElements(Object inputElement) {
-				if (fInputViewer.getSelection() instanceof IStructuredSelection) {
-					Object selection = ((IStructuredSelection)fInputViewer.getSelection()).getFirstElement();
-					if (selection instanceof ModelChangeFile) {
-						ModelChangeFile cf = (ModelChangeFile)selection;
-						return (cf).getModel().getChangesInFile(cf.getFile()).toArray();
-					}
-				}
-				return new Object[0];
-			}
-			public void dispose() {
-			}
-			public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-			}
-		});
-		fPropertiesViewer.setLabelProvider(new ExternalizeStringsLabelProvider());
-		fPropertiesViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				handlePropertySelection();
-			}
-		});
-		fPropertiesViewer.addCheckStateListener(new ICheckStateListener() {
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				Object element = event.getElement();
-				if (element instanceof ModelChangeElement) {
-					((ModelChangeElement)element).setExternalized(event.getChecked());
-					fPropertiesViewer.update(element, null);
-				}
-			}
-		});
-		fPropertiesViewer.setInput(new Object());
-	}
-
-	private void createSourceViewer(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		composite.setLayout(new GridLayout());
-
-		Label label = new Label(composite, SWT.NONE);
-		label.setText(PDEUIMessages.ExternalizeStringsWizardPage_sourceLabel);
-		label.setLayoutData(new GridData());
-
-		fSourceViewer = new SourceViewer(composite, null, SWT.V_SCROLL | SWT.H_SCROLL | SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION);
-		fSourceViewer.getControl().setFont(JFaceResources.getTextFont());
-		fSourceViewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
-		fSourceViewer.setEditable(false);
-		
-		fEmptyDoc = new Document();
-		fSourceViewer.setDocument(fEmptyDoc);
-	}
-	
-	private void handleSelectionChanged(SelectionChangedEvent event) {
-		if (!(event.getSelection() instanceof IStructuredSelection))
-			return;
-		Object selection = (((IStructuredSelection)event.getSelection()).getFirstElement());
-		if (selection == null) {
-			fCurrSelection = null;
-			fSourceViewer.setDocument(fEmptyDoc);
-		} else if (selection.equals(fCurrSelection)) {
-			return;
-		} else if (selection instanceof ModelChangeFile) {
-			fCurrSelection = selection;
-			IFile file = ((ModelChangeFile)fCurrSelection).getFile();
-			NullProgressMonitor monitor = new NullProgressMonitor();
-			ITextFileBufferManager manager = FileBuffers.getTextFileBufferManager();
-			try {
-				try {
-					manager.connect(file.getFullPath(), monitor);
-					updateSourceViewer(manager, file);
-				} catch (MalformedTreeException e) {
-				} finally {
-					manager.disconnect(file.getFullPath(), monitor);
-				}
-			} catch (CoreException e) {
-			}
-		} else if (selection instanceof ModelChange) {
-			fCurrSelection = selection;
-			fSourceViewer.setDocument(fEmptyDoc);
-			updatePropertiesLabel(((ModelChange)fCurrSelection).getParentModel());
-		}
-		refreshPropertiesViewer(false);
-	}
-	
-	private void refreshPropertiesViewer(boolean updateLabels) {
-		fPropertiesViewer.refresh(updateLabels);
-		TableItem[] items = fTable.getItems();
-		for (int i = 0; i < items.length; i++) {
-			if (!(items[i].getData() instanceof ModelChangeElement)) continue;
-			ModelChangeElement element = (ModelChangeElement)items[i].getData();
-			fPropertiesViewer.setChecked(element, element.isExternalized());
-		}
-	}
-	
-	private void updateSourceViewer(ITextFileBufferManager manager, IFile sourceFile) {
-		IDocument document = manager.getTextFileBuffer(sourceFile.getFullPath()).getDocument();
-		TreeItem item = fInputViewer.getTree().getSelection()[0];
-		IPluginModelBase model = ((ModelChange)item.getParentItem().getData()).getParentModel();
-		
-//		if (fSourceViewer.getDocument() != null && !fSourceViewer.getDocument().equals(fEmptyDoc))
-//			fSourceViewer.unconfigure();
-//		if (sourceFile.getFileExtension().equalsIgnoreCase("xml")) { //$NON-NLS-1$
-//			if (fColorManager != null) {
-//				fColorManager.dispose();
-//			}
-//			fColorManager = new ColorManager();
-//			fSourceViewer.configure(new XMLConfiguration(fColorManager));
-//		}
-		
-		fSourceViewer.setDocument(document);
-		updatePropertiesLabel(model);
-	}
-	
-	
-	private void updatePropertiesLabel(IPluginModelBase model) {
-		ModelChange modelChange = fModelChangeTable.getModelChange(model);
-		fProjectLabel.setText(model.getBundleDescription().getName());
-		fLocalizationText.setEditable(!modelChange.localizationSet());
-		fLocalizationText.setText(modelChange.getBundleLocalization());
-	}
-	
-	private void handlePropertySelection() {
-		if (!(fPropertiesViewer.getSelection() instanceof IStructuredSelection)) return;
-		Object selection = (((IStructuredSelection)fPropertiesViewer.getSelection()).getFirstElement());
-		if (selection instanceof ModelChangeElement && fSourceViewer.getDocument() != null) {
-			ModelChangeElement element = (ModelChangeElement) selection;
-			int offset = element.getOffset();
-			int length = element.getLength();
-			fSourceViewer.setSelectedRange(offset, length);
-			fSourceViewer.revealRange(offset, length);
-		}
-	}
-	
-	private CellEditor[] createCellEditors() {
-		final CellEditor editors[] = new CellEditor[SIZE];
-		editors[EXTERN] = null;
-		editors[VALUE] = null;
-		editors[KEY] = new TextCellEditor(fTable);
-		return editors;
-	}
-
-	private void validateKey(String key, ModelChangeElement element) {
-		ModelChange modelChange = ((ModelChangeFile)fCurrSelection).getModel();
-		Properties properties = modelChange.getProperties();
-		String error = null;
-		String oldKey = (fPreErrorKey != null) ? fPreErrorKey : element.getKey();
-		if (key.equals(fPreErrorKey)) {
-			error = null;
-		} else if (key.trim().length() < 1) {
-			error = getErrorMessage(PDEUIMessages.ExternalizeStringsWizardPage_keyEmptyError, oldKey);
-		} else if (key.charAt(0) == '#' || key.charAt(0) == '!' || key.charAt(0) == '%') {
-			error = getErrorMessage(PDEUIMessages.ExternalizeStringsWizardPage_keyCommentError, oldKey);
-		} else if ((key.indexOf(":") != -1 && key.indexOf("\\:") == -1) || //$NON-NLS-1$ //$NON-NLS-2$
-				   (key.indexOf("=") != -1 && key.indexOf("\\=") == -1) || //$NON-NLS-1$ //$NON-NLS-2$
-				    key.indexOf(" ") != -1) { //$NON-NLS-1$
-			error = getErrorMessage(PDEUIMessages.ExternalizeStringsWizardPage_keyError, oldKey);
-		} else if ((!key.equals(oldKey) || fPreErrorKey != null) &&
-				properties.containsKey(key)) {
-			error = getErrorMessage(PDEUIMessages.ExternalizeStringsWizardPage_keyDuplicateError, oldKey);
-		}
-
-		setErrorMessage(error);
-		setPageComplete(error == null && hasCheckedElements());
-		if (error == null) {
-			fErrorElement = null;
-			fPreErrorKey = null;
-			setEnabled(fPropertiesViewer.getControl(), true);
-			fPropertiesViewer.removeFilter(fErrorElementFilter);
-			refreshPropertiesViewer(true);
-			properties.setProperty(key, element.getValue());
-		} else if (fPreErrorKey == null) {
-			fErrorElement = element;
-			fPreErrorKey = oldKey;
-			setEnabled(fPropertiesViewer.getControl(), false);
-			fPropertiesViewer.addFilter(fErrorElementFilter);
-		}
-	}
-	
-	private String getErrorMessage(String error, String suggestion) {
-		StringBuffer sb = new StringBuffer(error);
-		if (suggestion != null) {
-			sb.append(PDEUIMessages.ExternalizeStringsWizardPage_keySuggested);
-			sb.append(suggestion);
-		}
-		return sb.toString();
-	}
-	
-	public Object[] getChangeFiles() {
-		return fInputViewer.getCheckedElements();
-	}
-    
-    private boolean hasCheckedElements() {
-    	return fInputViewer.getCheckedElements().length > 0;
-    }
-    
-    private void setEnabled(Control exception, boolean enabled) {
-    	if (!exception.equals(fInputViewer.getControl()))
-    		fInputViewer.getControl().setEnabled(enabled);
-    	if (!exception.equals(fPropertiesViewer.getControl()))
-    		fPropertiesViewer.getControl().setEnabled(enabled);
-    	if (!exception.equals(fLocalizationText))
-    		fLocalizationText.setEnabled(enabled);
-    	if (!exception.equals(fSelectAll))
-    		fSelectAll.setEnabled(enabled);
-    	if (!exception.equals(fDeselectAll))
-    		fDeselectAll.setEnabled(enabled);
-    }
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/GetNonExternalizedStringsAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/GetNonExternalizedStringsAction.java
deleted file mode 100644
index e2a1496..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/GetNonExternalizedStringsAction.java
+++ /dev/null

@@ -1,61 +0,0 @@
-package org.eclipse.pde.internal.ui.nls;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.PlatformUI;
-
-public class GetNonExternalizedStringsAction 
-		implements IWorkbenchWindowActionDelegate {
-
-	private ISelection fSelection;
-	
-
-	public GetNonExternalizedStringsAction() {
-	}
-
-	public void run(IAction action) {
-		GetNonExternalizedStringsOperation runnable = new GetNonExternalizedStringsOperation(fSelection);
-		try {
-			PlatformUI.getWorkbench().getProgressService().busyCursorWhile(runnable);
-		} catch (InvocationTargetException e) {
-		} catch (InterruptedException e) {
-		} finally {
-			if (runnable.wasCanceled()) 
-				return;
-			ModelChangeTable changeTable = runnable.getChangeTable();
-			if (!changeTable.isEmpty()) {
-				ExternalizeStringsWizard wizard = new ExternalizeStringsWizard(changeTable);
-				final WizardDialog dialog = new WizardDialog(PDEPlugin
-						.getActiveWorkbenchShell(), wizard);
-				BusyIndicator.showWhile(PDEPlugin.getActiveWorkbenchShell()
-						.getDisplay(), new Runnable() {
-					public void run() {
-						dialog.open();
-					}
-				});
-			} else
-				MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), 
-						PDEUIMessages.GetNonExternalizedStringsAction_allExternalizedTitle, 
-						PDEUIMessages.GetNonExternalizedStringsAction_allExternalizedMessage);
-		}
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		fSelection = selection;
-	}
-
-	public void dispose() {
-	}
-
-	public void init(IWorkbenchWindow window) {
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/GetNonExternalizedStringsOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/GetNonExternalizedStringsOperation.java
deleted file mode 100644
index 6a545c3..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/GetNonExternalizedStringsOperation.java
+++ /dev/null

@@ -1,246 +0,0 @@
-package org.eclipse.pde.internal.ui.nls;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.pde.core.IModel;
-import org.eclipse.pde.core.plugin.IPluginAttribute;
-import org.eclipse.pde.core.plugin.IPluginElement;
-import org.eclipse.pde.core.plugin.IPluginExtension;
-import org.eclipse.pde.core.plugin.IPluginExtensionPoint;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.core.plugin.IPluginObject;
-import org.eclipse.pde.core.plugin.IPluginParent;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.PluginModelManager;
-import org.eclipse.pde.internal.core.WorkspaceModelManager;
-import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelBase;
-import org.eclipse.pde.internal.core.ischema.ISchema;
-import org.eclipse.pde.internal.core.ischema.ISchemaAttribute;
-import org.eclipse.pde.internal.core.ischema.ISchemaElement;
-import org.eclipse.pde.internal.core.schema.SchemaRegistry;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.model.bundle.Bundle;
-import org.eclipse.pde.internal.ui.model.bundle.BundleModel;
-import org.eclipse.pde.internal.ui.model.bundle.ManifestHeader;
-import org.eclipse.pde.internal.ui.model.plugin.FragmentModel;
-import org.eclipse.pde.internal.ui.model.plugin.PluginModel;
-import org.eclipse.pde.internal.ui.model.plugin.PluginModelBase;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.osgi.framework.Constants;
-
-public class GetNonExternalizedStringsOperation 
-		implements IRunnableWithProgress {
-
-	public static final String MANIFEST_LOCATION = 
-		"META-INF/MANIFEST.MF"; //$NON-NLS-1$
-	private static final String[] PLUGIN_XML_FILES = 
-		new String[] {"plugin.xml", "fragment.xml"}; //$NON-NLS-1$ //$NON-NLS-2$
-	
-	private ISelection fSelection;
-	private ArrayList fSelectedModels;
-	private ModelChangeTable fModelChangeTable;
-	private boolean fCanceled;
-	
-	public GetNonExternalizedStringsOperation(ISelection selection) {
-		fSelection = selection;
-	}
-
-	public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-		
-		if (fSelection instanceof IStructuredSelection) {
-			Object[] elems = ((IStructuredSelection) fSelection).toArray();
-			fSelectedModels = new ArrayList(elems.length);
-			PluginModelManager manager = PDECore.getDefault().getModelManager();
-			for (int i = 0; i < elems.length; i++) {
-				IProject project = null;
-				if (elems[i] instanceof IFile) {
-					IFile file = (IFile) elems[i];
-					project = file.getProject();
-				} else if (elems[i] instanceof IProject) {
-					project = (IProject) elems[i];
-				}
-				if (project != null
-						&& !WorkspaceModelManager.isBinaryPluginProject(project)) {
-					IPluginModelBase model = manager.findModel(project);
-					if (model != null) {
-						fSelectedModels.add(model);
-					}
-				}
-			}
-		
-			fModelChangeTable = new ModelChangeTable();
-			
-			IPluginModelBase[] pluginModels = PDECore.getDefault().getModelManager().getWorkspaceModels();
-			monitor.beginTask(PDEUIMessages.GetNonExternalizedStringsOperation_taskMessage, pluginModels.length);
-			for (int i = 0; i < pluginModels.length; i++) {
-				IProject project = pluginModels[i].getUnderlyingResource().getProject();
-				if (!WorkspaceModelManager.isBinaryPluginProject(project) && !fCanceled) {
-					getUnExternalizedStrings(project, new SubProgressMonitor(monitor, 1) , pluginModels[i]);
-				}
-			}
-			
-		}
-	}
-	
-	private void getUnExternalizedStrings(IProject project, IProgressMonitor monitor, IModel model) {
-		// check manifest
-		if (model instanceof IBundlePluginModelBase) {
-			try {
-				inspectManifest(project, (IBundlePluginModelBase)model, monitor);
-			} catch (CoreException e) {}
-		}
-		if (model instanceof IPluginModelBase) {
-			String[] xmlFiles = PLUGIN_XML_FILES;
-			for (int i = 0; i < xmlFiles.length && !fCanceled; i++) {
-				IResource member = project.findMember(xmlFiles[i]);
-				try {
-					inspectXML(project, member, (IPluginModelBase)model, monitor);
-				} catch (CoreException e) {}
-			}
-		}
-		monitor.done();
-	}
-	
-	private void inspectManifest(IProject project, IBundlePluginModelBase model, IProgressMonitor monitor) throws CoreException {
-		try {
-			if (!ModelChange.modelLoaded(model)) return;
-			IFile manifestFile = null;
-			if (isNotTranslated(model.getBundleModel().getBundle().getHeader(Constants.BUNDLE_NAME))) {
-				manifestFile = getManifestFile(project);
-				if (manifestFile != null) {
-					ManifestHeader header = inspectHeader(project, manifestFile, Constants.BUNDLE_NAME, monitor);
-					if (header != null)
-						fModelChangeTable.addToChangeTable(model, manifestFile, header, fSelectedModels.contains(model));
-				}
-			}
-			if (isNotTranslated(model.getBundleModel().getBundle().getHeader(Constants.BUNDLE_VENDOR))) {
-				if (manifestFile == null) manifestFile = getManifestFile(project);
-				if (manifestFile != null) {
-					ManifestHeader header = inspectHeader(project, manifestFile, Constants.BUNDLE_VENDOR, monitor);
-					if (header != null)
-						fModelChangeTable.addToChangeTable(model, manifestFile, header, fSelectedModels.contains(model));
-				}
-			}
-		} catch (MalformedTreeException e) {
-		}
-	}
-	
-	private IFile getManifestFile(IProject project) {
-		IResource member = project.findMember(MANIFEST_LOCATION);
-		if ((member instanceof IFile))
-			return (IFile)member;
-		return null;
-	}
-	
-	private ManifestHeader inspectHeader(IProject project, IFile file, String headerName, IProgressMonitor monitor) throws CoreException {
-		ManifestHeader header = null;
-		ITextFileBufferManager manager = FileBuffers.getTextFileBufferManager();
-		try {
-			manager.connect(file.getFullPath(), monitor);
-			IDocument document = manager.getTextFileBuffer(file.getFullPath()).getDocument();		
-			BundleModel model = new BundleModel(document, false);
-			Bundle bundle = null;
-			if (ModelChange.modelLoaded(model)) bundle = (Bundle)model.getBundle();
-			if (bundle != null) {
-				header = bundle.getManifestHeader(headerName);
-			}
-		} catch (MalformedTreeException e) {
-		} finally {
-			manager.disconnect(file.getFullPath(), monitor);
-		}
-		return header;
-	}
-	
-	
-	
-	private void inspectXML(IProject project, IResource resource, IPluginModelBase model, IProgressMonitor monitor) throws CoreException {
-		if (resource == null) return;
-		if (!(resource instanceof IFile)) return;
-		IFile file = (IFile)resource;
-		ITextFileBufferManager manager = FileBuffers.getTextFileBufferManager();
-		try {
-			manager.connect(file.getFullPath(), monitor);
-			ITextFileBuffer buffer = manager.getTextFileBuffer(file.getFullPath());
-			IDocument document = buffer.getDocument();
-			PluginModelBase loadModel;
-			if ("fragment.xml".equals(file.getName())) //$NON-NLS-1$
-				loadModel = new FragmentModel(document, false);
-			else
-				loadModel = new PluginModel(document, false);
-
-			if (!ModelChange.modelLoaded(loadModel)) return;			
-			IPluginExtensionPoint[] points = loadModel.getPluginBase().getExtensionPoints();
-			for (int i = 0; i < points.length; i++) {
-				if (isNotTranslated(points[i].getName()))
-					fModelChangeTable.addToChangeTable(model, file, points[i], fSelectedModels.contains(model));
-			}
-			SchemaRegistry registry = PDECore.getDefault().getSchemaRegistry();
-			IPluginExtension[] extensions = loadModel.getPluginBase().getExtensions();
-			for (int i = 0; i < extensions.length; i++) {
-				if (monitor.isCanceled()) {
-					fCanceled = true;
-					return;
-				}
-				ISchema schema = registry.getSchema(extensions[i].getPoint());
-				if (schema != null)
-					inspectExtension(schema, extensions[i], loadModel, model, file);
-			}
-		} finally {
-			manager.disconnect(file.getFullPath(), monitor);
-		}
-	}
-	
-	
-	private void inspectExtension(ISchema schema, IPluginParent parent, PluginModelBase model, IPluginModelBase memModel, IFile file) {
-		IPluginObject[] children = parent.getChildren();
-		for (int i = 0; i < children.length; i++) {
-			IPluginElement child = (IPluginElement)children[i];
-			ISchemaElement schemaElement = schema.findElement(child.getName());
-			if (schemaElement != null) {
-				if (schemaElement.hasTranslatableContent())
-					if (isNotTranslated(child.getText()))
-						fModelChangeTable.addToChangeTable(memModel, file, child, fSelectedModels.contains(memModel));
-				
-				IPluginAttribute[] attributes = child.getAttributes();
-				for (int j = 0; j < attributes.length; j++) {
-					IPluginAttribute attr = attributes[j];
-					ISchemaAttribute attInfo = schemaElement.getAttribute(attr.getName());
-					if (attInfo != null && attInfo.isTranslatable()) 
-						if (isNotTranslated(attr.getValue()))
-							fModelChangeTable.addToChangeTable(memModel, file, attr, fSelectedModels.contains(memModel));	
-					
-				}
-			}
-			inspectExtension(schema, child, model, memModel, file);
-		}
-	}
-	
-	private boolean isNotTranslated(String value) {
-		if (value != null && value.length() > 0)
-			return (value == null || value.length() == 0 || value.charAt(0) != '%' ||
-				(value.charAt(0) == '%' && value.length() == 1));
-		return false;
-	}
-
-	protected ModelChangeTable getChangeTable() {
-		return fModelChangeTable;
-	}
-	protected boolean wasCanceled() {
-		return fCanceled;
-	}
-}
-

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChange.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChange.java
deleted file mode 100644
index d85acc2..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChange.java
+++ /dev/null

@@ -1,156 +0,0 @@
-package org.eclipse.pde.internal.ui.nls;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Properties;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.pde.core.IModel;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.PDEManager;
-import org.eclipse.pde.internal.ui.elements.DefaultElement;
-
-
-public class ModelChange extends DefaultElement {
-	
-	private static final String DEFAULT_LOCALIZATION_PREFIX = "plugin"; //$NON-NLS-1$
-	public static final String LOCALIZATION_FILE_SUFFIX = ".properties"; //$NON-NLS-1$
-	
-	private ModelChangeFile fXMLCoupling;
-	private ModelChangeFile fMFCoupling;
-	
-	private IPluginModelBase fParent;
-	private boolean fPreSelected;
-	
-	private String fBundleLocalization;
-	private IFile fPropertiesFile;
-	private Properties fProperties;
-	
-	protected static boolean modelLoaded(IModel model) {
-		try {
-			model.load();
-		} catch (CoreException e) {
-		}
-		return (model.isLoaded());
-	}
-	
-	public ModelChange(IPluginModelBase parent, boolean preSelected) {
-		fParent = parent;
-		fPreSelected = preSelected;
-		fBundleLocalization = PDEManager.getBundleLocalization(fParent);
-		if (fBundleLocalization == null)
-			fBundleLocalization = DEFAULT_LOCALIZATION_PREFIX;
-	}
-	
-	public void addChange(IFile file, ModelChangeElement change) {
-		if (change == null || file == null)
-			return;
-		String ext = file.getFileExtension();
-		if (ext.equalsIgnoreCase("xml")) //$NON-NLS-1$
-			addXMLChange(file, change);
-		else if (ext.equalsIgnoreCase("MF")) //$NON-NLS-1$
-			addMFChange(file, change);
-		else
-			return;
-	}
-	
-	private void addXMLChange(IFile file, ModelChangeElement change) {
-		if (fXMLCoupling == null) {
-			fXMLCoupling = new ModelChangeFile(file, this);
-		}
-		if (!fXMLCoupling.getFile().equals(file)) {
-			return;
-		}
-		fXMLCoupling.add(change);
-	}
-	
-	private void addMFChange(IFile file, ModelChangeElement change) {
-		if (fMFCoupling == null) {
-			fMFCoupling = new ModelChangeFile(file, this);
-		}
-		fMFCoupling.add(change);
-	}
-	
-	public IFile[] getChangeFiles() {
-		IFile xmlFile = fXMLCoupling != null ? fXMLCoupling.getFile() : null;
-		IFile mfFile = fMFCoupling != null ? fMFCoupling.getFile() : null;
-		if (xmlFile != null && mfFile != null)
-			return new IFile[] {xmlFile, mfFile};
-		if (xmlFile != null)
-			return new IFile[] {xmlFile};
-		if (mfFile != null)
-			return new IFile[] {mfFile};
-		return new IFile[0];
-	}
-	
-	public IFile getPropertiesFile() {
-		IProject project = fParent.getUnderlyingResource().getProject();
-		if (fBundleLocalization.indexOf(LOCALIZATION_FILE_SUFFIX) == -1)
-			fPropertiesFile = project.getFile(fBundleLocalization + LOCALIZATION_FILE_SUFFIX);
-		else
-			fPropertiesFile = project.getFile(fBundleLocalization);
-		return fPropertiesFile;
-	}
-	
-	public Properties getProperties() {
-		if (fPropertiesFile == null)
-			getPropertiesFile();
-		if (fProperties == null) {
-			try {
-				fProperties = new Properties();
-				if (fPropertiesFile != null && fPropertiesFile.exists())
-					fProperties.load(fPropertiesFile.getContents());
-			} catch (CoreException e) {
-			} catch (IOException e) {
-			}
-		}
-		return fProperties;
-	}
-	
-	public ArrayList getChangesInFile(IFile file) {
-		if (fXMLCoupling != null && file == fXMLCoupling.getFile())
-			return fXMLCoupling.getChanges();
-		if (fMFCoupling != null && file == fMFCoupling.getFile())
-			return fMFCoupling.getChanges();
-		return null;
-	}
-	
-	public int getNumberOfChangesInFile(IFile file) {
-		if (fXMLCoupling != null && file == fXMLCoupling.getFile())
-			return fXMLCoupling.getNumChanges();
-		if (fMFCoupling != null && file == fMFCoupling.getFile())
-			return fMFCoupling.getNumChanges();
-		return 0;
-	}
-	
-	public boolean wasPreSelected() {
-		return fPreSelected;
-	}
-	
-	public IPluginModelBase getParentModel() {
-		return fParent;
-	}
-
-	public ModelChangeFile[] getModelChangeFiles() {
-		if (fXMLCoupling != null && fMFCoupling != null)
-			return new ModelChangeFile[] {fXMLCoupling, fMFCoupling};
-		if (fXMLCoupling != null)
-			return new ModelChangeFile[] {fXMLCoupling};
-		if (fMFCoupling != null)
-			return new ModelChangeFile[] {fMFCoupling};
-		return new ModelChangeFile[0];
-	}
-	
-	public void setBundleLocalization(String bundleLocalization) {
-		fBundleLocalization = bundleLocalization;
-	}
-	public String getBundleLocalization() {
-		return fBundleLocalization;
-	}
-	
-	public boolean localizationSet() {
-		return PDEManager.getBundleLocalization(fParent) != null;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChangeElement.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChangeElement.java
deleted file mode 100644
index 5f55b59..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChangeElement.java
+++ /dev/null

@@ -1,101 +0,0 @@
-package org.eclipse.pde.internal.ui.nls;
-
-import java.util.Properties;
-
-import org.eclipse.pde.core.plugin.IFragmentModel;
-import org.eclipse.pde.internal.core.util.CoreUtility;
-import org.eclipse.pde.internal.ui.model.IDocumentAttribute;
-import org.eclipse.pde.internal.ui.model.IDocumentTextNode;
-import org.eclipse.pde.internal.ui.model.bundle.ManifestHeader;
-import org.eclipse.pde.internal.ui.model.plugin.PluginAttribute;
-import org.eclipse.pde.internal.ui.model.plugin.PluginElementNode;
-import org.eclipse.pde.internal.ui.model.plugin.PluginExtensionPointNode;
-
-public class ModelChangeElement {
-	
-	private static final String DELIM = "."; //$NON-NLS-1$
-	private static final String KEY_PREFIX = "%"; //$NON-NLS-1$
-	private static final String FRAGMENT_PREFIX = "f"; //$NON-NLS-1$
-	
-	private String fValue = ""; //$NON-NLS-1$
-	private String fKey = ""; //$NON-NLS-1$
-	private int fOffset = 0;
-	private int fLength = 0;
-	private boolean fExternalized = true;
-	private ModelChange fParent;
-	
-	public ModelChangeElement(ModelChange parent, Object incoming) {
-		fParent = parent;
-		if (incoming instanceof PluginElementNode) {
-			PluginElementNode elem = (PluginElementNode)incoming;
-			IDocumentTextNode text = elem.getTextNode();
-			fValue = elem.getText();
-			generateValidKey(elem.getParent().getName(), elem.getName());
-			fOffset = text.getOffset();
-			fLength = text.getLength();
-		} else if (incoming instanceof PluginAttribute) {
-			PluginAttribute attr = (PluginAttribute)incoming;
-			fValue = CoreUtility.getWritableString(attr.getValue());
-			generateValidKey(attr.getEnclosingElement().getXMLTagName(), attr.getName());
-			fOffset = attr.getValueOffset();
-			fLength = attr.getValueLength();
-		} else if (incoming instanceof PluginExtensionPointNode) {
-			PluginExtensionPointNode extP = (PluginExtensionPointNode)incoming;
-			fValue = extP.getName();
-			generateValidKey("extension-point", "name"); //$NON-NLS-1$ //$NON-NLS-2$
-			IDocumentAttribute attr = extP.getDocumentAttribute("name"); //$NON-NLS-1$
-			fOffset = attr.getValueOffset();
-			fLength = attr.getValueLength();
-		} else if (incoming instanceof ManifestHeader) {
-			ManifestHeader header = (ManifestHeader)incoming;
-			fValue = header.getValue();
-			generateValidKey(header.getName());
-			fLength = fValue.length();
-			fOffset = header.getOffset() + header.getLength() - header.getLineLimiter().length() - fLength;
-		} 
-	}
-	
-	public String getKey() {
-		return fKey;
-	}
-	public void setKey(String key) {
-		fKey = key;
-	}
-	public String getValue() {
-		return fValue;
-	}
-	public void setValue(String value) {
-		fValue = value;
-	}
-	public boolean isExternalized() {
-		return fExternalized;
-	}
-	public void setExternalized(boolean externalzied) {
-		fExternalized = externalzied;
-	}
-	public int getOffset() {
-		return fOffset;
-	}
-	public int getLength() {
-		return fLength;
-	}
-	
-	private void generateValidKey(String pre, String mid) {
-		generateValidKey(pre + DELIM + mid);
-	}
-
-	private void generateValidKey(String key) {
-		int suffix = 0;
-		Properties properties = fParent.getProperties();
-		String newKey = fParent.getParentModel() instanceof IFragmentModel ?
-				key + DELIM + FRAGMENT_PREFIX  :
-				key + DELIM;
-		while (properties.containsKey(newKey + suffix))
-			suffix += 1;
-		properties.setProperty(newKey + suffix, fValue);
-		fKey = newKey + suffix;
-	}
-	public String getExternKey() {
-		return KEY_PREFIX + fKey;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChangeFile.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChangeFile.java
deleted file mode 100644
index 0735373..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChangeFile.java
+++ /dev/null

@@ -1,32 +0,0 @@
-package org.eclipse.pde.internal.ui.nls;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IFile;
-
-public class ModelChangeFile {
-	private IFile fFile;
-	private ModelChange fModel;
-	private ArrayList fChanges = new ArrayList();
-	private int fNumChanges = 0;
-	protected ModelChangeFile (IFile file, ModelChange model) {
-		fFile = file;
-		fModel = model;
-	}
-	protected IFile getFile() {
-		return fFile;
-	}
-	protected ModelChange getModel() {
-		return fModel;
-	}
-	protected void add(ModelChangeElement element) {
-		if (fChanges.add(element))
-			fNumChanges += 1;
-	}
-	protected int getNumChanges() {
-		return fNumChanges;
-	}
-	protected ArrayList getChanges() {
-		return fChanges;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChangeLabelProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChangeLabelProvider.java
deleted file mode 100644
index 9372e97..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChangeLabelProvider.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.nls;
-
-import org.eclipse.pde.core.plugin.IFragmentModel;
-import org.eclipse.pde.core.plugin.IPluginModel;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.ui.PDELabelProvider;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.swt.graphics.Image;
-
-public class ModelChangeLabelProvider extends PDELabelProvider {
-	
-	private Image manifestImage;
-	private Image xmlImage;
-	
-	public ModelChangeLabelProvider() {
-		xmlImage = PDEPluginImages.DESC_PLUGIN_MF_OBJ.createImage();
-		manifestImage = PDEPluginImages.DESC_PAGE_OBJ.createImage();
-	}
-	
-	public String getText(Object obj) {
-		if (obj instanceof ModelChange)
-			return getObjectText(((ModelChange) obj).getParentModel().getPluginBase());
-		if (obj instanceof ModelChangeFile)
-			return getObjectText((ModelChangeFile)obj);
-		return super.getText(obj);
-	}
-	
-	private String getObjectText(ModelChangeFile pair) {
-		StringBuffer text = new StringBuffer(pair.getFile().getName());
-		int count = pair.getNumChanges();
-		text.append(" ["); //$NON-NLS-1$
-		text.append(count);
-		if (count == 1)
-			text.append(PDEUIMessages.ModelChangeLabelProvider_instance);
-		else
-			text.append(PDEUIMessages.ModelChangeLabelProvider_instances);
-		text.append("]"); //$NON-NLS-1$
-
-		return text.toString();
-	}
-
-	public Image getImage(Object obj) {
-		if (obj instanceof ModelChange) {
-			IPluginModelBase model = ((ModelChange)obj).getParentModel();
-			if (model instanceof IPluginModel)
-				return getObjectImage(((IPluginModel) model).getPlugin(), false, false);
-			if (model instanceof IFragmentModel)
-				return getObjectImage(((IFragmentModel) model).getFragment(), false, false);
-		}
-		if (obj instanceof ModelChangeFile)
-			return getObjectImage((ModelChangeFile)obj);
-		return super.getImage(obj);
-	}
-
-	private Image getObjectImage(ModelChangeFile file) {
-		String type = file.getFile().getFileExtension();
-		if ("xml".equalsIgnoreCase(type)) //$NON-NLS-1$
-			return xmlImage;
-		if ("MF".equalsIgnoreCase(type)) //$NON-NLS-1$
-			return manifestImage;
-		return null;
-	}
-	
-	public void dispose() {
-		if (manifestImage != null)
-			manifestImage.dispose();
-		if (xmlImage != null)
-			xmlImage.dispose();
-		super.dispose();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChangeTable.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChangeTable.java
deleted file mode 100644
index 4e7d92e..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/ModelChangeTable.java
+++ /dev/null

@@ -1,50 +0,0 @@
-package org.eclipse.pde.internal.ui.nls;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Hashtable;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-
-public class ModelChangeTable {
-
-	private Hashtable fChangeTable = new Hashtable();
-	private int fTotalModelChanges = 0;
-	private ArrayList fPreSelected = new ArrayList();
-	
-	public void addToChangeTable(IPluginModelBase model, IFile file, Object change, boolean selected) {
-		if (change == null) return;
-		ModelChange modelChange;
-		if (fChangeTable.containsKey(model))
-			modelChange = (ModelChange)fChangeTable.get(model);
-		else {
-			modelChange = new ModelChange(model, selected);
-			fChangeTable.put(model, modelChange);
-			fTotalModelChanges += 1;
-			if (selected)
-				fPreSelected.add(modelChange);
-		}
-		modelChange.addChange(file, new ModelChangeElement(modelChange, change));
-	}
-	
-	public Collection getAllModelChanges() {
-		return fChangeTable.values();
-	}
-	
-	public ModelChange getModelChange(IPluginModelBase modelKey) {
-		if (fChangeTable.containsKey(modelKey))
-			return (ModelChange)fChangeTable.get(modelKey);
-		return null;
-	}
-	
-	public Object[] getPreSelected() {
-		return fPreSelected.toArray();
-	}
-	public boolean hasPreSelected() {
-		return fPreSelected.size() > 0;
-	}
-	public boolean isEmpty() {
-		return fChangeTable.size() == 0;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/StringHelper.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/StringHelper.java
deleted file mode 100644
index 1c1aa48..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/nls/StringHelper.java
+++ /dev/null

@@ -1,129 +0,0 @@
-package org.eclipse.pde.internal.ui.nls;
-
-public class StringHelper {
-	
-	protected static String preparePropertiesString(String s, char[] newLine) {
-		if (s != null) {
-			int length = s.length();
-			StringBuffer sb = new StringBuffer(length);
-			for (int i = 0; i < length; i++) {
-				char c = s.charAt(i);
-				int nlLength = newLine.length;
-				if (i + nlLength < length) {
-					boolean notNewLine = false;
-					for (int j = 0; j < nlLength; j++) {
-						if (s.charAt(i + j) != newLine[j])
-							notNewLine = true;
-					}
-					if (!notNewLine)
-						sb.append("\\"); //$NON-NLS-1$
-				}
-				sb.append(c);
-			}
-			return sb.toString();
-		}
-		return null;
-	}
-	
-	protected static String unwindEscapeChars(String s) {
-		if (s != null) {
-			int length = s.length();
-			StringBuffer sb = new StringBuffer(length);
-			for (int i = 0; i < length; i++) {
-				char c = s.charAt(i);
-				sb.append(getUnwoundString(c));
-			}
-			return sb.toString();
-		}
-		return null;
-	}
-
-	protected static String getUnwoundString(char c) {
-		switch (c) {
-			case '\b' :
-				return "\\b";//$NON-NLS-1$
-			case '\t' :
-				return "\\t";//$NON-NLS-1$
-			case '\n' :
-				return "\\n";//$NON-NLS-1$
-			case '\f' :
-				return "\\f";//$NON-NLS-1$	
-			case '\r' :
-				return "\\r";//$NON-NLS-1$
-			case '\\' :
-				return "\\\\";//$NON-NLS-1$
-		}
-		return String.valueOf(c);
-	}
-
-	protected static String windEscapeChars(String s) {
-		if (s == null)
-			return null;
-
-		char aChar;
-		int len= s.length();
-		StringBuffer outBuffer= new StringBuffer(len);
-
-		for (int x= 0; x < len;) {
-			aChar= s.charAt(x++);
-			if (aChar == '\\') {
-				aChar= s.charAt(x++);
-				if (aChar == 'u') {
-					// Read the xxxx
-					int value= 0;
-					for (int i= 0; i < 4; i++) {
-						aChar= s.charAt(x++);
-						switch (aChar) {
-							case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9':
-								value= (value << 4) + aChar - '0';
-								break;
-							case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
-								value= (value << 4) + 10 + aChar - 'a';
-								break;
-							case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
-								value= (value << 4) + 10 + aChar - 'A';
-								break;
-							default:
-								throw new IllegalArgumentException("Malformed \\uxxxx encoding."); //$NON-NLS-1$
-						}
-					}
-					outBuffer.append((char) value);
-				} else {
-					if (aChar == 't') {
-						outBuffer.append('\t');
-					} else {
-						if (aChar == 'r') {
-							outBuffer.append('\r');
-						} else {
-							if (aChar == 'n') {
-								outBuffer.append('\n');
-							} else {
-								if (aChar == 'f') {
-									outBuffer.append('\f');
-								} else {
-									outBuffer.append(aChar);
-								}
-							}
-						}
-					}
-				}
-			} else
-				outBuffer.append(aChar);
-		}
-		return outBuffer.toString();
-	}
-	
-    protected static boolean isValidLocalization(String name) {
-        if (name.length() <= 0) {
-            return false;
-        }
-        for (int i = 0; i < name.length(); i++) {
-            char c = name.charAt(i);
-            if ((c < 'A' || 'Z' < c) && (c < 'a' || 'z' < c)
-                    && (c < '0' || '9' < c) && c != '_' && c != '-') {
-                return false;
-            }
-        }
-        return true;
-    }
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/CheckboxTablePart.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/CheckboxTablePart.java
deleted file mode 100644
index a012b4d..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/CheckboxTablePart.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.parts;
-
-import org.eclipse.jface.viewers.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @version 	1.0
- * @author
- */
-public class CheckboxTablePart extends StructuredViewerPart {
-	public CheckboxTablePart(String [] buttonLabels) {
-		super(buttonLabels);
-	}
-
-	/*
-	 * @see StructuredViewerPart#createStructuredViewer(Composite, FormWidgetFactory)
-	 */
-	protected StructuredViewer createStructuredViewer(
-		Composite parent,
-		int style,
-		FormToolkit toolkit) {
-		style |= SWT.H_SCROLL | SWT.V_SCROLL;
-		if (toolkit==null) {
-			style |= SWT.BORDER;
-		}
-		else {
-			style |= toolkit.getBorderStyle();
-		}
-		CheckboxTableViewer	tableViewer = CheckboxTableViewer.newCheckList(parent, style);
-		tableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent e) {
-				CheckboxTablePart.this.selectionChanged((IStructuredSelection)e.getSelection());
-			}
-		});
-		tableViewer.addCheckStateListener(new ICheckStateListener() {
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				elementChecked(event.getElement(), event.getChecked());
-			}
-		});
-		return tableViewer;
-	}
-	
-	public CheckboxTableViewer getTableViewer() {
-		return (CheckboxTableViewer)getViewer();
-	}
-	
-	/*
-	 * @see SharedPartWithButtons#buttonSelected(int)
-	 */
-	protected void buttonSelected(Button button, int index) {
-	}
-	
-	protected void elementChecked(Object element, boolean checked) {
-	}
-	protected void selectionChanged(IStructuredSelection selection) {
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/ComboPart.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/ComboPart.java
deleted file mode 100644
index d923733..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/ComboPart.java
+++ /dev/null

@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.parts;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-
-public class ComboPart {
-	private Control combo;
-
-	public ComboPart() {
-	}
-	
-	public void addSelectionListener(SelectionListener listener) {
-		if (combo instanceof Combo)
-			((Combo) combo).addSelectionListener(listener);
-		else
-			((CCombo) combo).addSelectionListener(listener);
-	}
-	
-	public int indexOf(String item) {
-		if (combo instanceof Combo)
-			return ((Combo) combo).indexOf(item);
-		
-		return ((CCombo) combo).indexOf(item);	
-	}
-	
-	public void addModifyListener(ModifyListener listener) {
-		if (combo instanceof Combo)
-			((Combo) combo).addModifyListener(listener);
-		else
-			((CCombo) combo).addModifyListener(listener);
-	}
-	public void createControl(Composite parent, FormToolkit toolkit, int style) {
-		if (toolkit.getBorderStyle() == SWT.BORDER)
-			combo = new Combo(parent, style | SWT.BORDER);
-		else
-			combo = new CCombo(parent, style | SWT.FLAT);
-		toolkit.adapt(combo, true, true);
-	}
-	public Control getControl() {
-		return combo;
-	}
-	public int getSelectionIndex() {
-		if (combo instanceof Combo)
-			return ((Combo) combo).getSelectionIndex();
-		return ((CCombo) combo).getSelectionIndex();
-	}
-	public void add(String item, int index) {
-		if (combo instanceof Combo)
-			((Combo) combo).add(item, index);
-		else
-			((CCombo) combo).add(item, index);
-	}
-	public void add(String item) {
-		if (combo instanceof Combo)
-			((Combo) combo).add(item);
-		else
-			((CCombo) combo).add(item);
-	}
-	
-	public void select(int index) {
-		if (combo instanceof Combo)
-			((Combo) combo).select(index);
-		else
-			((CCombo) combo).select(index);
-	}
-	public String getSelection() {
-		if (combo instanceof Combo)
-			return ((Combo) combo).getItem(getSelectionIndex()).trim();
-		return ((CCombo) combo).getItem(getSelectionIndex()).trim();
-	}
-	public void setText(String text) {
-		if (combo instanceof Combo)
-			((Combo) combo).setText(text);
-		else
-			((CCombo) combo).setText(text);
-	}
-	public void setItems(String [] items) {
-		if (combo instanceof Combo)
-			((Combo) combo).setItems(items);
-		else
-			((CCombo) combo).setItems(items);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/EditableTablePart.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/EditableTablePart.java
deleted file mode 100644
index bfb33ff..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/EditableTablePart.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.parts;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.wizards.RenameDialog;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-/**
- * @version 	1.0
- * @author
- */
-public class EditableTablePart extends TablePart {
-	private boolean editable;
-	private Action renameAction;
-	
-	class RenameAction extends Action {
-		public RenameAction() {
-			super(PDEUIMessages.EditableTablePart_renameAction); 
-		}
-		public void run() {
-			doRename();
-		}
-	}
-
-	class NameModifier implements ICellModifier {
-		public boolean canModify(Object object, String property) {
-			return true;
-		}
-		public void modify(Object object, String property, Object value) {
-			entryModified(object, value.toString());
-		}
-		public Object getValue(Object object, String property) {
-			return object.toString();
-		}
-	}
-	/**
-	 * Constructor for EditableTablePart.
-	 * @param buttonLabels
-	 */
-	public EditableTablePart(String[] buttonLabels) {
-		super(buttonLabels);
-	}
-
-	public boolean isEditable() {
-		return editable;
-	}
-
-	public void setEditable(boolean editable) {
-		this.editable = editable;
-	}
-	
-	public IAction getRenameAction() {
-		if (renameAction==null) renameAction = new RenameAction();
-		return renameAction;
-	}
-
-	protected StructuredViewer createStructuredViewer(
-		Composite parent,
-		int style,
-		FormToolkit toolkit) {
-		TableViewer tableViewer =
-			(TableViewer) super.createStructuredViewer(parent, style, toolkit);
-		return tableViewer;
-	}
-
-	private void doRename() {
-		TableViewer viewer = getTableViewer();
-		IStructuredSelection selection = (IStructuredSelection)viewer.getSelection();
-		if (selection.size()==1 && isEditable()) {
-			Object obj = selection.getFirstElement();
-			String oldName = obj.toString();
-			RenameDialog dialog = new RenameDialog(getControl().getShell(), oldName);
-			dialog.create();
-			dialog.getShell().setText(PDEUIMessages.EditableTablePart_renameTitle); 
-			dialog.getShell().setSize(300, 150);
-			if (dialog.open()==Dialog.OK) {
-				entryModified(obj, dialog.getNewName());
-			}
-		}
-	}
-	
-	protected void entryModified(Object entry, String value) {
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/FormBrowser.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/FormBrowser.java
deleted file mode 100644
index 9fae5ec..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/FormBrowser.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.parts;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.forms.widgets.*;
-
-public class FormBrowser {
-	FormToolkit toolkit;
-	Composite container;
-	ScrolledFormText formText;
-	String text;
-	int style;
-	
-	public FormBrowser(int style) {
-		this.style = style;
-	}
-
-	public void createControl(Composite parent) {
-		toolkit = new FormToolkit(parent.getDisplay());
-		int borderStyle = toolkit.getBorderStyle()==SWT.BORDER?SWT.NULL:SWT.BORDER;		
-		container = new Composite(parent, borderStyle);
-		FillLayout flayout = new FillLayout();
-		flayout.marginWidth = 1;
-		flayout.marginHeight = 1;
-		container.setLayout(flayout);
-		formText = new ScrolledFormText(container, SWT.V_SCROLL | SWT.H_SCROLL, false);
-		if (borderStyle==SWT.NULL) {
-			formText.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TREE_BORDER);
-			toolkit.paintBordersFor(container);
-		}
-		FormText ftext = toolkit.createFormText(formText, false);
-		formText.setFormText(ftext);
-		formText.setExpandHorizontal(true);
-		formText.setExpandVertical(true);
-		formText.setBackground(toolkit.getColors().getBackground());
-		formText.setForeground(toolkit.getColors().getForeground());
-		ftext.marginWidth =2;
-		ftext.marginHeight =2;
-		ftext.setHyperlinkSettings(toolkit.getHyperlinkGroup());
-     	formText.addDisposeListener(new DisposeListener() {
-     		public void widgetDisposed(DisposeEvent e) {
-     			if (toolkit!=null) {
-     				toolkit.dispose();
-     				toolkit = null;
-     			}
-     		}
-     	});
-     	if (text!=null)
-     		formText.setText(text);
-	}
-
-	public Control getControl() {
-		return container;
-	}
-	
-	public void setText(String text) {
-		this.text = text;
-		if (formText!=null) formText.setText(text);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/FormEntry.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/FormEntry.java
deleted file mode 100644
index 5887e72..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/FormEntry.java
+++ /dev/null

@@ -1,276 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.parts;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.forms.FormColors;
-import org.eclipse.ui.forms.widgets.*;
-/**
- * The helper class for creating entry fields with label and text. Optionally,
- * a button can be added after the text. The attached listener reacts to all
- * the events. Entring new text makes the entry 'dirty', but only when 'commit'
- * is called is 'valueChanged' method called (and only if 'dirty' flag is set).
- * This allows delayed commit.
- */
-public class FormEntry {
-	private Control label;
-	private Text text;
-	private Button browse;
-	private String value=""; //$NON-NLS-1$
-	private boolean dirty;
-	boolean ignoreModify = false;
-	private IFormEntryListener listener;
-	/**
-	 * The default constructor. Call 'createControl' to make it.
-	 *  
-	 */
-	public FormEntry(Composite parent, FormToolkit toolkit, String labelText, int style) {
-		createControl(parent, toolkit, labelText, style, null, false, 0, 0);
-	}
-	
-	/**
-	 * This constructor create all the controls right away.
-	 * 
-	 * @param parent
-	 * @param toolkit
-	 * @param labelText
-	 * @param browseText
-	 * @param linkLabel
-	 */
-	public FormEntry(Composite parent, FormToolkit toolkit, String labelText,
-			String browseText, boolean linkLabel) {
-		this(parent, toolkit, labelText, browseText, linkLabel, 0);
-	}
-	
-	public FormEntry(Composite parent, FormToolkit toolkit, String labelText,
-			String browseText, boolean linkLabel, int indent) {
-		createControl(parent, toolkit, labelText, SWT.SINGLE, browseText, linkLabel, indent, 0);
-	}
-	
-	public FormEntry(Composite parent, FormToolkit toolkit, String labelText,
-			int indent, int tcolspan) {
-		createControl(parent, toolkit, labelText, SWT.SINGLE, null, false, indent, tcolspan);
-	}
-	
-	/**
-	 * Create all the controls in the provided parent.
-	 * 
-	 * @param parent
-	 * @param toolkit
-	 * @param labelText
-	 * @param span
-	 * @param browseText
-	 * @param linkLabel
-	 */
-	private void createControl(Composite parent, FormToolkit toolkit,
-			String labelText, int style, String browseText, boolean linkLabel, int indent, int tcolspan) {
-		if (linkLabel) {
-			Hyperlink link = toolkit.createHyperlink(parent, labelText,
-					SWT.NULL);
-			label = link;
-		} else {
-			label = toolkit.createLabel(parent, labelText);
-			label.setForeground(toolkit.getColors().getColor(FormColors.TITLE));
-		}
-		text = toolkit.createText(parent, "", style); //$NON-NLS-1$
-		addListeners();
-		if (browseText != null) {
-			browse = toolkit.createButton(parent, browseText, SWT.PUSH);
-			browse.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					if (listener != null)
-						listener.browseButtonSelected(FormEntry.this);
-				}
-			});
-		}
-		fillIntoGrid(parent, indent, tcolspan);
-	}
-	public void setEditable(boolean editable) {
-		text.setEditable(editable);
-		if (browse!=null) 
-			browse.setEnabled(editable);
-	}
-	private void fillIntoGrid(Composite parent, int indent, int tcolspan) {
-		Layout layout = parent.getLayout();
-		int tspan;
-		if (layout instanceof GridLayout) {
-			int span = ((GridLayout) layout).numColumns;
-			if (tcolspan > 0)
-				tspan = tcolspan;
-			else
-				tspan = browse != null ? span - 2 : span - 1;
-			GridData gd;
-			gd = new GridData(GridData.VERTICAL_ALIGN_CENTER);
-			gd.horizontalIndent = indent;
-			label.setLayoutData(gd);
-			gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-			gd.horizontalSpan = tspan;
-			gd.grabExcessHorizontalSpace = (tspan == 1);
-			gd.widthHint = 10;
-			text.setLayoutData(gd);
-			if (browse != null) {
-				gd = new GridData(GridData.VERTICAL_ALIGN_CENTER);
-				browse.setLayoutData(gd);
-			}
-		} else if (layout instanceof TableWrapLayout) {
-			int span = ((TableWrapLayout) layout).numColumns;
-			if (tcolspan > 0)
-				tspan = tcolspan;
-			else
-				tspan = browse != null ? span - 2 : span - 1;
-			TableWrapData td;
-			td = new TableWrapData();
-			td.valign = TableWrapData.MIDDLE;
-			td.indent = indent;
-			label.setLayoutData(td);
-			td = new TableWrapData(TableWrapData.FILL);
-			td.colspan = tspan;
-			td.grabHorizontal = (tspan == 1);
-			td.valign = TableWrapData.MIDDLE;
-			text.setLayoutData(td);
-			if (browse != null) {
-				td = new TableWrapData(TableWrapData.FILL);
-				td.valign = TableWrapData.MIDDLE;
-				browse.setLayoutData(td);
-			}
-		}
-	}
-	/**
-	 * Attaches the listener for the entry.
-	 * 
-	 * @param listener
-	 */
-	public void setFormEntryListener(IFormEntryListener listener) {
-		if (label instanceof Hyperlink) {
-			if (this.listener!=null)
-				((Hyperlink)label).removeHyperlinkListener(this.listener);
-			if (listener!=null)
-				((Hyperlink)label).addHyperlinkListener(listener);
-		}
-		this.listener = listener;
-	}
-	private void addListeners() {
-		text.addKeyListener(new KeyAdapter() {
-			public void keyReleased(KeyEvent e) {
-				keyReleaseOccured(e);
-			}
-		});
-		text.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				editOccured(e);
-			}
-		});
-		text.addFocusListener(new FocusAdapter() {
-			public void focusGained(FocusEvent e) {
-				if (listener != null)
-					listener.focusGained(FormEntry.this);
-			}
-			public void focusLost(FocusEvent e) {
-				if (dirty)
-					commit();
-			}
-		});
-	}
-	/**
-	 * If dirty, commits the text in the widget to the value and notifies the
-	 * listener. This call clears the 'dirty' flag.
-	 *  
-	 */
-	public void commit() {
-		if (dirty) {
-			value = text.getText();
-			//if (value.length()==0)
-				//value = null;
-			//notify
-			if (listener != null)
-				listener.textValueChanged(this);
-		}
-		dirty = false;
-	}
-	public void cancelEdit() {
-		dirty = false;
-	}
-	private void editOccured(ModifyEvent e) {
-		if (ignoreModify)
-			return;
-		dirty = true;
-		if (listener != null)
-			listener.textDirty(this);
-	}
-	/**
-	 * Returns the text control.
-	 * 
-	 * @return
-	 */
-	public Text getText() {
-		return text;
-	}
-	
-	/**
-	 * Returns the browse button control.
-	 * @return
-	 */
-	public Button getButton() {
-		return browse;
-	}
-	/**
-	 * Returns the current entry value. If the entry is dirty and was not
-	 * commited, the value may be different from the text in the widget.
-	 * 
-	 * @return
-	 */
-	public String getValue() {
-		return value.trim();
-	}
-	/**
-	 * Returns true if the text has been modified.
-	 * 
-	 * @return
-	 */
-	public boolean isDirty() {
-		return dirty;
-	}
-	private void keyReleaseOccured(KeyEvent e) {
-		if (e.character == '\r') {
-			// commit value
-			if (dirty)
-				commit();
-		} else if (e.character == '\u001b') { // Escape character
-			text.setText(value != null ? value : ""); // restore old //$NON-NLS-1$
-			dirty = false;
-		}	
-		listener.selectionChanged(FormEntry.this);
-	}
-	/**
-	 * Sets the value of this entry.
-	 * 
-	 * @param value
-	 */
-	public void setValue(String value) {
-		if (text != null)
-			text.setText(value != null ? value : ""); //$NON-NLS-1$
-		this.value = (value != null) ? value : ""; //$NON-NLS-1$
-	}
-	/**
-	 * Sets the value of this entry with the possibility to turn the
-	 * notification off.
-	 * 
-	 * @param value
-	 * @param blockNotification
-	 */
-	public void setValue(String value, boolean blockNotification) {
-		ignoreModify = blockNotification;
-		setValue(value);
-		ignoreModify = false;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/IFormEntryListener.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/IFormEntryListener.java
deleted file mode 100644
index 2cc9e18..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/IFormEntryListener.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.parts;
-
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-
-public interface IFormEntryListener extends IHyperlinkListener {
-/**
- * The user clicked on the text control and focus was
- * transfered to it.
- * @param entry
- */
-	void focusGained(FormEntry entry);
-/**
- * The user changed the text in the text control of the entry.
- * @param entry
- */
-	void textDirty(FormEntry entry);
-/**
- * The value of the entry has been changed to be the text
- * in the text control (as a result of 'commit' action).
- * @param entry
- */
-	void textValueChanged(FormEntry entry);
-/**
- * The user pressed the 'Browse' button for the entry.
- * @param entry
- */
-	void browseButtonSelected(FormEntry entry);
-	
-	void selectionChanged(FormEntry entry);
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/ILinkLabelProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/ILinkLabelProvider.java
deleted file mode 100644
index 38c06b1..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/ILinkLabelProvider.java
+++ /dev/null

@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.parts;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-
-public interface ILinkLabelProvider extends ILabelProvider {
-	String getStatusText(Object object);
-	String getToolTipText(Object object);
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/MessageLine.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/MessageLine.java
deleted file mode 100644
index 1d6bb50..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/MessageLine.java
+++ /dev/null

@@ -1,94 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.parts;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * A message line displaying a status.
- */
-public class MessageLine extends CLabel {
-	
-	private static final RGB ERROR_BACKGROUND_RGB = new RGB(230, 226, 221);
-	
-	private Color fNormalMsgAreaBackground;
-	private Color fErrorMsgAreaBackground;	
-
-	/**
-	 * Creates a new message line as a child of the given parent.
-	 */
-	public MessageLine(Composite parent) {
-		this(parent, SWT.LEFT);
-	}
-
-	/**
-	 * Creates a new message line as a child of the parent and with the given SWT stylebits.
-	 */
-	public MessageLine(Composite parent, int style) {
-		super(parent, style);
-		fNormalMsgAreaBackground= getBackground();
-		fErrorMsgAreaBackground= null;
-	}
-
-	
-	private Image findImage(IStatus status) {
-		PDELabelProvider provider = PDEPlugin.getDefault().getLabelProvider();
-		if (status.isOK()) {
-			return null;
-		} else if (status.matches(IStatus.ERROR)) {
-			return provider.get(PDEPluginImages.DESC_ERROR_ST_OBJ);
-		} else if (status.matches(IStatus.WARNING)) {
-			return provider.get(PDEPluginImages.DESC_WARNING_ST_OBJ);
-		} else if (status.matches(IStatus.INFO)) {
-			return provider.get(PDEPluginImages.DESC_INFO_ST_OBJ);
-		}
-		return null;
-	}
-
-	/**
-	 * Sets the message and image to the given status.
-	 * <code>null</code> is a valid argument and will set the empty text and no image
-	 */
-	public void setErrorStatus(IStatus status) {
-		if (status != null) {
-			String message= status.getMessage();
-			if (message != null && message.length() > 0) {
-				setText(message);
-				setImage(findImage(status));
-				if (fErrorMsgAreaBackground == null) {
-					fErrorMsgAreaBackground= new Color(getDisplay(), ERROR_BACKGROUND_RGB);
-				}
-				setBackground(fErrorMsgAreaBackground);
-				return;
-			}
-		}		
-		setText(""); //$NON-NLS-1$	
-		setImage(null);
-		setBackground(fNormalMsgAreaBackground);	
-	}
-	
-	/*
-	 * @see Widget#dispose()
-	 */
-	public void dispose() {
-		if (fErrorMsgAreaBackground != null) {
-			fErrorMsgAreaBackground.dispose();
-			fErrorMsgAreaBackground= null;
-		}
-		super.dispose();
-	}
-}
-

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/ModifiedTextCellEditor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/ModifiedTextCellEditor.java
deleted file mode 100644
index 9ae7035..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/ModifiedTextCellEditor.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.parts;
-
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.*;
-
-public class ModifiedTextCellEditor extends TextCellEditor {
-	private Listener traverseListener;
-	
-	public ModifiedTextCellEditor(Composite parent) {
-		super(parent);
-		setValueValid(true);
-	}
-	
-	protected void doSetValue(Object object) {
-		// Workaround for 32926
-		if (object==null) object = ""; //$NON-NLS-1$
-		super.doSetValue(object);
-	}
-	public Control createControl(Composite parent) {
-		Text text = (Text) super.createControl(parent);
-
-		traverseListener = new Listener() {
-			public void handleEvent(Event e) {
-				// do whatever it is you want to do on commit
-				handleEnter();
-				// this will prevent the return from 
-				// traversing to the button
-				e.doit = false;
-			}
-		};
-		text.addListener(SWT.Traverse, traverseListener);		
-		return text;
-	}
-	
-	public void dispose() {
-		Control c = getControl();
-		if (c!=null && !c.isDisposed() && traverseListener!=null) {
-			c.removeListener(SWT.Traverse, traverseListener);
-		}
-		super.dispose();
-	}
-	
-	public void forceCommit() {
-		if (isDirty())
-			fireApplyEditorValue();
-	}
-
-	private void handleEnter() {
-		fireApplyEditorValue();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/SharedPart.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/SharedPart.java
deleted file mode 100644
index 9db26ec..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/SharedPart.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.parts;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @version 	1.0
- * @author
- */
-public abstract class SharedPart {
-	private boolean enabled = true;
-
-	public void setEnabled(boolean enabled) {
-		if (enabled != this.enabled) {
-			this.enabled = enabled;
-			updateEnabledState();
-		}
-	}
-
-	public abstract void createControl(
-		Composite parent,
-		int style,
-		int span,
-		FormToolkit toolkit);
-
-	public boolean isEnabled() {
-		return enabled;
-	}
-
-	protected void updateEnabledState() {
-	}
-
-	protected Composite createComposite(
-		Composite parent,
-		FormToolkit toolkit) {
-		if (toolkit == null)
-			return new Composite(parent, SWT.NULL);
-		return toolkit.createComposite(parent);
-	}
-	protected Label createEmptySpace(
-		Composite parent,
-		int span,
-		FormToolkit toolkit) {
-		Label label;
-		if (toolkit != null) {
-			label = toolkit.createLabel(parent, null);
-		} else {
-			label = new Label(parent, SWT.NULL);
-		}
-		GridData gd = new GridData(GridData.VERTICAL_ALIGN_BEGINNING);
-		gd.horizontalSpan= span;
-		gd.widthHint= 0;
-		gd.heightHint= 0;
-		label.setLayoutData(gd);
-		return label;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/SharedPartWithButtons.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/SharedPartWithButtons.java
deleted file mode 100644
index 535e8c3..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/SharedPartWithButtons.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.parts;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-/**
- * @version 1.0
- * @author
- */
-public abstract class SharedPartWithButtons extends SharedPart {
-	private String[] buttonLabels;
-	private Control[] controls;
-	private Composite buttonContainer;
-	private class SelectionHandler implements SelectionListener {
-		public void widgetSelected(SelectionEvent e) {
-			buttonSelected(e);
-		}
-		public void widgetDefaultSelected(SelectionEvent e) {
-			buttonSelected(e);
-		}
-		private void buttonSelected(SelectionEvent e) {
-			Integer index = (Integer) e.widget.getData();
-			SharedPartWithButtons.this.buttonSelected((Button) e.widget, index
-					.intValue());
-		}
-	}
-	public SharedPartWithButtons(String[] buttonLabels) {
-		this.buttonLabels = buttonLabels;
-	}
-	public void setButtonEnabled(int index, boolean enabled) {
-		if (controls != null && index >= 0 && controls.length > index) {
-			Control c = controls[index];
-			if (c instanceof Button)
-				c.setEnabled(enabled);
-		}
-	}
-	protected abstract void createMainControl(Composite parent, int style,
-			int span, FormToolkit toolkit);
-	protected abstract void buttonSelected(Button button, int index);
-	/*
-	 * @see SharedPart#createControl(Composite, FormWidgetFactory)
-	 */
-	public void createControl(Composite parent, int style, int span,
-			FormToolkit toolkit) {
-		createMainLabel(parent, span, toolkit);
-		createMainControl(parent, style, span - 1, toolkit);
-		createButtons(parent, toolkit);
-	}
-	protected void createButtons(Composite parent, FormToolkit toolkit) {
-		if (buttonLabels != null && buttonLabels.length > 0) {
-			buttonContainer = createComposite(parent, toolkit);
-			GridData gd = new GridData(GridData.FILL_VERTICAL);
-			buttonContainer.setLayoutData(gd);
-			buttonContainer.setLayout(createButtonsLayout());
-			controls = new Control[buttonLabels.length];
-			SelectionHandler listener = new SelectionHandler();
-			for (int i = 0; i < buttonLabels.length; i++) {
-				String label = buttonLabels[i];
-				if (label != null) {
-					Button button = createButton(buttonContainer, label, i,
-							toolkit);
-					button.addSelectionListener(listener);
-					controls[i] = button;
-				} else {
-					createEmptySpace(buttonContainer, 1, toolkit);
-				}
-			}
-		}		
-	}
-	protected GridLayout createButtonsLayout() {
-		GridLayout layout = new GridLayout();
-		layout.marginWidth = layout.marginHeight = 0;
-		return layout;
-	}
-	protected Button createButton(Composite parent, String label, int index,
-			FormToolkit toolkit) {
-		Button button;
-		if (toolkit != null)
-			button = toolkit.createButton(parent, label, SWT.PUSH);
-		else {
-			button = new Button(parent, SWT.PUSH);
-			button.setText(label);
-		}
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL
-				| GridData.VERTICAL_ALIGN_BEGINNING);
-		button.setLayoutData(gd);
-		button.setData(new Integer(index));
-		return button;
-	}
-	protected void updateEnabledState() {
-		for (int i = 0; i < controls.length; i++) {
-			Control c = controls[i];
-			if (c instanceof Button)
-				c.setEnabled(isEnabled());
-		}
-	}
-	protected void createMainLabel(Composite parent, int span,
-			FormToolkit toolkit) {
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/StatusInfo.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/StatusInfo.java
deleted file mode 100644
index 266a298..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/StatusInfo.java
+++ /dev/null

@@ -1,172 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.parts;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-
-
-/**
- * A settable IStatus. 
- * Can be an error, warning, info or ok. For error, info and warning states,
- * a message describes the problem.
- */
-public class StatusInfo implements IStatus {
-	
-	private String fStatusMessage;
-	private int fSeverity;
-	
-	/**
-	 * Creates a status set to OK (no message)
-	 */
-	public StatusInfo() {
-		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 StatusInfo(int severity, String message) {
-		fStatusMessage= message;
-		fSeverity= severity;
-	}		
-	
-	/**
-	 *  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 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 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 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 PDEPlugin.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/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/StructuredViewerPart.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/StructuredViewerPart.java
deleted file mode 100644
index 7809a8a..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/StructuredViewerPart.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.parts;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-/**
- * @version 1.0
- * @author
- */
-public abstract class StructuredViewerPart extends SharedPartWithButtons {
-	private StructuredViewer viewer;
-	private Point minSize = null;
-	public StructuredViewerPart(String[] buttonLabels) {
-		super(buttonLabels);
-	}
-	public StructuredViewer getViewer() {
-		return viewer;
-	}
-	public Control getControl() {
-		return viewer.getControl();
-	}
-	/*
-	 * @see SharedPartWithButtons#createMainControl(Composite, int,
-	 *      FormWidgetFactory)
-	 */
-	protected void createMainControl(Composite parent, int style, int span,
-			FormToolkit toolkit) {
-		viewer = createStructuredViewer(parent, style, toolkit);
-		Control control = viewer.getControl();
-		/*
-		if (toolkit != null) {
-			toolkit.hookDeleteListener(control);
-		}
-		*/
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.horizontalSpan = span;
-		control.setLayoutData(gd);
-		applyMinimumSize();
-	}
-	public void setMinimumSize(int width, int height) {
-		minSize = new Point(width, height);
-		if (viewer != null)
-			applyMinimumSize();
-	}
-	private void applyMinimumSize() {
-		if (minSize != null) {
-			GridData gd = (GridData) viewer.getControl().getLayoutData();
-			gd.widthHint = minSize.x;
-			gd.heightHint = minSize.y;
-		}
-	}
-	protected void updateEnabledState() {
-		getControl().setEnabled(isEnabled());
-		super.updateEnabledState();
-	}
-	protected abstract StructuredViewer createStructuredViewer(
-			Composite parent, int style, FormToolkit toolkit);
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/TablePart.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/TablePart.java
deleted file mode 100644
index f6cd03a..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/TablePart.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.parts;
-
-import org.eclipse.jface.viewers.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @version 	1.0
- * @author
- */
-public class TablePart extends StructuredViewerPart {
-
-	/**
-	 * Constructor for TablePart.
-	 * @param buttonLabels
-	 */
-	public TablePart(String[] buttonLabels) {
-		super(buttonLabels);
-	}
-
-	/*
-	 * @see StructuredViewerPart#createStructuredViewer(Composite, FormWidgetFactory)
-	 */
-	protected StructuredViewer createStructuredViewer(
-		Composite parent,
-		int style,
-		FormToolkit toolkit) {
-		style |= SWT.H_SCROLL | SWT.V_SCROLL;
-		if (toolkit==null) {
-			style |= SWT.BORDER;
-		}
-		else {
-			style |= toolkit.getBorderStyle();
-		}
-		TableViewer	tableViewer = new TableViewer(parent, style);
-		tableViewer.addSelectionChangedListener(new ISelectionChangedListener () {
-			public void selectionChanged(SelectionChangedEvent e) {
-				TablePart.this.selectionChanged((IStructuredSelection)e.getSelection());
-			}
-		});
-		tableViewer.addDoubleClickListener(new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent e) {
-				TablePart.this.handleDoubleClick((IStructuredSelection)e.getSelection());
-			}
-		});
-		return tableViewer;
-	}
-	
-	public TableViewer getTableViewer() {
-		return (TableViewer)getViewer();
-	}
-	/*
-	 * @see SharedPartWithButtons#buttonSelected(int)
-	 */
-	protected void buttonSelected(Button button, int index) {
-	}
-	
-	protected void selectionChanged(IStructuredSelection selection) {
-	}
-	protected void handleDoubleClick(IStructuredSelection selection) {
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/TreePart.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/TreePart.java
deleted file mode 100644
index 8ee2af9..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/TreePart.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.parts;
-
-import org.eclipse.jface.viewers.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @version 	1.0
- * @author
- */
-public class TreePart extends StructuredViewerPart {
-
-	/**
-	 * Constructor for TreePart.
-	 * @param buttonLabels
-	 */
-	public TreePart(String[] buttonLabels) {
-		super(buttonLabels);
-	}
-
-	/*
-	 * @see StructuredViewerPart#createStructuredViewer(Composite, FormWidgetFactory)
-	 */
-	protected StructuredViewer createStructuredViewer(
-		Composite parent,
-		int style,
-		FormToolkit toolkit) {
-		style |= SWT.H_SCROLL | SWT.V_SCROLL;
-		if (toolkit==null) {
-			style |= SWT.BORDER;
-		}
-		else {
-			style |= toolkit.getBorderStyle();
-		}
-		TreeViewer	treeViewer = new TreeViewer(parent, style);
-		treeViewer.addSelectionChangedListener(new ISelectionChangedListener () {
-			public void selectionChanged(SelectionChangedEvent e) {
-				TreePart.this.selectionChanged((IStructuredSelection)e.getSelection());
-			}
-		});
-		treeViewer.addDoubleClickListener(new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent e) {
-				TreePart.this.handleDoubleClick((IStructuredSelection)e.getSelection());
-			}
-		});
-		return treeViewer;
-	}
-	
-	public TreeViewer getTreeViewer() {
-		return (TreeViewer)getViewer();
-	}
-	/*
-	 * @see SharedPartWithButtons#buttonSelected(int)
-	 */
-	protected void buttonSelected(Button button, int index) {
-	}
-	
-	protected void selectionChanged(IStructuredSelection selection) {
-	}
-	protected void handleDoubleClick(IStructuredSelection selection) {
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/WizardCheckboxTablePart.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/WizardCheckboxTablePart.java
deleted file mode 100644
index 1fa9814..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/parts/WizardCheckboxTablePart.java
+++ /dev/null

@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.parts;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.*;
-import org.eclipse.ui.forms.widgets.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.internal.ui.wizards.ListUtil;
-import org.eclipse.pde.internal.ui.util.SWTUtil;
-/**
- * @version 	1.0
- * @author
- */
-public class WizardCheckboxTablePart extends CheckboxTablePart {
-	private int selectAllIndex = -1;
-	private int deselectAllIndex = -1;
-	private String tableName;
-	private int counter;
-	private Label counterLabel;
-
-	/**
-	 * Constructor for WizardCheckboxTablePart.
-	 * @param buttonLabels
-	 */
-	public WizardCheckboxTablePart(String tableName, String[] buttonLabels) {
-		super(buttonLabels);
-		this.tableName = tableName;
-	}
-
-	public WizardCheckboxTablePart(String mainLabel) {
-		this(
-			mainLabel,
-			new String[] {
-				PDEUIMessages.WizardCheckboxTablePart_selectAll,
-				PDEUIMessages.WizardCheckboxTablePart_deselectAll});
-		setSelectAllIndex(0);
-		setDeselectAllIndex(1);
-	}
-
-	public void setSelectAllIndex(int index) {
-		this.selectAllIndex = index;
-	}
-	public void setDeselectAllIndex(int index) {
-		this.deselectAllIndex = index;
-	}
-
-	protected void buttonSelected(Button button, int index) {
-		if (index == selectAllIndex) {
-			handleSelectAll(true);
-		}
-		if (index == deselectAllIndex) {
-			handleSelectAll(false);
-		}
-	}
-
-	public Object[] getSelection() {
-		CheckboxTableViewer viewer = getTableViewer();
-		return viewer.getCheckedElements();
-	}
-
-	public void setSelection(Object[] selected) {
-		CheckboxTableViewer viewer = getTableViewer();
-		viewer.setCheckedElements(selected);
-		updateCounter(viewer.getCheckedElements().length);
-	}
-
-	public void createControl(Composite parent) {
-		createControl(parent, SWT.NULL, 2, null);
-		counterLabel = new Label(parent, SWT.NULL);
-		GridData gd =
-			new GridData(
-				GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_FILL);
-		gd.horizontalSpan = 2;
-		counterLabel.setLayoutData(gd);
-		updateCounter(0);
-	}
-
-	protected Button createButton(
-		Composite parent,
-		String label,
-		int index,
-		FormToolkit toolkit) {
-		Button button = super.createButton(parent, label, index, toolkit);
-		SWTUtil.setButtonDimensionHint(button);
-		return button;
-	}
-
-	protected StructuredViewer createStructuredViewer(
-		Composite parent,
-		int style,
-		FormToolkit toolkit) {
-		StructuredViewer viewer = super.createStructuredViewer(parent, style, toolkit);
-		viewer.setSorter(ListUtil.NAME_SORTER);
-		return viewer;
-	}
-
-	protected void createMainLabel(
-		Composite parent,
-		int span,
-		FormToolkit toolkit) {
-		if (tableName == null)
-			return;
-		Label label = new Label(parent, SWT.NULL);
-		label.setText(tableName);
-		GridData gd = new GridData();
-		gd.horizontalSpan = span;
-		label.setLayoutData(gd);
-	}
-
-	protected void updateCounter(int amount) {
-		counter = amount;
-		updateCounterLabel();
-	}
-
-	protected void updateCounterLabel() {
-		String number = "" + getSelectionCount(); //$NON-NLS-1$
-		String totalNumber = "" + getTotalCount(); //$NON-NLS-1$
-		String message =
-			NLS.bind(PDEUIMessages.WizardCheckboxTablePart_counter, (new String[] { number, totalNumber }));
-		counterLabel.setText(message);
-	}
-
-	public int getSelectionCount() {
-		return counter;
-	}
-
-	public void selectAll(boolean select) {
-		handleSelectAll(select);
-	}
-
-	private int getTotalCount() {
-		CheckboxTableViewer viewer = getTableViewer();
-		return viewer.getTable().getItemCount();
-	}
-
-	protected void handleSelectAll(boolean select) {
-		CheckboxTableViewer viewer = getTableViewer();
-		viewer.setAllChecked(select);
-		int selected;
-		if (!select) {
-			selected = 0;
-		} else {
-			selected = getTotalCount();
-		}
-		updateCounter(selected);
-	}
-	protected void elementChecked(Object element, boolean checked) {
-		int count = getSelectionCount();
-		updateCounter(checked ? count + 1 : count - 1);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties
deleted file mode 100644
index 583e4a8..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties
+++ /dev/null

@@ -1,2162 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#####################################
-# PDE resource strings
-# Part 1.    (DO NOT TRANSLATE Part 1)
-# These are the non-translable properties.
-#####################################
-
-ProjectStructurePage_sourceName = {0} Plug-in
-ProjectNamesPage_duplicateNames=Duplicate project names.
-ProjectStructurePage_fsourceName = {0} Fragment
-DefaultCodeGenerationPage_initialName = {0} Plug-in
-DefaultCodeGenerationPage_initialFName = {0} Fragment
-
-#####################################
-# PDE resource strings
-# Part 2.    (TRANSLATE Part 2)
-# These are the translable properties.
-#####################################
-
-UpdateManager_noUndo = &Undo@Ctrl+Z
-UpdateManager_noRedo = &Redo@Ctrl+Y
-UpdateManager_undo = &Undo {0}@Ctrl+Z
-UpdateManager_redo = &Redo {0}@Ctrl+Y
-UpdateManager_op_add= Add
-UpdateManager_op_remove= Remove
-UpdateManager_op_change= Property Change
-
-########################################################
-
-PluginModelManager_outOfSync = (out of sync)
-
-###### Status text #####################################
-ExternalModelManager_scanningProblems = Problems while scanning external plug-ins
-ExtensionElementDetails_setSelectedDesc=Set the properties of the selected element.
-ExportPackageVisibilitySection_hideOnly=visible to the following plug-ins only:
-ExportPackageVisibilitySection_unconditional=visible to downstream plug-ins
-ExternalModelManager_processingPath = Processing path {0}
-Errors_SetupError = PDE Setup Error
-Errors_SetupError_NoPlatformHome = Eclipse home is not set in Preferences
-Errors_CreationError = Wizard Creation Error
-Errors_CreationError_NoWizard = Wizard could not be created.
-
-MissingPDENature_title = Missing PDE Capability
-MissingPDENature_message = Java projects have been detected in the workspace that contain plug-in manifests but are missing PDE nature. Without it, you will not use all the PDE capabilities. Choose one of the following options:
-MissingPDENature_stopWarning = &Do not warn me about it again
-MissingPDENature_keepWarning = &Continue to warn me
-MissingPDENature_openWizard = &Take me to the conversion wizard
-
-MultiPageEditor_wrongEditor = Wrong editor for {0}
-MultiPageEditor_defaultPage_source = Do you want this editor to open into the Source page the next time it is used (the setting can be changed in Preferences)?
-MultiPageEditor_defaultPage_overview = Do you want this editor to open into the Overview page the next time it is used (the setting can be changed in Preferences)?
-
-CodeGenerator_missing_title = Missing Types
-CodeGenerator_missing_type = The following Java type cannot be resolved: {0}. Check the Java build path for missing references.
-CodeGenerator_missing_types = The following Java types cannot be resolved: {0}, {1}. Check the Java build path for missing references.
-CodeGenerator_desc_class = \ * TODO: Provide description for "{0}".
-CodeGenerator_desc_constructor = \t * TODO: Implement the "{0}" constructor.
-CodeGenerator_desc_method = \t * TODO: Implement "{0}".
-
-###### Reusable Parts ################################
-WizardCheckboxTablePart_selectAll = &Select All
-WizardCheckboxTablePart_deselectAll = D&eselect All
-WizardCheckboxTablePart_counter = {0} out of {1} selected.
-
-###### Editors #######################################
-
-############ Source ##################################
-SourcePage_title = Source
-SourcePage_errorTitle = Source Errors
-SourcePage_errorMessage= The source page has errors. Other pages cannot be used until these errors are corrected.
-
-############ Outline #################################
-ToggleLinkWithEditorAction_label = Lin&k With Editor
-ToggleLinkWithEditorAction_toolTip = Link with Editor
-ToggleLinkWithEditorAction_description = Link with active editorPDEMultiPageContentOutline.SortingAction.label = Sort
-PDEMultiPageContentOutline_SortingAction_label = Sort
-PDEMultiPageContentOutline_SortingAction_tooltip = Sort
-PDEMultiPageContentOutline_SortingAction_description = Sorts elements in the outline
-
-######## build.properties editor #####################
-BuildEditor_header = Build Configuration
-BuildEditor_BuildPage_title = Build Configuration
-BuildEditor_Custom_plugin = This plug-in uses a custom build script
-BuiltFeaturesWizard_title=Site Features
-BuildEditor_Custom_fragment = This fragment uses a custom build script
-BuildEditor_Custom_feature = This feature uses a custom build script
-
-BuildEditor_AddLibraryDialog_duplicate = {0} already exists.
-BuildEditor_AddLibraryDialog_label=Enter new library name or select a runtime library below:
-
-BuildEditor_RuntimeInfoSection_title = Runtime Information
-BuildEditor_RuntimeInfoSection_desc = Define the libraries, specify the order in which they should be built, and \
-list the source folders that should be compiled into each selected library:
-BuildEditor_RuntimeInfoSection_duplicateLibrary = Selected library already exists.
-BuildEditor_RuntimeInfoSection_duplicateFolder = Selected folder already exists.
-BuildEditor_RuntimeInfoSection_buildInclude = Include the selected library in the binary build
-BuildEditor_RuntimeInfoSection_addLibrary = Add Library...
-BuildEditor_RuntimeInfoSection_popupAdd = &Add Library...
-BuildEditor_RuntimeInfoSection_addFolder = Add Folder...
-BuildEditor_RuntimeInfoSection_popupFolder = &Add Folder...
-
-BuildEditor_SrcSection_title = Source Build
-BuildEditor_SrcSection_desc = Select the folders and files to include in the source build:
-BuildEditor_BinSection_title = Binary Build
-BuildEditor_BinSection_desc = Select the folders and files to include in the binary build:
-
-BuildEditor_ClasspathSection_add = Add JARs...
-BuildEditor_SourceFolderSelectionDialog_button = Create New Folder...
-BuildEditor_ClasspathSection_remove = Remove
-BuildEditor_ClasspathSection_title = Extra Classpath Entries
-BuildEditor_ClasspathSection_desc = List any extra libraries required on the plug-in's classpath for successful compilation:
-BuildEditor_ClasspathSection_jarsTitle = JAR Selection
-BuildEditor_ClasspathSection_jarsDesc = Choose JAR archives to be added to the build path:
-
-######## Feature Manifest Editor ####################
-FeatureEditor_previewAction_label = Previe&w
-FeatureEditor_BuildAction_label = &Export...
-FeatureEditor_Unresolved_title = Feature Manifest
-FeatureEditor_Unresolved_message= Feature manifest file contains references to plug-ins and/or fragments that cannot be resolved.
-FeatureEditor_FeaturePage_title = Overview
-FeatureEditor_InfoPage_title = Information
-FeatureEditor_InfoPage_heading = Information
-FeatureEditor_ReferencePage_title = Plug-ins
-FeatureEditor_ReferencePage_heading = Plug-ins and Fragments
-FeatureEditor_IncludesPage_title = Included Features
-FeatureEditor_IncludesPage_heading = Included Features
-FeatureEditor_ReferencePage_portabilityTitle = Environment Filtering
-FeatureEditor_ReferencePage_portabilityDesc = Use the fields below to use the selected import in specified environments only
-FeatureEditor_DependenciesPage_heading = Dependencies
-FeatureEditor_DependenciesPage_title = Dependencies
-FeatureEditor_Version_title = Feature Editor
-FeatureEditor_Version_message= Folder {0} is no longer in sync with feature id and version
-FeatureEditor_AdvancedPage_title = Installation
-FeatureEditor_AdvancedPage_heading = Installation Details
-
-FeatureEditor_PortabilityChoicesDialog_title = Portability Choices
-FeatureEditor_PortabilityChoicesDialog_choices = &Valid values:
-
-FeatureEditor_SpecSection_title = General Information
-FeatureEditor_SpecSection_desc = This section describes general information about this feature.
-FeatureEditor_SpecSection_desc_patch = This section describes general information about this patch feature.
-FeatureEditor_SpecSection_id = ID:
-FeatureEditor_SpecSection_patchedId = Feature ID:
-FeatureEditor_SpecSection_name = Name:
-FeatureEditor_SpecSection_version = Version:
-FeatureEditor_SpecSection_patchedVersion = Feature Version:
-FeatureEditor_SpecSection_provider = Provider:
-FeatureEditor_SpecSection_plugin = Branding Plug-in:
-FeatureEditor_SpecSection_browse = Browse...
-FeatureEditor_SpecSection_updateSite = The feafure can specify an update site to find future updates
-FeatureEditor_SpecSection_updateUrlLabel = Update Site Name:
-FeatureEditor_SpecSection_updateUrl = Update Site URL:
-FeatureEditor_SpecSection_createJar = Export...
-FeatureEditor_SpecSection_synchronize = Versions...
-FeatureEditor_SpecSection_badVersionTitle = Version Format Error
-FeatureEditor_SpecSection_badVersionMessage = Version must be in format "major.minor.service"
-FeatureEditor_SpecSection_badUrlTitle = Invalid URL
-FeatureEditor_SpecSection_badUrlMessage = The text entered for the update site URL is not a valid URL.
-FeatureEditor_PortabilitySection_title = Supported Environments
-FeatureEditor_PortabilitySection_desc = Specify environment combinations in which this feature can be installed. \
-Leave blank if the feature does not contain platform-specific code.
-FeatureEditor_PortabilitySection_os = Operating Systems:
-FeatureEditor_PortabilitySection_ws = Window Systems:
-FeatureEditor_PortabilitySection_nl = Languages:
-FeatureEditor_PortabilitySection_arch = Architecture:
-FeatureEditor_PortabilitySection_edit = Browse ...
-
-FeatureEditor_IncludedFeatures_title = Included Features
-FeatureEditor_IncludedFeatures_desc = Create a composite feature by including references to other features.
-FeatureEditor_IncludedFeatures_new = Add...
-
-SiteEditor_IncludedFeaturesDetailsSection_title = Included Feature Details
-SiteEditor_IncludedFeaturesDetailsSection_desc = Specify a name of the included feature, displayed when the feature is not installed.  Indicate if the included feature is optional.
-SiteEditor_IncludedFeaturesDetailsSection_featureLabel = Feature Name:
-SiteEditor_IncludedFeaturesDetailsSection_optional = The feature is optional
-SiteEditor_IncludedFeaturesDetailsSection_searchLocation = When searching for patches to this included feature, contact
-SiteEditor_IncludedFeaturesDetailsSection_root = the update site for the parent feature
-SiteEditor_IncludedFeaturesDetailsSection_self = the update site for the included feature
-SiteEditor_IncludedFeaturesDetailsSection_both = both
-
-FeatureEditor_IncludedFeaturePortabilitySection_title = Included Feature Environments
-FeatureEditor_IncludedFeaturePortabilitySection_desc = Specify environment combinations in which the included feature can be installed. \
-Leave blank if the feature does not contain platform-specific code.
-
-FeatureEditor_HandlerSection_title = Install Handler
-FeatureEditor_HandlerSection_desc = Specify an optional install handler that will be called during the installation.
-FeatureEditor_HandlerSection_library = Library:
-FeatureEditor_HandlerSection_handler = Handler:
-
-FeatureEditor_InstallSection_title = Installation Options
-FeatureEditor_InstallSection_desc = Specify if the feature cannot be installed simultaneously with other features, or must be installed in the same directory as another feature.
-FeatureEditor_InstallSection_colocation_desc = To colocate this feature with another feature, specify the reference feature ID.
-FeatureEditor_InstallSection_colocation = Feature ID:
-FeatureEditor_InstallSection_exclusive = This feature requires exclusive installation.
-
-FeatureEditor_InfoSection_heading = Feature Information
-FeatureEditor_InfoSection_desc = Enter description, license and copyright information. Optionally, \
-provide links to update sites for installing additional features.
-
-FeatureEditor_InfoSection_info = Section:
-FeatureEditor_InfoSection_url = Optional URL:
-FeatureEditor_InfoSection_text = Text:
-FeatureEditor_info_description = Feature Description
-FeatureEditor_info_license = License Agreement
-FeatureEditor_info_copyright = Copyright Notice
-FeatureEditor_info_discoveryUrls = Sites to Visit
-
-FeatureEditor_PluginSection_pluginTitle = Plug-ins and Fragments
-FeatureEditor_PluginSection_pluginDesc = Select plug-ins and fragments that should be packaged in this feature.
-FeatureEditor_PluginSection_new = Add...
-
-FeatureEditor_PluginPortabilitySection_title = Plug-in Environments
-FeatureEditor_PluginPortabilitySection_desc = Specify environment combinations in which the selected plug-in can be installed. \
-Leave blank if the plug-in does not contain platform-specific code.
-
-SiteEditor_PluginDetailsSection_title = Plug-in Details
-SiteEditor_PluginDetailsSection_desc = Specify installation details for the selected plug-in.
-SiteEditor_PluginDetailsSection_pluginLabel = Name:
-SiteEditor_PluginDetailsSection_downloadSize = Download Size (kB):
-SiteEditor_PluginDetailsSection_installSize = Installation Size (kB):
-SiteEditor_PluginDetailsSection_unpack = Unpack the plug-in archive after the installation
-
-FeatureEditor_DataSection_title = Feature Data
-FeatureEditor_DataSection_desc = Select non-plug-in data archives that should be packaged in this feature.
-FeatureEditor_DataSection_new = Add...
-
-SiteEditor_DataDetailsSection_title = Data Archive Details
-SiteEditor_DataDetailsSection_desc = Specify size (in kB) for the non-plug-in data archives:
-SiteEditor_DataDetailsSection_downloadSize = Download Size:
-SiteEditor_DataDetailsSection_installSize = Installation Size:
-
-FeatureEditor_DataDetailsSection_title = Data Archive Environments
-FeatureEditor_DataDetailsSection_desc = Specify environment combinations in which the selected archive can be installed. \
-Leave blank if the archive does not contain platform-specific code.
-
-FeatureEditor_modelsInUse_title = Sharing Violation
-FeatureEditor_modelsInUse_message = Some of the plug-in or fragment manifests are in use. Close opened editors and try again.
-FeatureExportJob_taskName=Building Plug-ins...
-FeatureExportJob_problems=Problems during export
-FeatureExportJob_name=Export Plug-ins
-FeatureExportJob_error=Error
-
-BuildSiteJob_refresh=Refreshing Site
-
-FeatureEditor_RequiresSection_title = Required Features/Plug-ins
-FeatureEditor_RequiresSection_desc = Compute plug-ins that will need to be present before installing this feature.
-FeatureEditor_RequiresSection_sync = Recompute when feature plug-ins change
-FeatureEditor_RequiresSection_compute = Compute
-FeatureEditor_RequiresSection_plugin = Add Plug-in...
-FeatureEditor_RequiresSection_feature = Add Feature...
-
-FeatureEditor_URLSection_desc = Add URLs of other update sites to visit while looking for new features.
-FeatureEditor_URLSection_new = Add
-FeatureEditor_URLSection_newDiscoverySite = New discovery site
-FeatureEditor_URLSection_newURL = http://newsite
-FeatureEditor_URLDetailsSection_desc = Specify a meaningful site name and the site URL.
-FeatureEditor_URLDetailsSection_updateUrlLabel = Name:
-FeatureEditor_URLDetailsSection_updateUrl = URL:
-FeatureEditor_URLDetailsSection_badUrlTitle = Invalid URL
-FeatureEditor_URLDetailsSection_badUrlMessage = The text entered for the update site URL is not a valid URL.
-
-
-FeatureEditor_InfoPage_ContentSection_title = Feature Content
-FeatureEditor_InfoPage_ContentSection_text = <form>\
-<p>The content of the feature is made up of five sections:</p>\
-<li style="image" value="page" bindent="5"><a href="info">Information</a>: holds information about this feature, such as description and license.</li>\
-<li style="image" value="page" bindent="5"><a href="plugins">Plug-ins</a>: lists the plug-ins that make up this feature.</li>\
-<li style="image" value="page" bindent="5"><a href="features">Included Features</a>: lists the features that are included in this feature.</li>\
-<li style="image" value="page" bindent="5"><a href="dependencies">Dependencies</a>: lists other features and plug-ins required by this feature when installed.</li>\
-<li style="image" value="page" bindent="5"><a href="installHandler">Installation</a>: sets advanced installation options, declares an optional install handler and non-plugin data in a feature.</li>\
-</form>
-
-FeatureEditor_InfoPage_PackagingSection_title = Exporting
-FeatureEditor_InfoPage_PackagingSection_text=<form>\
-<p>To export the feature:</p>\
-<li style="text" value="1." bindent="5"><a href="synchronize">Synchronize</a> versions of contained plug-ins and fragments with their version in the workspace</li>\
-<li style="text" value="2." bindent="5">Specify what needs to be packaged in the feature archive on the <a href="build">Build Configuration</a> page</li>\
-<li style="text" value="3." bindent="5">Export the feature in a format suitable for deployment using the <a href="export">Export Wizard</a></li>\
-</form>
-
-FeatureEditor_InfoPage_PublishingSection_title = Publishing
-FeatureEditor_InfoPage_PublishingSection_text=<form>\
-<p>To publish the feature on an update site:</p>\
-<li style="text" value="1." bindent="5">Create an <a href="siteProject">Update Site Project</a></li>\
-<li style="text" value="2." bindent="5">Use the site editor to add the feature to the site, and build the site</li>\
-</form>
-FeatureExportWizardPage_targetEnvironmentText=<form><p>If the features contain platform-specific code, specify the <a>target environment</a>.</p></form>
-
-FeatureOutlinePage_discoverUrls = Sites to Visit
-
-###### Plug-in Manifest Editor ########################
-ManifestEditor_DependenciesForm_title = Dependencies
-
-ManifestEditor_DetailChildrenSection_title = Extension Element Children
-ManifestEditor_DetailChildrenSection_bodyText = Body Text
-
-ManifestEditor_DetailExtensionPointSection_title = All Extension Points
-ManifestEditor_DetailExtensionPointSection_new = &Add...
-ManifestPackageRenameParticipant_packageRename=Rename packages referenced in plug-in manifest files
-ManifestEditor_DetailExtensionPointSection_newExtensionPoint = N&ew Extension Point...
-ManifestEditor_DetailExtensionPointSection_openSchema = &Open Schema
-
-ManifestEditor_DetailExtension_title = All Extensions
-ManifestEditor_DetailExtension_new = &Add...
-ManifestEditor_DetailExtension_edit = Edit...
-ManifestEditor_DetailExtension_newExtension = &Extension...
-ManifestEditor_DetailExtension_collapseAll = Co&llapse All
-ManifestEditor_DetailExtension_up = Up
-ManifestEditor_DetailExtension_down = Down
-
-ManifestEditor_BodyTextSection_title = Body Text
-ManifestEditor_BodyTextSection_titleFull = Body Text (has contents)
-
-ManifestEditor_ExportSection_title = Library Visibility
-ManifestEditor_ExportSection_desc = Specify the portions of the selected library that should be visible to other plug-ins:
-ManifestEditor_ExportSection_fullExport = Export the entire library
-ManifestEditor_ExportSection_selectedExport = Export the following subset of packages only:
-ManifestEditor_ExportSection_add = Add...
-ManifestEditor_ExportSection_remove = Remove
-PackageSelectionDialog_label = Select packages to export:
-PackageSelectionDialog_title=Package Selection
-PackageSelectionDialog_nopackages_message = There are no packages available in project {0}.
-
-ManifestEditor_LibraryTypeSection_title = Library Type
-ManifestEditor_LibraryTypeSection_desc = Specify whether the selected library contains executable code or just resources.
-ManifestEditor_LibraryTypeSection_code = code and resources
-ManifestEditor_LibraryTypeSection_resources = resources only
-
-ManifestEditor_ExtensionElementPR_finish = Finish implementation of {0}
-
-ManifestEditor_ExtensionPointForm_title = Extension Points
-
-ManifestEditor_ExtensionPointSection_title = Extension Points
-ManifestEditor_ExtensionPointSection_desc = Other plug-ins can use the following extension points to extend this plug-in:
-ManifestEditor_ExtensionPointSection_fdesc = Plug-ins can use the following extension points to extend this fragment:
-ManifestEditor_ExtensionPointSection_more = More...
-
-ManifestEditor_ExtensionSection_title = Extensions
-ManifestEditor_ExtensionSection_desc = The following extensions are defined in this plug-in:
-ManifestEditor_ExtensionSection_fdesc = The following extensions are defined in this fragment:
-ManifestEditor_ExtensionSection_more = More...
-
-ManifestEditor_ExtensionForm_title = Extensions
-
-ManifestEditor_ExtensionsPropertySheet_newAttribute = New Attribute:
-ManifestEditor_ExtensionsPropertySheet_addAttAction_label = Add Attribute
-ManifestEditor_ExtensionsPropertySheet_addAttAction_tooltip = Add new attribute
-ManifestEditor_ExtensionsPropertySheet_removeAttAction_label = Remove Attribute
-ManifestEditor_ExtensionsPropertySheet_removeAttAction_tooltip = Remove attribute
-ManifestEditor_ExtensionsPropertySheet_cloneAction_text = Clone Element
-ManifestEditor_ExtensionsPropertySheet_cloneAction_tooltip = Clone this element
-ManifestEditor_ExtensionsPropertySheet_newAttributeEntry = new_attribute
-
-ManifestEditor_TemplatePage_title = Welcome
-ManifestEditor_templatePage_heading = Welcome to {0}
-ManifestEditor_OverviewPage_title = Overview
-ManifestEditor_DependenciesPage_title = Dependencies
-ManifestEditor_RuntimePage_title = Runtime
-ManifestEditor_ExtensionsPage_title = Extensions
-ManifestEditor_ExtensionPointsPage_title = Extension Points
-
-ManifestEditor_ExtensionPointDetails_validate_errorStatus = Selection is not a schema file.
-ManifestEditor_ExtensionPointDetails_schemaLocation_title = Extension Point Schema Selection
-ManifestEditor_ExtensionPointDetails_schemaLocation_desc = Select a schema file for your extension point:
-
-ManifestEditor_ContentSection_title = Plug-in Content
-ManifestEditor_ContentSection_ftitle = Fragment Content
-ManifestEditor_ExtensionSection_title =  Extension / Extension Point Content
-
-ManifestEditor_DeployingSection_title = Exporting
-
-ManifestEditor_JarsSection_title = Library Content
-ManifestEditor_JarsSection_desc = List source folders that should be compiled into the selected library.
-ManifestSourcePage_dependencies=Dependencies
-ManifestEditor_JarsSection_new = Add...
-ManifestEditor_JarsSection_dialogTitle = New Source Folder
-ManifestEditor_JarsSection_dialogMessage = Select a folder:
-ManifestEditor_JarsSection_rtitle = {0} (in use - read only)
-ManifestEditor_JarsSection_missingSource_duplicateFolder = Selected folder is already a source folder
-
-ManifestEditor_LibrarySection_title = Classpath
-ManifestEditor_LibrarySection_fdesc = Specify the libraries that constitute the fragment runtime:
-ManifestEditor_LibrarySection_desc = Specify the libraries that constitute the plug-in runtime:
-ManifestEditor_LibrarySection_new = Add...
-ManifestEditor_LibrarySection_up = Up
-ManifestEditor_LibrarySection_down = Down
-ManifestEditor_LibrarySection_newLibrary = &New Library...
-ManifestEditor_LibrarySection_newLibraryEntry = New Library
-NewManifestEditor_LibrarySection_add = Add...
-NewManifestEditor_LibrarySection_new = New...
-NewManifestEditor_LibrarySection_remove = Remove
-ManifestEditor_RuntimeLibraryDialog_label = Enter new library name below:
-ManifestEditor_RuntimeLibraryDialog_default = library.jar
-ManifestEditor_RuntimeLibraryDialog_validationError = A library by the same name already exists.
-
-ManifestEditor_noPlatformHome = Platform path not set in Preferences.
-ManifestSourcePage_libraries=Libraries
-MailTemplate_perspectiveName=P&erspective name:
-ManifestSourcePage_extensions=Extensions
-MainMethodSearchEngine_search=Searching for main types
-ManifestEditor_ManifestPropertySheet_gotoAction_label= &Go to File
-ManifestEditor_ManifestPropertySheet_gotoAction_tooltip = Open file in editor
-
-ManifestEditor_ImportListSection_title = Required Plug-ins
-ManifestEditor_ImportListSection_desc = Specify the plug-ins required for the operation of this plug-in.
-ManifestEditor_ImportListSection_fdesc = Specify the plug-ins required for the operation of this fragment.
-ManifestEditor_ImportListSection_new = &Add...
-ManifestEditor_ImportListSection_loopWarning = WARNING: selected dependencies will create cyclical references.
-ManifestEditor_ImportListSection_updateBuildPath = Compute &Build Path
-ManifestEditor_ImportListSection_updatingBuildPath = Computing Java build path...
-
-ManifestEditor_ImportStatusSection_title = Dependency Status
-ManifestEditor_ImportStatusSection_desc = Explore information related to the paths of the dependency graph.
-ManifestTypeRenameParticipant_composite=Rename classes referenced in plug-in manifest files
-ManifestEditor_ImportStatusSection_comboLabel= Find:
-ManifestEditor_ImportStatusSection_comboLoops = Loops in dependency graph
-ManifestEditor_ImportStatusSection_comboRefs = Plug-ins that reference this plug-in
-ManifestEditor_ImportStatusSection_comboFrefs = Fragments that reference this plug-in
-
-ManifestEditor_MatchSection_title = Import Details
-MainTypeSelectionDialog_qualifier=&Qualifier:
-ManifestEditor_MatchSection_desc = Define the properties of the selected dependency.
-ManifestEditor_MatchSection_optional = Optional
-ManifestEditor_MatchSection_reexport = Re-export the dependency
-ManifestEditor_MatchSection_version = Version to match:
-ManifestEditor_MatchSection_rule = Match rule:
-ManifestEditor_MatchSection_none = None
-ManifestEditor_MatchSection_perfect = Perfect
-ManifestEditor_MatchSection_equivalent = Equivalent
-ManifestEditor_MatchSection_compatible = Compatible
-ManifestEditor_MatchSection_greater = Greater or Equal
-
-ManifestEditor_PluginSpecSection_title = General Information
-ManifestEditor_PluginSpecSection_desc = This section describes general information about this plug-in:
-ManifestEditor_PluginSpecSection_fdesc = This section describes general information about this fragment:
-
-ManifestEditor_PluginSpecSection_versionMatch = Match Rule:
-
-ManifestEditor_PointUsageSection_title = Extension Point Usage
-ManifestEditor_PointUsageSection_desc = Examine who is using extension points of this plug-in.
-ManifestEditor_PointUsageSection_fdesc = Examine who is using extension points of this fragment.
-
-ManifestEditor_RequiresSection_title = Required Plug-ins
-ManifestEditor_RequiresSection_desc = The following plug-ins must be installed for this plug-in to work properly:
-ManifestEditor_RequiresSection_fdesc = The following plug-ins must be installed for this fragment to work properly:
-ManifestEditor_RequiresSection_more = More...
-
-ResourceAttributeCellEditor_title = Resource Attribute Value
-ResourceAttributeCellEditor_message = Select a file:
-
-ManifestEditor_RuntimeForm_title = Runtime
-MainTypeSelectionDialog_matching=&Matching types:
-
-ManifestEditor_RuntimeSection_title = Runtime Libraries
-ManifestEditor_RuntimeSection_fdesc = The following libraries will be added to the classpath of this fragment:
-ManifestEditor_RuntimeSection_desc = The following libraries will be added to the classpath of this plug-in:
-ManifestEditor_RuntimeSection_more = More...
-ManifestSourcePage_extensionPoints=Extension Points
-MainTypeSelectionDialog_chooseType=&Choose a type (? = any character, * = any string):
-
-ManifestEditor_TestingSection_title = Testing
-
-ManifestEditor_PropertyPage_tagName = Tag name
-
-###### Schema Editor ##################################
-SchemaEditor_oldExtension = Extension point schema file content type 'xsd' has been deprecated. You should change it to 'exsd' at the earliest convenience.
-SchemaEditorContributor_previewAction = Preview &Reference Document
-
-SchemaEditor_AttributePR_attributeCopy = Copy of {0}
-
-SchemaEditor_AttributePR_use = Use
-SchemaEditor_AttributePR_kind = Kind
-SchemaEditor_AttributePR_type = Type
-SchemaEditor_AttributePR_restriction = Restriction
-SchemaEditor_AttributePR_value = Value
-SchemaEditor_AttributePR_basedOn = Based On
-SchemaEditor_AttributePR_name = Name
-
-SchemaEditor_CompositorPR_kind = Kind
-
-SchemaEditor_DescriptionSection_title = Description
-SchemaEditor_DescriptionSection_desc = Add short description of elements and attributes for documentation purposes. Use HTML tags where appropriate.
-
-SchemaEditor_DocForm_title = Reference Documentation
-
-SchemaEditor_DocSection_title =
-SchemaEditor_DocSection_desc = Select the section from the list and enter text in the editor below. This text will be used to compose the reference HTML document for this extension point. Use HTML tags where needed.
-SchemaEditor_topic_overview = Overview
-SchemaEditor_topic_since = Since:
-SchemaEditor_topic_examples = Examples
-SchemaEditor_topic_implementation = Supplied Implementation
-SchemaEditor_topic_api = API Information
-SchemaEditor_topic_copyright = Copyright
-
-SchemaEditor_ElementPR_name = Name
-SchemaEditor_ElementPR_icon = Icon
-SchemaEditor_ElementPR_labelAttribute = Label Attribute
-SchemaEditor_ElementPR_invalid = "{0}" is not a valid attribute name
-
-SchemaEditor_SpecSection_title = General Information
-SchemaEditor_SpecSection_desc = This section describes general information about this schema.
-SchemaEditor_SpecSection_plugin = Plug-in ID:
-SchemaEditor_SpecSection_point = Point ID:
-SchemaEditor_SpecSection_name = Point Name:
-
-SchemaEditor_ElementSection_title = Extension Point Elements
-SchemaEditor_ElementSection_desc = The following XML elements and attributes are allowed in this extension point:
-SchemaEditor_ElementSection_newElement = New Element
-SchemaEditor_ElementSection_newAttribute = New Attribute
-
-RestrictionDialog_wtitle = Type Restriction
-RestrictionDialog_type = Restriction &type:
-RestrictionDialog_choices=&Enumeration choices:
-RestrictionDialog_newChoice=&New choice:
-RestrictionDialog_add=&Add
-RestrictionDialog_remove=&Remove
-ReviewPage_noSampleFound=No sample has been selected.
-
-SchemaEditor_GrammarSection_title = Element Grammar
-SchemaEditor_GrammarSection_desc = View or modify the content model of the selected element
-SchemaEditor_GrammarSection_compositor = &Compositor
-SchemaEditor_GrammarSection_reference = &Reference
-SchemaEditor_GrammarSection_dtd = DTD approximation:
-
-SchemaEditor_NewAttribute_label = &Attribute
-SchemaEditor_NewAttribute_tooltip = New Attribute
-SchemaEditor_NewAttribute_initialName = new_attribute{0}
-
-SchemaEditor_NewElement_label = &Element
-SchemaEditor_NewElement_tooltip = New Global Element
-SchemaEditor_NewElement_initialName = new_element{0}
-
-SchemaEditor_NewCompositor_tooltip = New {0}
-
-SchemaEditor_FormPage_title = Definition
-SchemaEditor_DocPage_title = Documentation
-
-SchemaPropertySheet_clone_label = Clone
-SchemaPropertySheet_clone_tooltip = Clone this attribute
-
-AbstractPluginModelBase_error = Cannot create the model - source file has errors
-AbstractPluginBlock_counter={0} out of {1} selected
-###### Launchers #######################################
-MainTab_name = &Main
-WorkspaceDataBlock_workspace = Workspace Data
-WorkspaceDataBlock_location = &Location:
-WorkspaceDataBlock_clear =Clear wor&kspace data before launching
-WorkspaceDataBlock_name=workspace location
-WorkspaceDataBlock_askClear = Ask &for confirmation before clearing
-WorkspaceDataBlock_noWorkspace = Workspace data location not specified
-BaseBlock_workspace=Workspace...
-BaseBlock_filesystem=File System...
-BaseBlock_dirSelection=Directory Selection
-BaseBlock_errorMessage=The {0} is not specified
-BaseBlock_variables=Variables...
-BaseBlock_dirChoose=Choose a directory:
-BaseBlock_relative=Choose a location relative to the workspace:
-ProgramBlock_runProduct=Run a &product:
-ProgramBlock_programToRun=Program to Run
-ProgramBlock_runApplication=Run an &application:
-BasicLauncherTab_javaExec=Java Executable:
-BasicLauncherTab_jre =Runtim&e JRE:
-BasicLauncherTab_installedJREs = In&stalled JREs...
-BasicLauncherTab_jrePreferencePage = Installed JREs
-BasicLauncherTab_bootstrap=&Bootstrap Entries:
-BasicLauncherTab_javaExecDefault=defa&ult
-BasicLauncherTab_noJRE =No JRE selected
-JUnitProgramBlock_headless=[No Application] - Headless Mode
-
-AdvancedLauncherTab_name = Plu&g-ins
-AdvancedLauncherTab_workspacePlugins = Workspace Plug-ins
-AdvancedLauncherTab_validatePlugins=Validate Plug&-in Set
-AdvancedLauncherTab_useDefault = Launch with all workspace and enabled e&xternal plug-ins
-AdvancedLauncherTab_useFeatures = &Use features in the workspace (simulated normal startup)
-AdvancedLauncherTab_useList = C&hoose plug-ins and fragments to launch from the list
-AddSingleonAttributeTo_desc=Plug-ins declaring extensions or extension points must set the 'singleton' directive to 'true'.
-AdvancedLauncherTab_selectAll = &Select All
-AdvancedFeatureExportPage_desc=Sign the JAR archives and generate JNLP manifests
-AdvancedPluginExportPage_desc=Sign the JAR archives
-AdvancedLauncherTab_deselectAll = D&eselect All
-AdvancedFeatureExportPage_noSite=Site URL is not set.
-AdvancedPluginExportPage_signJar=Signing JAR Archives
-AdvancedPluginExportPage_noAlias=Alias is not set.
-AdvancedLauncherTab_subset = Add Re&quired Plug-ins
-AdvancedLauncherTab_addNew=&Add new workspace plug-ins to this launch configuration automatically
-AdvancedLauncherTab_defaults = &Restore Defaults
-AddSingleonAttributeTo_label=set the 'singleton' directive to true
-AdvancedLauncherTab_workingSet=Add Wor&king Set...
-AdvancedLauncherTab_noProblems=No problems were detected in the selected set of plug-ins.
-AdvancedFeatureExportPage_jnlp=Java Network Launching Protocol (JNLP)
-AdvancedPluginExportPage_title=Advanced Options
-AdvancedPluginExportPage_alias=A&lias:
-AdvancedLauncherTab_includeFragments=Inc&lude fragments when computing required plug-ins
-AdvancedLauncherTab_includeOptional=Include &optional dependencies when computing required plug-ins
-AdvancedFeatureExportPage_siteURL=Si&te URL:
-AdvancedPluginExportPage_keystore=&Keystore location:
-AdvancedPluginExportPage_password=&Password:
-AdvancedFeatureExportPage_noVersion=JRE version is not set.
-AdvancedPluginExportPage_signButton=&Sign the JAR archives using a keystore (a password-protected database)
-AdvancedPluginExportPage_noKeystore=Keystore location is not set.
-AdvancedPluginExportPage_noPassword=Password is not set
-AdvancedLauncherTab_pluginValidation=Plug-in Validation
-AdvancedFeatureExportPage_createJNLP=&Create JNLP manifests for the JAR archives
-AdvancedFeatureExportPage_jreVersion=&JRE version:
-AdvancedLauncherTab_error_featureSetup = The workspace is not set up properly for this option. Plug-ins must be in \
-'plugins' directory, and features in 'features' directory.
-
-TracingLauncherTab_name = Trac&ing
-TracingLauncherTab_tracing =&Enable tracing for the selected plug-ins
-TracingLauncherTab_plugins = &Plug-ins that support tracing:
-TracingLauncherTab_options = &Tracing options:
-TracingLauncherTab_selectAll = &Select All
-TracinglauncherTab_deselectAll = &Deselect All
-
-ConfigurationTab_name = &Configuration
-ConfigurationTab_clearArea = Cle&ar the configuration area before launching
-ConfigurationTab_configAreaGroup=Configuration Area
-ConfigurationTab_useDefaultLoc=&Use default location
-ConfigurationTab_configLog=&Location:
-ConfigurationSection_title=Configuration File
-ConfigurationSection_desc=An Eclipse product can be configured by setting properties in a config.ini file.  These properties are read by the runtime upon startup.
-ConfigurationSection_file=File:
-ConfigurationAreaBlock_0=
-ConfigurationTab_configBrowse=&Browse...
-ConfigurationSection_existing=Use an existing config.ini file
-ConfigurationTab_configLocMessage=Select a configuration location:
-ConfigurationTab_configFileGroup=Configuration File
-ConfigurationTab_defaultConfigIni=G&enerate a config.ini file with default content
-ConfigurationTab_existingConfigIni=Use an e&xisting config.ini file as a template
-ConfigurationTab_templateLoc=L&ocation:
-ConfigurationSection_default=Generate a default config.ini file
-ConfigurationSection_browse=Browse...
-ConfigurationAreaBlock_name=configuration area location
-ConfigurationSection_message=Select a config.ini file:
-ConfigurationTab_templateBrowse=Brow&se...
-ConfigurationTemplateBlock_name=template file location
-ConfigurationTab_fileSelection=File Selection
-ConfigurationSection_selection=File Selection
-ConfigurationTab_fileDialogMessage=Select a config.ini file:
-
-
-WorkbenchLauncherConfigurationDelegate_noJRE = Cannot locate JRE definition: "{0}". Launch aborted.
-WorkbenchLauncherConfigurationDelegate_jrePathNotFound = The installation path to the specified JRE could not be found.  Launch aborted.
-WorkbenchLauncherConfigurationDelegate_badFeatureSetup = When in feature mode, plug-ins must be in the 'plugins' directory and features in 'features' directory in the workspace.
-WorkbenchLauncherConfigurationDelegate_starting = Starting Eclipse application...
-WorkbenchLauncherConfigurationDelegate_missingRequired = Launching failed because the {0} plug-in is not included in the configuration you are launching. \
-To fix the problem, go to the Plug-ins tab of this launch configuration and ensure that the option selected includes said plug-in.
-WorkbenchLauncherConfigurationDelegate_noStartup = Launching failed. Required Library "startup.jar" is missing from the target platform.
-WorkbenchLauncherConfigurationDelegate_brokenPlugins = Some of the plug-ins to launch have errors in the manifest files. \
-The launch will continue, but they will be rejected at startup.
-WorkbenchLauncherConfigurationDelegate_title = Launcher
-WorkbenchLauncherConfigurationDelegate_confirmDeleteWorkspace = Do you really want to clear the run-time workspace data in {0}?
-JUnitLaunchConfiguration_error_invalidproject=Invalid project specified
-JUnitLaunchConfiguration_error_notests=No tests found
-JUnitLaunchConfiguration_error_notaplugin = Could not determine test plugin ID - project is not a plugin
-JUnitLaunchConfiguration_error_missingPlugin = Required plug-in {0} could not be found
-
-Launcher_error_title=Launch Error
-LauncherSection_desc=Customize the executable that is used to launch the product:
-LauncherSection_ico=Use a single ICO file
-LauncherPage_title=Launcher
-LauncherSection_file=File:
-LauncherSection_icon=Icon:
-LauncherSection_tiny=Tiny:
-Launcher_error_code13=The application could not start.  Would you like to view the log?
-Launcher_error_code15=Could not launch the configuration because the associated workspace is currently in use.
-Launcher_error_displayInLogView=Yes, in the Error Log view
-Launcher_error_displayInSystemEditor=Yes, in the system editor
-Launcher_error_displayNo=No
-LauncherSection_browse=Browse...
-LauncherSection_title=Program Launcher
-LauncherSection_label=Customizing the launcher icons varies per platform:
-LauncherSection_bmpImages=Specify separate BMP images
-LauncherSection_bmpImagesText=Provide BMP images for low (16-color) and high (256-color) graphics
-LauncherSection_Low16=16x16 (Low):
-LauncherSection_High16=16x16 (High):
-LauncherSection_32Low=32x32 (Low):
-LauncherSection_32High=32x32 (High):
-LauncherSection_48Low=48x48 (Low):
-LauncherSection_48High=48x48 (High):
-LauncherSection_linuxLabel=A single XPM icon is required:
-LauncherSection_large=Large:
-LauncherSection_medium=Medium:
-LauncherSection_small=Small:
-LauncherSection_macLabel=A single ICNS file is required:
-OpenLogDialog_title=Error Log
-OpenLogDialog_message=Opening log...
-OpenLogDialog_cannotDisplay=Log file cannot be displayed.
-
-###### Preferences ####################################
-Preferences_MainPage_Description = Set general plug-in development preferences.
-Preferences_MainPage_noPDENature = &Warn about Java projects without PDE nature
-
-Preferences_MainPage_showObjects = Show plug-in objects in editors and dialogs using:
-Preferences_MainPage_useIds = &Identifiers
-Preferences_MainPage_useFullNames = &Presentation names
-
-Preferences_TargetPlatformPage_Description = Specify the platform against which the workspace plug-ins will be compiled and tested:
-Preferences_TargetPlatformPage_useThis = &Use this application
-Preferences_TargetPlatformPage_PlatformHome = &Location:
-Preferences_TargetPlatformPage_PlatformHome_Button = &Browse...
-Preferences_TargetPlatformPage_title = Target Platform
-Preferences_TargetPlatformPage_question = You have entered a new target platform location, but did not press 'reload'.  If you proceed, the plug-ins and fragments from that location will be automatically loaded.  Would you like to proceed?
-ExternalPluginsBlock_reload = &Reload
-ExternalPluginsBlock_selectAll = &Select All
-ExternalPluginsBlock_deselectAll = D&eselect All
-ExternalPluginsBlock_addRequired=Add Re&quired Plug-ins
-ExternalPluginsBlock_includeFragments=&Include fragments when computing required plug-ins
-ExternalPluginsBlock_workspace = &Not In Workspace
-ExternalizeStringsWizard_title=Externalize Strings
-ExternalizeStringsWizardPage_pageTitle=Externalize Strings
-ExternalizeStringsWizardPage_pageDescription=Externalizing manifest files extracts translatable strings and stores them in a properties file for multi-language support.
-ExternalizeStringsWizardPage_badLocalizationError=A Bundle Localization must consist of a combination of alpha-numeric characters, _ and -.
-ExternalizeStringsWizardPage_resourcelabel=Plug-ins with non-externalized strings:
-ExternalizeStringsWizardPage_selectAllButton=&Select All
-ExternalizeStringsWizardPage_deselectAllButton=&Deselect All
-ExternalizeStringsWizardPage_projectLabel=Selected project:
-ExternalizeStringsWizardPage_noUnderlyingResource=No underlying resource selected
-ExternalizeStringsWizardPage_localizationLabel=&Localization:
-ExternalizeStringsWizardPage_propertiesLabel=Strings to externalize:
-ExternalizeStringsWizardPage_sourceLabel=Source:
-ExternalizeStringsWizardPage_keyEmptyError=New key may not be empty
-ExternalizeStringsWizardPage_keyCommentError=New key may not begin with \#, \! or % characters
-ExternalizeStringsWizardPage_keyError=New key may not contain : or = " " (space) characters
-ExternalizeStringsWizardPage_keyDuplicateError=New key may not be a duplicate of another key
-ExternalizeStringsWizardPage_keySuggested=\n\tsuggested key value: 
-ExternalPluginsBlock_workingSet=Add &Working Set...
-
-Preferences_TargetEnvironmentPage_os = &Operating System (os):
-Preferences_TargetEnvironmentPage_ws = &Windowing System (ws):
-Preferences_TargetEnvironmentPage_nl = &Locale (nl):
-Preferences_TargetEnvironmentPage_arch = Arc&hitecture (arch):
-
-SourceBlock_add = Add&...
-SourceBlock_remove = &Remove
-SourceBlock_target=Source locations declared in the target platform
-SourceBlock_additional=Additional source locations
-SourceBlock_desc =PDE searches <a>source code locations</a> for extension point schemas and library JAR source attachments:
-
-
-######################################################
-PluginPathUpdater_updating = Updating build path...
-
-###### Wizards #######################################
-NewFragmentProjectWizard_title = New Fragment Project
-NewProjectWizard_MainPage_ftitle = Fragment Project
-NewProductFileWizard_windowTitle=New Product Configuration
-NewProjectWizard_MainPage_fdesc = Create a new fragment project
-
-NewProjectWizard_title = New Plug-in Project
-NewProjectWizard_MainPage_title = Plug-in Project
-NewProjectWizard_MainPage_desc = Create a new plug-in project
-
-ProjectStructurePage_title = Plug-in Project Structure
-ProjectNamesPage_emptyName=Project name cannot be empty.
-ProjectStructurePage_ftitle = Fragment Project Structure
-ProjectStructurePage_desc = Define the project structure and settings.
-ProjectStructurePage_settings = Project Settings
-ProjectStructurePage_simple = &Create a simple project
-ProjectStructurePage_java = Create a &Java project
-ProjectStructurePage_library = &Classpath:
-ProjectStructurePage_source = &Source folder:
-ProjectStructurePage_output = &Output folder:
-ProjectStructurePage_noOutput = Output folder name is not set
-
-ProjectNamesPage_projectName=Project name:
-ProjectNamesPage_multiProjectName=Project name #&{0}:
-ProjectNamesPage_title=Project names
-ProjectNamesPage_desc=Select project names or accept the defaults.
-ProjectNamesPage_noSampleFound=No sample has been selected.
-
-ContentPage_title = Plug-in Content
-ContentPage_ftitle = Fragment Content
-ContentPage_desc = Enter the data required to generate the plug-in.
-ContentPage_fdesc = Enter the data required to generate the fragment.
-ContentPage_pGroup = Plug-in Properties
-ContentPage_fGroup = Fragment Properties
-ContentPage_parentPluginGroup = Host Plug-in
-ContentPage_pClassGroup = Plug-in Options
-ContentPage_pid = Plug-in &ID:
-ContentPage_pversion = Plug-in &Version:
-ContentPage_pname = Plug-in N&ame:
-ContentPage_pprovider = Plug-in Pr&ovider:
-ContentPage_fid = Fragment &ID:
-ContentPage_fversion = Fragment &Version:
-ContentPage_fname = Fragment N&ame:
-ContentPage_fprovider = Fragment P&rovider:
-ContentPage_generate = &Generate an activator, a Java class that controls the plug-in's life cycle
-ContentPage_classname = Ac&tivator:
-ContentPage_uicontribution = T&his plug-in will make contributions to the UI
-FragmentContentPage_pid = &Plug-in ID:
-FragmentContentPage_pversion = Pl&ug-in Version:
-ContentPage_browse = Bro&wse...
-ContentPage_matchRule = &Match Rule:
-ContentPage_noid = ID is not set
-ContentPage_invalidId = Invalid ID.  Legal characters are A-Z a-z 0-9 . _
-ContentPage_noversion = Version field is not set
-ContentPage_badversion = Version must be in the format \"major.minor.service\"
-ContentPage_noname = Name is not set
-ContentPage_nopid = Plug-in ID is not set
-ContentPage_pluginNotFound = Plug-in with the specified id could not be found
-ContentPage_nopversion = Plug-in Version is not set
-ContentPage_badpversion = Plug-in Version must be in the format \"major.minor.service\"
-ContentPage_fragment = Fragment
-ContentPage_plugin = Plug-in
-ContentPage_illegalCharactersInID = Project name contained characters which are not legal for the id, they have been converted to underscores.
-WizardListSelectionPage_title = Templates
-WizardListSelectionPage_desc = Select one of the available templates to generate a fully-functioning plug-in.
-WizardListSelectionPage_label = &Create a plug-in using one of the templates
-WizardListSelectionPage_templates = &Available Templates:
-OptionTemplateSection_mustBeSet = Template option "{0}" must be set.
-
-NewLibraryPluginProjectWizard_title = New Plug-in from Existing JAR Archives
-NewLibraryPluginCreationPage_title = Plug-in Project Properties
-NewLibraryPluginCreationPage_desc = Enter the data required to generate the plug-in.
-NewLibraryPluginCreationPage_pformat = Plug-in Format
-NewLibraryPluginCreationPage_pTarget = &What version of Eclipse is this plug-in targeted for?
-NewLibraryPluginCreationPage_bundle = Cr&eate an OSGi bundle manifest
-NewLibraryPluginCreationPage_jarred = &Unzip the JAR archives into the project
-NewLibraryPluginCreationPage_pGroup = Plug-in Properties
-NewLibraryPluginCreationPage_pid = Plug-in &ID:
-NewLibraryPluginCreationPage_pversion = Plug-in &Version:
-NewLibraryPluginCreationPage_pname = Plug-in N&ame:
-NewLibraryPluginCreationPage_pprovider = Plug-in Pr&ovider:
-NewLibraryPluginCreationPage_plugin = Plug-in
-NewLibraryPluginCreationPage_noid = ID is not set
-NewLibraryPluginCreationPage_invalidId = Invalid ID.  Legal characters are A-Z a-z 0-9 . _
-NewLibraryPluginCreationPage_noversion = Version field is not set
-NewLibraryPluginCreationPage_noname = Name is not set
-LibraryPluginJarsPage_title = JAR selection
-LibraryPluginJarsPage_desc = Select the JAR archives to include in the plug-in.
-LibraryPluginJarsPage_label = &JAR archives to include in the plug-in:
-LibraryPluginJarsPage_add = &Add...
-LibraryPluginJarsPage_addExternal = Add &External...
-LibraryPluginJarsPage_remove = &Remove
-LibraryPluginJarsPage_SelectionDialog_title = JAR selection
-LibraryPluginJarsPage_SelectionDialog_message = Select the JAR archives to include in the plug-in.
-
-NewProjectCreationOperation_creating = Creating...
-NewProjectCreationOperation_project = the project
-NewProjectCreationOperation_setClasspath = Setting the classpath...
-NewProjectCreationOperation_manifestFile = the manifest file
-NewProjectCreationPage_pPureOSGi=&an OSGi framework:
-NewProjectCreationPage_standard=standard
-NewProjectCreationPage_target=Target Platform
-NewProjectCreationPage_ftarget=This fragment is targeted to run with:
-NewProjectCreationPage_ptarget=This plug-in is targeted to run with:
-NewProjectCreationPage_pDependsOnRuntime=&Eclipse version:
-NewProjectCreationOperation_buildPropertiesFile = the build.properties file
-NewProjectCreationOperation_copyingJar = Copying "{0}" JAR ...
-NewProjectCreationOperation_errorImportingJar = Error importing jar "{0}"
-
-AbstractTemplateSection_generating = Generating content...
-
-BuildAction_Validate = Validating...
-BuildAction_Generate = Generating the build script...
-BuildSiteJob_message=Compilation errors occurred during the build.  Logs can be found in 'logs.zip' at the root of the site project.
-BuildAction_Update = Updating...
-BuildPage_custom=Custom Build
-BuildPage_name=Build
-BuildAction_ErrorDialog_Title = Validation Error
-BuildAction_ErrorDialog_Message = Build script cannot be generated because the file contains errors.
-
-NewFeatureWizard_wtitle = New Feature
-NewFeatureWizard_MainPage_title = Feature Name
-NewFeatureWizard_MainPage_desc = Define the name of the new feature project
-NewFeatureWizard_SpecPage_title = Feature Properties
-NewFeatureWizard_SpecPage_desc = Define properties that will be placed in the feature.xml file
-NewFeatureWizard_SpecPage_id = Feature &ID:
-NewFeatureWizard_SpecPage_name = Feature Na&me:
-NewFeatureWizard_SpecPage_version = Feature &Version:
-NewFeatureWizard_SpecPage_provider = Feature &Provider:
-NewFeatureWizard_SpecPage_description=Description:
-NewFeatureWizard_SpecPage_versionFormat = Version must be in 'major.minor.service' format
-NewFeatureWizard_sampleCopyrightURL= [Enter Copyright URL here.]
-NewFeatureWizard_sampleCopyrightDesc= [Enter Copyright Description here.]
-NewFeatureWizard_sampleLicenseURL= [Enter License URL here.]
-NewFeatureWizard_sampleLicenseDesc= [Enter License Description here.]
-NewFeatureWizard_sampleDescriptionURL = [Enter Feature URL here.]
-NewFeatureWizard_sampleDescriptionDesc = [Enter Feature Description here.]
-NewSiteProjectCreationPage_webTitle= Web Resources
-NewFeatureWizard_SpecPage_missing = Feature ID must be set
-NewFeatureWizard_SpecPage_pmissing = Patch ID must be set
-NewFeatureWizard_SpecPage_invalidId = Invalid ID.  Legal characters are A-Z a-z 0-9 . _
-
-NewFeatureWizard_PlugPage_title = Referenced Plug-ins and Fragments
-NewFeatureWizard_PlugPage_desc = Select the plug-ins and fragments from your workspace to package into the new feature.
-
-NewFeatureWizard_creatingProject = Creating feature project...
-NewFeatureWizard_creatingFolders = Creating folder structure...
-NewFeatureWizard_creatingManifest = Creating feature manifest...
-NewFeatureWizard_overwriteFeature = A feature by the same name already exists on disk.  Would you like to overwrite?
-NewFeatureWizard_SpecPage_library = Ins&tall handler library:
-NewFeatureWizard_SpecPage_customProject = The feature will contain a custom install &handler
-NewFeatureWizard_SpecPage_patch_customProject = The feature patch will contain a custom install handler
-NewFeatureWizard_SpecPage_patchProperties=Feature patch properties
-NewFeatureWizard_SpecPage_error_library = Library name cannot be blank.
-
-FeatureDetailsSection_title = Feature Properties
-FeatureDetailsSection_desc = Properties for the selected feature.  "*" denotes a required field.
-FeatureDetailsSection_url=URL*:
-FeatureDetailsSection_patch=This feature is a patch for another feature
-FeatureDetailsSection_requiredURL=Enter a valid URL for the feature on the site.
-FeatureDetailsSection_requiredURL_title=URL Required.
-
-SiteEditor_PortabilitySection_title = Feature Environments
-SiteEditor_PortabilitySection_desc = Specify the environments in which this feature can be installed.\n\
-Leave blank if the feature does not contain platform-specific code.
-SiteEditor_PortabilitySection_os = Operating Systems:
-SiteEditor_PortabilitySection_ws = Window Systems:
-SiteEditor_PortabilitySection_nl = Languages:
-SiteEditor_PortabilitySection_arch = Architecture:
-SiteEditor_PortabilitySection_edit = Browse...
-SiteEditor_PortabilityChoicesDialog_title = Portability Choices
-
-FeaturePatch_wtitle = New Feature Patch
-FeaturePatch_MainPage_title = Feature Patch Name
-FeaturePatch_MainPage_desc = Define the name of the new feature patch.
-PatchSpec_title = Patch Properties
-PatchSpec_desc = Define properties that will be placed into the feature.xml file.
-NewFeaturePatch_SpecPage_id = Patch I&d:
-NewFeaturePatch_SpecPage_name = Patch N&ame:
-NewFeaturePatch_SpecPage_provider = Patch P&rovider:
-NewFeaturePatch_SpecPage_notFound = Feature {0} not found.
-FeatureSelectionDialog_title = Feature Selection
-FeatureSelectionDialog_message = &Select a feature:
-PatchPlugins_title = Included Plug-ins and Fragments
-PatchPlugins_desc = Select the plug-ins and fragments included in your feature that will be patched.
-
-VersionSyncWizard_wtitle = Feature Versions
-VersionSyncWizard_title = Version Synchronization
-VersionSyncWizard_desc = Choose a method to synchronize feature and plug-in versions.
-VersionSyncWizard_group = Synchronization Options
-VersionSyncWizard_useComponent = Force feature version into plug-in and fragment manifests
-VersionSyncWizard_usePlugins = Copy versions from plug-in and fragment manifests
-VersionSyncWizard_usePluginsAtBuild = Synchronize versions on build (recommended)
-VersionSyncWizard_synchronizing = Synchronizing versions...
-
-JavaAttributeWizard_wtitle = New Java Class
-
-ExtensionsPage_collapseAll=Collapse All
-ExtensionPointDetails_title=Extension Point Details
-ExtensionPointDetails_desc=Set the properties of the selected extension point.
-ExtensionPointDetails_id=ID:
-ExtensionPointDetails_name=Name:
-ExtensionPointsPage_title=Extension Points
-ExtensionPointsPage_tabName=Extension Points
-ExtensionPointDetails_schema=Schema:
-ExtensionPointDetails_schemaLinks=<form>\
-<p><img href="search"/> <a href="search">Find references</a></p>\
-<p><img href="desc"/> <a href="desc">Open extension point description</a></p>\
-</form>
-ExtensionPointsSection_message1=Would you also like to delete the corresponding schema file:
-ExtensionPointsSection_showDescription=Show Description
-ExtensionPointDetails_browse=Browse...
-ExtensionPointsSection_title=Delete Extension Point Schema
-ExtensionPointDetails_noSchemaLinks=<form>\
-<p><img href="search"/> <a href="search">Find references</a></p>\
-</form>
-ExtensionElementDetails_desc=Set the properties of the selected element.
-ExtensionDetails_noPoint_title=Extension Point Description
-ExtensionDetails_extensionPointLinks=<form>\
-<p><img href="search"/> <a href="search">Find declaring extension point</a></p>\
-<p><img href="desc"/> <a href="desc">Open extension point description</a></p>\
-</form>
-ExtensionElementDetails_setDesc=Set the properties of "{0}"
-ExtensionEditorSelectionPage_title=Extension Editors
-ExtensionEditorSelectionPage_message=Ex&tension Editors:
-ExtensionEditorSelectionPage_desc=Choose one of the provided wizards to edit the selected extension
-ShowDescriptionAction_noPoint_desc=Description for extension point "{0}" cannot be found.
-ExtensionElementDetails_title=Extension Element Details
-
-BaseExtensionPoint_pluginId = &Plug-in ID:
-BaseExtensionPoint_id = &Extension Point ID:
-BaseExtensionPoint_name = Extension Point &Name:
-BaseExtensionPoint_missingId = Plug-in ID and Extension Point properties must be set
-BaseExtensionPoint_noPlugin_missingId = Extension Point ID and Name must be set.
-BaseExtensionPoint_malformedId = Extension Point ID contains invalid characters.  Legal characters are "a-z", "A-Z", "0-9", and "_".
-BaseExtensionPoint_schema = Extension Point &Schema:
-BaseExtensionPoint_schemaLocation = C&ontainer:
-BaseExtensionPoint_edit = E&dit extension point schema when done
-BaseExtensionPoint_shared = &Create shared schema for inclusion
-BaseExtensionPoint_sections_overview = [Enter description of this extension point.]
-BaseExtensionPoint_sections_since = [Enter the first release in which this extension point appears.]
-BaseExtensionPoint_sections_usage = [Enter extension point usage example here.]
-BaseExtensionPoint_sections_api = [Enter API information here.]
-BaseExtensionPoint_sections_supplied = [Enter information about supplied implementation of this extension point.]
-BaseExportWizard_confirmReplace_desc=The file "{0}" already exists.  Do you want to overwrite it?
-BaseExportWizardPage_packageJARs=&Package plug-ins as individual JAR archives
-BaseExportWizardPage_javacTarget=&Generated .class files compatibility:
-BaseExportWizardPage_javacSource=S&ource Compatibility:
-BaseExportWizard_wtitle=Export
-BaseExportWizardPage_fPackageJARs=&Package features and plug-ins as individual JAR archives (required for JNLP and update sites)
-BaseExportWizardPage_compilerOptions=Compiler Options
-BaseFeatureSpecPage_patchGroup_title=Properties of feature being patched
-BaseImportWizardSecondPage_autobuild=Build projects after the import operation completes
-BaseFeatureSpecPage_featurePropertiesGroup_title = Feature properties
-BaseFeatureSpecPage_browse=Browse...
-BaseFeatureSpecPage_customGroup=Custom install handler settings
-BaseExtensionPoint_sections_copyright=
-BaseExportWizard_confirmReplace_title=Confirm Replace
-BaseExtensionPoint_generating = Generating schema file...
-GenericExtensionWizard_wtitle = New Extension
-GeneralInfoSection_version=Version:
-GeneralInfoSection_provider=Provider:
-GeneralInfoSection_pluginId=Host plug-in:
-GeneralInfoSection_pluginVersion=Host version:
-GeneralInfoSection_hostMinVersionRange=Host minimum version:
-GeneralInfoSection_hostMaxVersionRange=Host maximum version:
-
-NewWizard_wtitle = New
-NewExtensionWizard_wtitle = New Extension
-NewExtensionWizard_title = Extension Wizard Selection
-NewElementAction_generic=Generic
-NewExtensionWizard_desc = Choose a wizard that will guide you through the new extension creation
-NewExtensionWizard_statusMessage = Select a wizard to create new extension
-NewExtensionWizard_PointSelectionPage_title = Extension Point Selection
-NewExtensionWizard_PointSelectionPage_desc = Select an extension point from those available in the list.
-NewExtensionRegistryReader_missingProperty=Cannot create category: id or name is missing
-NewExtensionTemplateWizard_generating=Generating content...
-NewExtensionWizard_PointSelectionPage_filterCheck = &Show only extension points from the required plug-ins
-NewExtensionWizard_PointSelectionPage_descButton = &Details
-NewExtensionWizard_PointSelectionPage_dependencyTitle = New plug-in dependency
-NewExtensionWizard_PointSelectionPage_dependencyMessage = Do you want to add plug-in {0}, declaring the {1} extension point, to the list of plug-in dependencies?
-NewExtensionWizard_PointSelectionPage_availExtPoints_label = Available extension points:
-NewExtensionWizard_PointSelectionPage_contributedTemplates_title = Available templates:
-NewExtensionWizard_PointSelectionPage_contributedTemplates_label= Available templates for {0}:
-NewExtensionWizard_PointSelectionPage_showDetails = Show Details
-NewExtensionWizard_PointSelectionPage_templateDescription = Create a new extension from the {0} template.
-NewExtensionWizard_PointSelectionPage_pluginDescription = Create a new extension from the {0} extension point.
-
-ExtensionEditorWizard_wtitle = Edit Extension
-
-NewExtensionPointWizard_wtitle = New Extension Point
-NewExtensionPointWizard_title = Extension Point Properties
-NewExtensionPointWizard_desc = Specify properties of the new extension point.
-
-NewSchemaFileWizard_wtitle = New Extension Point Schema File
-NewSchemaFileWizard_title = Extension Point Schema Properties
-NewSchemaFileWizard_desc = Specify properties of the extension point schema file.
-
-ConvertedProjectWizard_title = Convert Existing Projects
-ConvertedProjectWizard_desc = Select existing projects to add PDE capability.
-ConvertedProjectWizard_projectList = &Available projects
-ConvertedProjectWizard_converting = Converting ...
-ConvertedProjectWizard_updating = Updating build path...
-ConvertProjectsAction_find=Find Projects to Convert
-ConvertProjectsAction_none= There are no projects to convert.
-
-
-### Supplied templates
-
-PluginCodeGeneratorWizard_title = New plug-in project with custom templates
-PluginContentPage_invalidAppID=Invalid application ID.  Legal characters are: A-Z a-z 0-9 _
-
-EditorNewWizard_wtitle = New plug-in project with a sample XML editor
-EditorTemplate_title = Sample XML Editor
-EditorTemplate_desc = Choose the options that will be used to generate the XML editor.
-EditorTemplate_packageName = &Java Package Name:
-EditorTemplate_editorClass = &Editor Class Name:
-EditorTemplate_editorName = Editor &Name:
-EditorTemplate_fileExtension = &File Extension:
-EditorTemplate_defaultEditorName = Sample XML Editor
-
-HelloWorldNewWizard_wtitle = New Hello World plug-in project
-HelloWorldTemplate_title = Sample Action Set
-HelloOSGiNewWizard_title=Pure OSGi Bundle Wizard
-HelloOSGiTemplate_pageTitle=Basic OSGi Bundle
-HelloWorldTemplate_desc= This template will generate a sample action set extension with a menu, a \
-menu item and a tool bar button.
-HelloRCPNewWizard_title=New Hello RCP Project
-HelloRCPTemplate_title=Basic RCP application
-HelloRCPTemplate_desc=This template creates a minimal standalone RCP application that consists of an application window with a title.
-HelloRCPTemplate_appId=A&pplication ID:
-HelloRCPTemplate_appClass=App&lication class:
-HelloNonUIRCPNewWizard_title=New Hello Command Line RCP Project
-HelloNonUIRCPTemplate_title=Basic Non UI RCP application
-HelloNonUIRCPTemplate_desc=This template creates a minimal standalone headless RCP application that prints text and exits.
-HelloNonUIRCPTemplate_appClass=App&lication class:
-HelloNonUIRCPTemplate_messageText=&Message text:
-HelloNonUIRCPTemplate_defaultMessage=Hello RCP World!
-HelloWorldTemplate_packageName = &Java Package Name:
-HelloWorldTemplate_className = &Action Class Name:
-HelloRCPTemplate_windowTitle=Application window &title:
-HelloRCPTemplate_perspective=Pe&rspective name:
-HelloWorldTemplate_messageText = &Message Box Text:
-HelloOSGiTemplate_startMessage=Start Message:
-HelloWorldTemplate_defaultMessage = Hello, Eclipse world
-HelloOSGiTemplate_pageDescription=This template creates a basic OSGi bundle that prints text to the console when it starts and stops.
-HelloWorldTemplate_sampleActionSet = Sample Action Set
-HelloWorldTemplate_sampleMenu = Sample &Menu
-HelloOSGiTemplate_stopMessage=Stop Message:
-HelloWorldTemplate_sampleAction = &Sample Action
-
-IntroNewWizard_wtitle = New RCP Project with an intro
-IntroTemplate_title = Sample Intro
-IntroTemplate_desc = This template creates a standalone RCP application with an intro.
-IntroSection_new=New...
-IntroTemplate_productID = Product ID:
-IntroSection_introLabel=Specify the welcome page branded with this product:
-IntroSection_introInput=Intro ID:
-IntroTemplate_productName = Product Name:
-IntroTemplate_application = Application ID:
-IntroSection_sectionText=Welcome Page
-IntroTemplate_generate = Generate:
-IntroTemplate_generateStaticContent = static content
-IntroTemplate_generateDynamicContent = dynamic content
-IntroSection_undefinedProductIdMessage=Your plug-in does not have any defined product ids. You must define one before adding an intro to this configuration.\nWould you like to create a new one now?
-
-
-ViewRCPNewWizard_title=New RCP Project with a view
-ViewRCPTemplate_title=Single View RCP application
-ViewRCPTemplate_desc=This template creates a standalone RCP application that consists of an application window with a single view.
-ViewRCPTemplate_appId=A&pplication ID:
-ViewRCPTemplate_appClass=App&lication class:
-ViewRCPTemplate_packageName = &Java package name:
-ViewRCPTemplate_className = &Action class:
-ViewRCPTemplate_windowTitle=Application window &title:
-
-MultiPageEditorNewWizard_wtitle = New plug-in project with a multi-page editor
-MultiPageEditorTemplate_title = Sample Multi-Page Editor
-MultiPageEditorTemplate_desc = Choose the options that will be used to generate the multi-page editor.
-MultiPageEditorTemplate_packageName = &Java Package Name:
-MultiPageEditorTemplate_className =	&Editor Class Name:
-MultiPageEditorTemplate_contributor = Editor &Contributor Class Name:
-MultiPageEditorTemplate_editorName = E&ditor Name:
-MultiPageEditorTemplate_defaultEditorName = Sample Multi-page Editor
-MultiPageEditorTemplate_extensions = F&ile Extension:
-
-NewWizardTemplate_title =New Wizard Options
-NewWizardTemplate_desc =The provided options control the new wizard that will be created.
-NewWizardTemplate_packageName = &Java Package Name:
-NewWizardTemplate_categoryId = &Wizard Category ID:
-NewWizardTemplate_categoryName = Wi&zard Category Name:
-NewWizardTemplate_className = Wizard &Class Name:
-NewWizardTemplate_pageClassName = Wizard &Page Class Name:
-NewWizardTemplate_wizardName = Wizard &Name:
-NewWizardTemplate_defaultName = Multi-page Editor file
-NewWizardTemplate_extension = Fi&le Extension:
-NewWizardTemplate_fileName = &Initial File Name:
-NewProductFileWizard_title=Product Configuration
-
-PopupMenuNewWizard_wtitle = New plug-in project with popup menus
-PopupMenuTemplate_title = Sample Popup Menu
-PointSelectionPage_tab1=Extension Points
-PointSelectionPage_tab2=Extension Wizards
-PopupMenuTemplate_desc = This template creates a submenu and adds a new action to a selected object's popup menu.
-PopupMenuTemplate_targetClass = &Target Object's Class:
-PopupMenuTemplate_nameFilter =	N&ame Filter:
-PopupMenuTemplate_newAction=NewAction
-PopupMenuTemplate_submenuName =	&Submenu Name:
-PopupMenuTemplate_defaultSubmenuName = New Submenu
-PopupMenuTemplate_actionLabel =	Action &Label:
-PopupMenuTemplate_defaultActionName = New Action
-PopupMenuTemplate_packageName =	&Java Package Name:
-PopupMenuTemplate_actionClass =	Action &Class:
-PointSelectionPage_categories=Wizard Categories:
-PopupMenuTemplate_enabledFor =	Action is enabled for:
-PopupMenuTemplate_singleSelection = S&ingle selection
-PopupMenuTemplate_multipleSelection = &Multiple selection
-
-PreferencePageTemplate_title = Sample Preference Page
-PreferencePageTemplate_desc = The provided options allow you to control the preference page that will be created.
-PreferencePageTemplate_packageName = &Java Package Name:
-PreferencePageTemplate_className = &Page Class Name:
-PreferencePageTemplate_pageName = Page &Name:
-PreferencePageTemplate_defaultPageName =Sample Preferences
-Product_PluginSection_includeFragments=Include fragments when computing required plug-ins
-ProductDefinitonWizardPage_productGroup=Product Definition
-ProductDefinitonWizardPage_productExists=Specified product already exists
-ProductDefinitonWizardPage_application=&Application:
-ProductDefinitonWizardPage_noProductID=Product ID is not set
-ProductDefinitonWizardPage_noProductName=Product name is not set
-ProductFileWizadPage_existingProduct=&Use an existing product:
-ProductFileWizadPage_existingLaunchConfig=U&se a launch configuration:
-ProductDefinitonWizardPage_productDefinition=<form><p>A product, the Eclipse unit of branding, is defined declaratively as an <a href="products">org.eclipse.core.runtime.products</a> extension inside a plug-in.</p></form>
-ProductDefinitonWizardPage_applicationGroup=Product Application
-ProductDefinitonWizardPage_notInWorkspace=Specified plug-in must be present in the workspace
-ProductDefinitionOperation_readOnly = The operation cannot proceed because plug-in ''{0}'' has a read-only manifest file.
-ProductDefinitionOperation_malformed = The operation cannot proceed because plug-in ''{0}'' has a malformed manifest file.
-
-PropertyPageNewWizard_wtitle = New plug-in project with a property page
-PropertyPageTemplate_title = Sample Property Page
-PropertyPageTemplate_desc = This template adds a property page to a resource and will appear in \
-the Properties Dialog for that resource.
-PropertyPageTemplate_packageName = &Java Package Name:
-PropertyPageTemplate_pageClass = &Property Page Class:
-PropertyPageTemplate_pageName = P&roperty Page Name:
-PropertyPageTemplate_defaultPageName = Sample Page
-PropertyPageTemplate_targetClass = &Target Class:
-PropertyPageTemplate_nameFilter = &Name Filter:
-
-TemplateSelectionPage_title = Template Selection
-TemplateSelectionPage_desc = Choose templates that will contribute content to this plug-in from the list. Click on a template entry to read its description.
-TemplateSelectionPage_table = &Available Templates:
-TemplateSelectionPage_column_name = Name
-TemplateSelectionPage_column_point = Extension Point
-
-ViewNewWizard_wtitle = New plug-in project with a sample view
-ViewTemplate_title0 = Main View Settings
-ViewTemplate_desc0 = Choose the way the new view will be added to the plug-in.
-ViewTemplate_title1 = View Features
-ViewTemplate_desc1 = Choose the features that the new view should have.
-ViewTemplate_packageName = &Java Package Name:
-ViewTemplate_className = &View Class Name:
-ViewTemplate_name = View Na&me:
-ViewTemplate_defaultName = Sample View
-ViewTemplate_categoryId = View &Category ID:
-ViewTemplate_categoryName = V&iew Category Name:
-ViewTemplate_defaultCategoryName = Sample Category
-ViewTemplate_select = Select the viewer type that should be hosted in the view:
-ViewTemplate_table = &Table viewer (can also be used for lists)
-ViewTemplate_tree = T&ree viewer
-ViewTemplate_doubleClick = &Add double-click support
-ViewTemplate_popup = A&dd actions to the pop-up menu
-ViewTemplate_toolbar = Add a&ctions to the view's tool bar
-ViewTemplate_pulldown = Add ac&tions to the view's pull-down menu
-ViewTemplate_sorting = Add &support for sorting
-ViewTemplate_filtering = Add support for filtering
-ViewTemplate_addToPerspective = A&dd the view to the resource perspective
-
-HelpTemplate_title = Sample Help Table of Contents
-HelpTemplate_desc = Create a standalone or integrated table of contents.
-HelpTemplate_tocLabel = &Label for table of contents:
-HelpTemplate_isPrimary = Primary
-HelpTemplate_generateTest = Generate a primary table of contents for testing
-HelpTemplate_gettingStarted = Generate a 'Getting Started' category
-HelpTemplate_concepts = Generate a 'Concepts' category
-HelpTemplate_tasks = Generate a 'Tasks' category
-HelpTemplate_reference = Generate a 'Reference' category
-HelpTemplate_samples = Generate a 'Samples' category
-
-BuilderNewWizard_wtitle = New plug-in project with a sample project builder and nature
-BuilderTemplate_title = Sample Project Builder and Nature
-BuilderTemplate_desc = Creates an incremental project builder and project nature.
-BuilderTemplate_builderClass = Project Builder &Class Name:
-BuilderTemplate_builderId = Project Builder &ID:
-BuilderTemplate_builderName = Project Builder &Name:
-BuilderTemplate_natureClass = Project Nature C&lass Name:
-BuilderTemplate_natureId = Project Nature I&D:
-BuilderTemplate_natureName = &Project Nature Name:
-BuilderTemplate_packageLabel = &Java Package Name:
-BuilderTemplate_actionLabel = Add/Remove Sample Nature
-BuilderTemplate_defaultBuilderName = Sample Project Builder
-BuilderTemplate_defaultNatureName = Sample Project Nature
-BuilderTemplate_markerName = XML Problem
-BuilderTemplate_generateAction = Generate a popup menu &action to toggle project nature
-
-####
-
-PluginSelectionDialog_title = Plug-in Selection
-PluginSelectionDialog_message = &Select a Plug-in:
-PluginImportOperation_linking=Linking content...
-PluginContentPage_appQuestion=Would you like to create a rich client application?
-PluginDevelopmentPage_equinox=&Show sections specific to the Equinox OSGi framework
-PluginSelectionDialog_workspacePlugins = Workspace Plug-ins
-PluginValidationOperation_invalidSingular=The following plug-in has an invalid manifest file:
-PluginValidationOperation_invalidPlural=The following plug-ins contain invalid manifest files:
-PluginSelectionDialog_externalPlugins = External Plug-ins
-
-ImportWizard_title = Import Plug-ins and Fragments
-ImportWizard_noToAll = No To A&ll
-ImportWizard_messages_title = Plug-in Import
-ImportWizard_messages_exists = Project ''{0}'' already exists. Is it OK to replace it?
-ImportWizard_FirstPage_title = Import External Plug-ins and Fragments
-ImportWizard_FirstPage_warning = Make sure to add the source code locations for the plug-ins you are importing to the Source Code Locations preference page
-ImportWizard_FirstPage_desc = Create projects from external plug-ins and fragments.
-ImportWizard_FirstPage_importGroup = Plug-ins and Fragments to Import
-ImportWizard_FirstPage_importPrereqs = &Import plug-ins and fragments required by existing workspace plug-ins
-ImportWizard_FirstPage_scanAll = &Select from all plug-ins and fragments found at the specified location
-ImportWizard_FirstPage_importAs = Import As
-ImportWizard_FirstPage_binary = Bin&ary projects
-ImportWizard_FirstPage_binaryLinks = Binar&y projects with linked content
-ImportWizard_FirstPage_source = Pro&jects with source folders
-ImportWizard_FirstPage_codeLocations = Source &Code Locations...
-ImportWizard_FirstPage_source_label = Locations to be searched for library JARs source attachment:
-ImportWizard_FirstPage_variables = Variables in library paths are resolved as specified in the Preferences:
-ImportWizard_FirstPage_env = &Environment Variables...
-ImportWizard_FirstPage_importFrom = Import From
-ImportWizard_FirstPage_target = T&he target platform (as specified in the Preferences)
-ImportWizard_FirstPage_goToTarget = &Target Platform...
-ImportWizard_FirstPage_otherFolder = &Plug-in Location:
-ImportWizard_FirstPage_browse = B&rowse...
-ImportWizard_SecondPage_addFragments = Include fra&gments when computing required plug-ins
-
-ImportWizard_messages_folder_title = Plug-in Directory
-ImportWizard_messages_folder_message = Select a directory that contains plug-ins or fragments
-
-ImportWizard_errors_locationMissing = Enter the location of the build.
-ImportWizard_errors_buildFolderInvalid = Build folder path is invalid.
-ImportWizard_errors_buildFolderMissing =Build folder directory does not exist.
-
-ImportWizard_expressPage_title = Selection
-ImportWizard_expressPage_desc = Select the workspace plug-ins whose required plug-ins and fragments are to be imported.
-ImportWizard_expressPage_nonBinary = E&xisting non-binary workspace plug-ins:
-ImportWizard_expressPage_total = Total: {0}
-
-ImportWizard_DetailedPage_title = Selection
-ImportWizard_DetailedPage_desc = Select plug-ins and fragments to import.
-ImportWizard_DetailedPage_availableList = &Plug-ins and Fragments Found:
-ImportWizard_DetailedPage_importList = P&lug-ins and Fragments to Import:
-ImportWizard_DetailedPage_add = &Add -->
-ImportWizard_DetailedPage_addAll = A&dd All -->
-ImportWizard_DetailedPage_remove = <-- &Remove
-ImportWizard_DetailedPage_removeAll = <-- Re&move All
-ImportWizard_DetailedPage_swap = <-- &Swap -->
-ImportWizard_DetailedPage_existing = Exis&ting Plug-ins -->
-ImportWizard_DetailedPage_existingUnshared = Existing &Unshared -->
-ImportWizard_DetailedPage_addRequired = Re&quired Plug-ins -->
-ImportWizard_DetailedPage_count = {0} out of {1} selected
-ImportWizard_DetailedPage_locate = Locate Plug-ins and Fragments
-ImportWizard_DetailedPage_search = &ID (* = any string, ? = any character):
-
-ImportWizard_operation_creating = Creating projects from plug-ins...
-ImportWizard_operation_multiProblem = Problems detected while importing plug-ins
-ImportWizard_operation_problem = Problem while importing plug-in ''{0}'': {1}
-ImportWizard_operation_creating2 = Creating ''{0}''...
-ImportWizard_operation_extracting = Extracting...
-ImportWizard_operation_copyingSource = Copying source...
-
-FeatureImportWizard_FirstPage_title = Import External Features
-FeatureImportWizard_FirstPage_desc = Create projects from external features. Note that this \
-wizard should only be used for feature-based launching.
-FeatureImportWizard_FirstPage_runtimeLocation = &Choose from features in the target platform
-FeatureImportWizard_FirstPage_otherLocation = &Import features from the file system
-FeatureImportWizard_FirstPage_otherFolder = &Feature Location:
-FeatureImportWizard_FirstPage_binaryImport = Import as binary project
-FeatureImportWizard_FirstPage_browse = B&rowse...
-FeatureImportWizard_messages_folder_title = Feature Directory
-FeatureImportWizard_messages_folder_message = Select a directory that contains features
-FeatureImportWizard_errors_locationMissing = Feature location is missing
-FeatureImportWizard_errors_buildFolderInvalid = Feature Location is not a valid path
-FeatureImportWizard_errors_buildFolderMissing= The directory specified does not exist
-
-FeatureImportWizard_DetailedPage_title = Selection
-FeatureImportWizard_DetailedPage_desc = Select features to import.
-FeatureImportWizard_DetailedPage_featureList = &Features found:
-FeatureImportWizard_messages_loadingRuntime = Loading features:
-FeatureImportWizard_messages_updating = Updating...
-FeatureImportWizard_messages_loadingFile = Loading features:
-FeatureImportWizard_title = Import Features
-FeatureMatchSection_patch=The selected feature is patched by this feature
-FeatureSection_removeAll=Remove All
-FeatureImportWizard_noToAll = No to A&ll
-FeatureImportWizard_messages_noFeatures = No features found. Ensure that the chosen directory contains 'features' folder.
-FeatureImportWizard_messages_title = Feature Import
-FeatureImportWizard_messages_exists = Project ''{0}'' already exists. Is it OK to replace it?
-
-FeatureImportWizard_operation_creating = Creating projects from features...
-FeatureImportWizard_operation_multiProblem = Problems detected while importing features
-FeatureImportWizard_operation_problem = Problem while importing feature ''{0}'': {1}
-FeatureImportWizard_operation_creating2 = Creating ''{0}''...
-
-UpdateBuildpathWizard_wtitle = Java Classpath
-UpdateBuildpathWizard_title = Update Java class path
-UpdateBuildpathWizard_desc = Selected plug-ins and fragments will have their class path recomputed.
-UpdateBuildpathWizard_availablePlugins = &Available plug-ins and fragments:
-
-###### Actions ########################################
-EditorActions_save = &Save
-EditorActions_cut = Cu&t
-EditorActions_copy = &Copy
-EditorActions_paste = &Paste
-EditorActions_revert = Re&vert
-Actions_properties_label = P&roperties
-Actions_open_label = &Open
-Actions_refresh_label = &Refresh
-Actions_delete_label = &Delete
-Actions_synchronizeVersions_label = S&ynchronize Versions...
-Actions_apply_label = &Apply
-Actions_reset_label = &Reset
-Actions_edit_label = &Edit
-
-Actions_delete_flabel = Delete
-Actions_apply_flabel = Apply
-Actions_reset_flabel = Reset
-
-Menus_new_label = &New
-Menus_edit_label = &Edit
-Menus_goTo_label = Traverse
-
-Actions_Feature_OpenProjectWizardAction = &New Feature Project...
-Actions_Site_OpenProjectWizardAction = &New Update Site...
-
-UpdateClasspathJob_error_title = Update Classpaths
-UpdateClasspathJob_error_message = Updating failed. See log for details.
-UpdateClasspathJob_task = Update classpaths...
-UpdateClasspathJob_title = Updating Plug-in Classpatshs
-
-RuntimeWorkbenchShortcut_launchFailed=Failed to launch the Eclipse application
-RuntimeWorkbenchShortcut_title=Select Configuration
-RuntimeWorkbenchShortcut_select_debug=Select a launch configuration to debug:
-RuntimeWorkbenchShortcut_select_run=Select a launch configuration to run:
-RuntimeWorkbenchShortcut_name=Eclipse Application
-RuntimeInfoSection_addEntry=Add Entry
-RuntimeInfoSection_rename=Rename Library
-BaseExtensionPointMainPage_noContainer=You must select a valid target container (project or folder) first.
-BaseExtensionPointMainPage_pluginId_tooltip = Browse workspace plug-ins
-BaseExtensionPointMainPage_schemaLocation_tooltip = Select new schema file container
-BaseExtensionPointMainPage_pluginBrowse = B&rowse...
-BaseExtensionPointMainPage_findBrowse = Bro&wse...
-BaseProductCreationOperation_taskName=Creating product configuration...
-BaseExtensionPointMainPage_since=Since:
-BaseExtensionPointMainPage_schemaLocation_title = Folder Selection
-BaseExtensionPointMainPage_schemaLocation_desc = Select a target container for extension point schema:
-SourcePreferencePage_new_title=New Source Location
-SourcePreferencePage_column_name=Name
-SourcePreferencePage_column_path=Path
-SourcePreferencePage_dialogMessage=Choose a source code location:
-EditorPreferencePage_useSourcePage = &Use source page as the default
-EditorPreferencePage_askDefaultPage = Con&firm before changing the default page
-EditorPreferencePage_desc=Common PDE editor settings.
-EditorPreferencePage_colorSettings = Source page color settings:
-EditorPreferencePage_text=&Text:
-EditorPreferencePage_proc=Pr&ocessing instructions:
-EditorPreferencePage_string=&Constant strings:
-EditorPreferencePage_tag=Ta&gs:
-EditorPreferencePage_comment=Co&mments:
-PluginContentPage_yes=&Yes
-DefaultPageDialog_title=Default Editor Page
-DefaultPageDialog_stopAskingButton=Do not &ask this question again
-
-
-#################Search Page###############################
-SearchPage_searchString = Search s&tring (*=any string, ?=any character):
-SearchPage_caseSensitive = &Case sensitive
-SearchPage_searchFor = Search For
-SearchResult_matches=matches
-SearchPage_limitTo = Limit To
-SearchPage_externalScope = External Scope
-SearchPage_plugin = &Plug-in
-SearchPage_fragment = &Fragment
-SelectionPage_title=Selection
-SearchPage_extPt = E&xtension Point
-SearchPage_declarations = &Declarations
-SearchPage_references = &References
-SearchPage_allOccurrences = All &Occurrences
-SearchPage_all = &All
-SearchPage_enabledOnly = &Enabled Plug-ins Only
-SearchPage_none = &None
-Search_singleMatch = match
-SearchResult_match=match
-SelectionPage_desc=Select the sample to create from the provided list.
-Search_multipleMatches = matches
-SearchAction_references = Re&ferences
-SearchAction_Declaration = Declaratio&n
-ShowDescriptionAction_label = Sho&w Description
-ShowDescriptionAction_title=Extension Point Description
-ShowSampleAction_msgTitle=Samples
-DependencyExtent_singular = dependency
-DependencyExtent_plural = dependencies
-DetailsBlock_horizontal=Horizontal layout
-DependencyExtent_found = found
-DependencyExtent_searching = Searching...
-DependencyExtentAction_label = Compute Dependenc&y Extent
-DependencyExtent_references = References in
-DependencyExtentQuery_label=Dependency on
-UnusedDependencies_title = Unused Dependencies
-UnusedDependencies_action = Find &Unused Dependencies
-UnusedDependencies_notFound = No unused dependencies were found.
-UnusedDependenciesJob_viewResults=View Results
-UnusedDependenciesAction_jobName=Find unused dependencies
-UnusedDependencies_found = The following dependencies are not used:
-UnusedDependencies_remove = Select the unused dependencies to be removed:
-UnusedDependencies_analyze = Analyzing dependencies...
-UnusedDependencies_unused = unused
-
-DependenciesView_open= &Open
-DependenciesView_ShowCalleesAction_label = Calle&es
-DependenciesView_ShowCalleesAction_description = Show Callees
-DependenciesView_ShowCalleesAction_tooltip = Show Callees
-DependenciesView_ShowCallersAction_label = Show Calle&rs
-DependenciesView_ShowCallersAction_description = Show Callers
-DependenciesView_ShowCallersAction_tooltip = Show Callers
-DependenciesView_ShowListAction_label = F&lat Layout
-DependenciesView_ShowListAction_description = Set Flat Layout
-DependenciesView_ShowListAction_tooltip = Set Flat Layout
-DependenciesView_ShowTreeAction_label = &Hierarchical Layout
-DependenciesView_ShowTreeAction_description = Set Hierarchical Layout
-DependenciesView_ShowTreeAction_tooltip = Set Hierarchical Layout
-DependenciesView_ShowLoopsAction_label = Display &Cycles
-DependenciesView_ShowLoopsAction_description = Show Cycles
-DependenciesView_ShowLoopsAction_tooltip = Show Cycles in Dependency Graph
-DependenciesView_callees_tree_title = Hierarchical view of plug-ins required by ''{0}'':
-DependenciesView_callees_list_title = Plug-ins directly or indirectly required by ''{0}'':
-DependenciesView_callers_tree_title = Hierarchical view of plug-ins requiring ''{0}'':
-DependenciesView_callers_list_title = Plug-ins requiring ''{0}'':
-DependenciesView_cycles_title = (Cycles Detected)
-DependenciesViewTreePage_CollapseAllAction_label = &Collapse All
-DependenciesViewTreePage_CollapseAllAction_description = Collapse All
-DependenciesViewTreePage_CollapseAllAction_tooltip = Collapse All
-DependenciesPage_title=Dependencies
-DependenciesPage_tabName=Dependencies
-DependenciesPage_properties=Properties...
-DetailsBlock_vertical=Vertical layout
-DependenciesViewPage_focusOn = Focu&s On...
-DependenciesViewPage_focusOnSelection = Foc&us On ''{0}''
-DependencyAnalysisSection_title=Dependency Analysis
-DependencyAnalysisSection_loops=Dependency Loops
-DependencyAnalysisSection_noCycles=The dependency graph of this plug-in does not contain cycles.
-DependencyPropertiesDialog_version=Version:
-DependencyPropertiesDialog_versionRangeError=Minimum version must be less than or equal to maximum version
-DependencyAnalysisSection_references=References
-DependencyAnalysisSection_dialogtitle=Dependency Extent
-DependencyPropertiesDialog_properties=Properties
-DependencyExtentOperation_searching=Searching for dependencies on
-DependencyPropertiesDialog_optional=Optional
-DependencyPropertiesDialog_reexport=Reexport this dependency
-DependencyPropertiesDialog_groupText=Version to match
-DependencyExtentOperation_inspecting=Inspecting package:
-DependencyExtentSearchResult_dependency=dependency
-DependencyPropertiesDialog_invalidRange=Invalid version range
-DependencyExtentSearchResult_dependencies=dependencies
-DependencyExtentSearchResultPage_referencesInPlugin=Find references in this plug-in
-DependencyAnalysisSection_fragment_editable=<form>\
-<p><img href="search"/> <a href="unused">Find unused dependencies</a></p>\
-<p><img href="search"/> <a href="references">Find this fragment's host plug-in</a></p>\
-</form>
-DependencyAnalysisSection_noReferencesFound=No plug-ins reference this fragment.
-DependencyAnalysisSection_fragment_notEditable=<form>\
-<p><img href="search"/> <a href="references">Find this fragment's host plug-in</a></p>\
-</form>
-DependencyAnalysisSection_plugin_editable = <form>\
-<p><img href="hierarchy"/> <a href="hierarchy">Show the plug-in dependency hierarchy</a></p>\
-<p><img href="loops"/> <a href="loops">Look for cycles in the dependency graph</a></p>\
-<p><img href="search"/> <a href="unused">Find unused dependencies</a></p>\
-<p><img href="search"/> <a href="references">Find plug-ins and fragments that reference this plug-in</a></p>\
-</form>
-DependencyPropertiesDialog_invalidFormat=Invalid version format
-DependencyPropertiesDialog_comboInclusive=Inclusive
-DependencyPropertiesDialog_comboExclusive=Exclusive
-DependencyPropertiesDialog_minimumVersion=Minimum Version:
-DependencyPropertiesDialog_maximumVersion=Maximum Version:
-DependencyAnalysisSection_plugin_notEditable = <form>\
-<p><img href="hierarchy"/> <a href="hierarchy">Show the plug-in dependency hierarchy</a></p>\
-<p><img href="loops"/> <a href="loops">Look for cycles in the dependency graph</a></p>\
-<p><img href="search"/> <a href="references">Find plug-ins and fragments that reference this plug-in</a></p>\
-</form>
-
-HistoryAction_description=Open ''{0}'' in Hierarchy
-HistoryAction_tooltip=Open ''{0}'' in Hierarchy
-HistoryDropDownAction_tooltip = Previous Plug-ins
-HistoryListAction_label = More...
-HistoryListDialog_label = &Select the plug-in to open in the Plug-in Dependencies view:
-HistoryListDialog_title = Plug-in Dependencies History
-HistoryListDialog_remove_button = &Remove
-
-PluginsView_open=&Open
-PluginsView_openDependencies=Open &Dependencies
-PluginsView_asBinaryProject=As &Binary Project
-PluginsView_asSourceProject=As &Source Project
-PluginsView_showDisabled=Show &disabled external plug-ins
-PluginsView_showWorkspace=Show &workspace plug-ins
-PluginsView_textEditor=&Text Editor
-PluginWorkingSet_title=Plug-ins and Fragments Working Set
-PluginsView_systemEditor=&System Editor
-PluginsView_manifestEditor=&PDE Manifest Editor
-PluginContentPage_rcpGroup=Rich Client Application
-PluginContentPage_appClass=Application Cla&ss:
-PluginContentPage_noLibrary=Library name is not set
-PluginWorkingSet_emptyName=The name must not be empty
-PluginWorkingSet_nameInUse=A working set with that name already exists
-PluginsView_schemaEditor=PDE &Schema Editor
-PluginsView_copy=&Copy
-PluginsView_dependentPlugins=&Required Plug-ins
-PluginsView_pluginsInJavaSearch=&Plug-ins in Java Search
-PluginsView_addToJavaSearch=&Add to Java Search
-PluginsView_removeFromJavaSearch=Remove &from Java Search
-PluginsView_showInNavigator=Show In Resource &Navigator
-PluginWorkingSet_setContent=Working set content:
-PluginWorkingSet_selectAll_label=Select &All
-PluginDevelopmentPage_extensions=&Always show the Extensions and Extension Points tabs
-PluginWorkingSet_selectAll_toolTip=Select all of these plug-ins for this working set.
-PluginWorkingSet_deselectAll_label=Dese&lect All
-PluginDevelopmentPage_presentation=Plug-in Manifest Editor Presentation
-PluginGeneralInfoSection_lazyStart=Activate this plug-in when one of its classes is loaded
-PluginWorkingSet_deselectAll_toolTip=Unselect all of these plug-ins for this working set.
-PluginsView_showInPackageExplorer=Show In Package &Explorer
-PluginWorkingSet_noPluginsChecked=At least one plug-in must be checked
-PluginStatusDialog_pluginValidation=Plug-in Validation
-PluginsView_openWith=Open &With
-PluginsView_import=&Import
-PluginsView_select=Se&lect
-PluginsTab_target=Target Platform
-PluginsView_CollapseAllAction_label = &Collapse All
-PluginsView_CollapseAllAction_description = Collapse All
-PluginsView_CollapseAllAction_tooltip = Collapse All
-# Select all is part of a submenu "Select" hence the label is not "Select all"
-PluginsView_SelectAllAction_label = &All
-
-
-PluginSection_open=Open
-PluginsView_unableToOpen = Unable to open external editor: {0}
-PluginWorkingSet_setName=Working set name:
-PluginWorkingSet_message=Enter a working set name and select the working set plug-ins:
-PluginStatusDialog_label=The following problems were detected:
-PluginContentPage_appID=Application I&D:
-PluginContentPage_noApp=Application ID is not set
-PluginSection_removeAll=Remove All
-PluginsView_disabled = {0} - disabled
-PluginContentPage_no=N&o
-PluginSection_remove=Remove
-RequiredPluginsContainerPage_title=Plug-in Dependencies
-RequiredPluginsContainerPage_desc=This read-only container dynamically manages the plug-in's dependencies
-RequiredPluginsContainerPage_label=&Resolved classpath:
-
-NewSiteWizard_wtitle = New Update Site
-NewSiteWizard_MainPage_title = Update Site Project
-NewSiteWizard_creatingProject = Creating project...
-NewSiteWizard_creatingFolders = Creating folders...
-NewSiteWizard_creatingManifest = Creating manifest...
-NewSiteWizard_MainPage_desc = Create a new update site project
-NewFeatureWizard_overwriteSite = A site by the same name already exists on disk.  Would you like to overwrite?
-
-##############
-SiteHTML_checkLabel = &Generate a web page listing all available features within the site
-SiteHTML_webLabel = &Web resources location:
-SiteHTML_webError = Web resources location must be set.
-SiteHTML_loadError = Document could not be loaded by browser.
-
-##############
-FeatureBuildOperation_running = Running the scripts...
-
-CompilersConfigurationBlock_error=Error
-CompilersConfigurationBlock_warning=Warning
-CompilersConfigurationBlock_ignore=Ignore
-CompilersConfigurationBlock_plugins=&Plug-ins
-CompilersConfigurationBlock_schemas=&Schemas
-CompilersConfigurationBlock_features=&Features and Update Sites
-CompilersConfigurationBlock_sites=&Update Sites
-CompilersConfigurationBlock_label=Select the severity level for the following problems:
-CompilersConfigurationBlock_altlabel=Select the following compiler options:
-
-CompilersPreferencePage_desc=Options for manifest compilers
-CompilersPreferencePage_title=Plug-in Compiler
-
-CompilersPropertyPage_useworkspacesettings_label = Use &workspace settings
-CompilersPropertyPage_useworkspacesettings_change = &Configure Workspace Settings...
-CompilersPropertyPage_useprojectsettings_label = Use pr&oject settings
-
-compilers_p_unresolved_import= U&nresolved plug-in references:
-compilers_p_unresolved_ex_points= Un&resolved extension points:
-compilers_p_unknown_element= Ille&gal elements:
-compilers_p_unknown_attribute=&Illegal attributes:
-compilers_p_unknown_class= References to unknown &classes:
-compilers_p_unknown_resource= References to un&known resources:
-compilers_p_no_required_att=Re&quired attributes not defined:
-compilers_p_not_externalized_att = Usage of non-e&xternalized strings:
-compilers_p_deprecated = Usage of de&precated attributes and elements:
-compilers_s_create_docs = &Generate reference documentation from schemas
-compilers_s_doc_folder = Do&cumentation folder:
-compilers_s_open_tags = &Unmatched tags in documentation:
-compilers_s_forbidden_end_tags = &Illegal end tags:
-compilers_s_optional_end_tags = &Missing optional end tags:
-
-compilers_f_unresolved_plugins = U&nresolved plug-in references:
-compilers_f_unresolved_features = Un&resolved feature references:
-
-CompilersConfigurationBlock_rebuild_title=Build Needed
-CompilersConfigurationBlock_rebuild_message=The compiler settings have changed.  The project needs to be rebuilt for the changes to take effect.  Do you want to rebuild now?
-CompilersConfigurationBlock_rebuild_many_title=Build Needed
-CompilersConfigurationBlock_rebuild_many_message=The compiler settings have changed.  Some projects need to be rebuilt for the changes to take effect.  Do you want to rebuild now?
-CompilersConfigurationBlock_building = Building Projects...
-
-SchemaMarkerResolutionGenerator_label=Show the extension point reference document
-
-
-ExportWizard_Plugin_pageTitle = Deployable plug-ins and fragments
-ExportWizard_Feature_pageTitle = Deployable features
-ExportWizard_Plugin_pageBlock = &Available Plug-ins and Fragments:
-ExportWizard_Feature_pageBlock = &Available Features:
-ExportWizard_Plugin_description = Export the selected projects into a form suitable for deploying in an Eclipse product
-ExportWizard_archive = Ar&chive file:
-ExportWizard_includeSource = &Include source code
-ExportWizard_multi_platform = Export for &multiple platforms
-ExportWizard_destination = Export Destination
-ExportWizard_options = Export Options
-ExportWizard_directory = Director&y:
-ExportWizard_badDirectory = Specified directory could not be created.
-ExportWizard_workingSet = Wor&king Set...
-ExportWizard_browse = B&rowse...
-ExportWizard_browse2 = Bro&wse...
-ExportWizard_antCheck = Sa&ve as Ant script:
-ExportWizard_dialog_title = Destination Directory
-ExportWizard_dialog_message = Select a destination directory for the export operation
-ExportWizard_error_message = Errors occurred during the operation.  A zip file containing the build logs has been generated and placed at "{0}".
-ExportWizard_status_noselection = No items selected.
-ExportWizard_status_nodirectory = Destination directory must be specified.
-ExportWizard_status_nofile = Archive file must be specified.
-ExportWizard_status_noantfile = An Ant build file must be specified.
-ExtensionsPage_title=Extensions
-ExtensionsPage_tabName=Extensions
-ExtensionDetails_title=Extension Details
-ExtensionDetails_desc=Set the properties of the selected extension.
-ExtensionDetails_id=ID:
-ExtensionDetails_name=Name:
-ExtensionDetails_point=Point:
-ExportWizard_zipFileExists = The zip file specified already exists.  Would you like to overwrite it?
-ExportWizard_targetEnv_button = Tar&get Environment...
-ExportSection_successfulSync=The product's defining plug-in has been synchronized successfully.
-
-ExportJob_error_message = Errors occurred during the operation.  A zip file containing the build logs has been generated and placed at "{0}".
-ExportJob_exporting = Exporting
-ExportJob_jobTitle = PDE Export
-ExportSection_sync=Synchronize
-
-SiteEditorContributor_build=&Build
-SiteEditorContributor_rebuildAll=&Rebuild All
-GrammarPropertySource_minOccursFormat=minOccurs must be an integer that is greater or equal 0
-GrammarPropertySource_maxOccursFormat=maxOccurs must be either \"unbounded\" or an integer that is greater or equal 0
-GrammarPropertySource_minOccursValue=minOccurs must be an integer that is greater or equal 0
-GrammarPropertySource_maxOccursValue=maxOccurs must be either \"unbounded\" or an integer that is greater or equal 0
-ReferencePropertySource_minOccurs_value=valid values for \'minOccurs\' in this context are 0 and 1
-ReferencePropertySource_maxOccurs_value=\'maxOccurs\' can only be 1 in this context
-FeatureImportWizard_DetailedPage_loading=Loading...
-FeatureImportWizard_DetailedPage_problemsLoading=Problems encountered while loading features
-NewFeatureDialog_alreadyDefined=Feature with the same URL already exists.
-NewArchiveDialog_alreadyExists=Archive with the same path already exists.
-UpdateClasspathAction_missingPlugin_title=Missing Plug-ins
-UpdateClasspathAction_find=Find Classpaths to Recompute
-UpdateClasspathAction_none=There are no plug-ins or fragments whose classpaths need to be recomputed.
-RenameDialog_label=&Enter new name:
-RenameDialog_validationError = Name already exists.
-RenameAutostartResolution_desc=Rename the deprecated Eclipse-AutoStart to Eclipse-LazyStart.  The semantics of the header remain the same.
-RenameAutostartResolution_label=rename to Eclipse-LazyStart
-ReferenceAttributeRow_browse=Browse...
-EditableTablePart_renameAction=Rename...
-EditableTablePart_renameTitle=Rename
-
-######### Site Editor #########################################
-CategorySection_title=Managing the Site
-CategorySection_new=New Category
-CategorySection_desc=1. Add the features to be published on the site.\n\
-2. For easier browsing of the site, categorize the features by dragging.\n\
-3. Build the features.
-CategorySection_add = Add Feature...
-CategorySection_remove = Remove
-CategorySection_environment = Synchronize...
-CategorySection_buildAll = Build All
-CategorySection_build = Build
-CategorySection_newCategoryName = new_category_{0}
-CategorySection_newCategoryLabel = New Category {0}
-
-CategoryDetails_title = Category Properties
-CategoryDetails_sectionDescription = Provide a unique name, a label and a description for each category.\n\
-"*" denotes a required field.
-CategoryDetails_name = &Name*:
-CategoryDetails_label = &Label*:
-CategoryDetails_desc = De&scription:
-CategoryDetails_alreadyExists=The category must have a unique name.
-CategoryDetails_alreadyExists_title = Invalid category name
-
-FeaturesPage_title = Site Map
-FeaturesPage_header = Update Site Map
-
-SiteEditor_add=Add...
-SiteEditor_edit=Edit...
-SiteEditor_remove=Remove
-SiteEditor_NewArchiveDialog_path=&Path:
-SiteEditor_NewArchiveDialog_url=&URL:
-SiteEditor_NewArchiveDialog_title=Site Archive
-SiteEditor_NewArchiveDialog_error=Both fields are required
-SiteEditor_ArchiveSection_header=Archive Mapping
-SiteEditor_ArchiveSection_instruction = Every data archive located outside the features subdirectory must be mapped to that directory with a path-to-URL mapping:
-SiteEditor_ArchiveSection_col1=Path
-SiteEditor_ArchiveSection_col2=URL
-SiteEditor_DescriptionSection_header=Site Description
-SiteEditor_DescriptionSection_desc=Describe the update site and specify its address:
-SiteEditor_DescriptionSection_descLabel=Description:
-SiteEditor_DescriptionSection_urlLabel=URL:
-SiteEditor_MirrorsSection_header = Site Mirrors
-SiteEditor_MirrorsSection_desc = If this site is mirrored on other servers, specify an absolute or relative URL of the file containing mirror site definitions.
-SiteEditor_MirrorsSection_urlLabel = URL:
-
-SynchronizePropertiesAction_label = S&ynchronize Feature Properties...
-SynchronizePropertiesWizard_wtitle = Feature Properties
-SynchronizePropertiesWizardPage_title = Feature Properties Synchronization
-SynchronizePropertiesWizardPage_desc = Synchronize features to copy their environment and patch properties into the site.
-SynchronizePropertiesWizardPage_group = Synchronization Options
-SynchronizationOperation_externalPlugin=The plug-in ''{0}'' is not in the workspace and cannot therefore be modified.  Please import it into your workspace and retry.
-SynchronizePropertiesWizardPage_oneFeature = Synchronize &selected feature only
-SynchronizationOperation_noDefiningPlugin=The product's defining plug-in could not be found.
-SynchronizePropertiesWizardPage_allFeatures = Synchronize &all features on the site
-SynchronizePropertiesWizardPage_synchronizing = Synchronizing properties...
-
-################Migration Wizard#############################
-MigrationWizard_title=Migrate Plug-ins and Fragments
-MigrationAction_find=Find Projects to Migrate
-MigrationAction_none=There are no pre-Eclipse 3.0 plug-in projects to migrate.
-MigrationWizard_progress=Migrating...
-MigrationWizardPage_desc=Migrate the plug-ins and fragments that are not compliant with Eclipse 3.0 guidelines
-MigrationWizardPage_label=&Plug-ins and fragments that are not 3.0-compliant:
-MigrationWizard_update=&Update the Java build path (recommended)
-
-PDEFormPage_help=Help
-GeneralInfoSection_id=ID:
-GeneralInfoSection_name=Name:
-GeneralInfoSection_class=Activator:
-GeneralInfoSection_browse=Browse...
-GeneralInfoSection_platformFilter=Platform filter:
-GeneralInfoSection_selectionTitle=Select Type
-RequiresSection_title=Required Plug-ins
-RequiresSection_fDesc=Specify the list of plug-ins required for the operation of this fragment:
-RequiresSection_desc=Specify the list of plug-ins required for the operation of this plug-in:
-RequiresSection_down=Down
-RequiresSection_add=Add...
-RequiresSection_up=Up
-RequiresSection_open=Open
-RequiresSection_compute=Compute Build Path
-RequiresSection_properties=Properties
-RequiresSection_update=Updating the build path...
-RequiresSection_delete=Remove
-LoopDialog_title=Cycles in Dependency Graph
-MatchSection_title=Dependency Properties
-MailTemplate_title=RCP Mail Template
-MailTemplate_appId=App&lication ID:
-MailNewWizard_title=New plug-in project with an RCP mail template
-MatchSection_desc=Define the properties of the selected dependency:
-MailTemplate_desc=This template generates a standalone RCP application, complete with views, menu and toolbar actions, keybindings and a product definition
-ClasspathSection_jarsMessage=Select JAR archives to be added to the plug-in's classpath:
-ClasspathSection_rename=Rename Library
-ClasspathSection_fragment=Specify the libraries and folders that constitute the fragment runtime.  If unspecified, the classes and resources are assumed to be at the root of the fragment.
-ClasspathSection_plugin=Specify the libraries and folders that constitute the plug-in classpath.  If unspecified, the classes and resources are assumed to be at the root of the plug-in.
-OverviewPage_exportingTitle=Exporting
-OverviewPage_buildQuestion=The plug-in does not contain a build configuration file.  Would you like to create one?
-OverviewPage_content=<form>\
-<p>The content of the plug-in is made up of two sections:</p>\
-<li style="image" value="page" bindent="5"><a href="dependencies">Dependencies</a>: lists all the plug-ins required on this plug-in's classpath to compile and run.</li>\
-<li style="image" value="page" bindent="5"><a href="runtime">Runtime</a>: lists the libraries that make up this plug-in's runtime.</li>\
-</form>
-OverviewPage_osgi = <form>\
-<p>For this plug-in to take advantage of additional runtime capabilities, <a href="action.convert">create an OSGi bundle manifest</a>.</p>\
-</form>
-OverviewPage_testing=<form>\
-<p>Test this plug-in by launching a separate Eclipse application:</p>\
-<li style="image" value="run" bindent="5"><a href="action.run">Launch an Eclipse application</a></li>\
-<li style="image" value="debug" bindent="5"><a href="action.debug">Launch an Eclipse application in Debug mode</a></li>\
-</form>
-OverviewPage_OSGiTesting=<form>\
-<p>Test this plug-in by launching the Equinox OSGi framework:</p>\
-<li style="image" value="run" bindent="5"><a href="action.runEquinox">Launch the framework</a></li>\
-<li style="image" value="debug" bindent="5"><a href="action.debugEquinox">Launch the framework in Debug mode</a></li>\
-</form>
-OverviewPage_tabName=Overview
-OverviewPage_title=Overview
-OverviewPage_deploying=<form>\
-<p>To package and export the plug-in:</p>\
-<li style="text" value="1." bindent="5">Specify what needs to be packaged in the deployable plug-in on the <a href="build">Build Configuration</a> page</li>\
-<li style="text" value="2." bindent="5">Export the plug-in in a format suitable for deployment using the <a href="export">Export Wizard</a></li>\
-</form>
-OverviewPage_fOsgi = <form>\
-<p>For this fragment to take advantage of additional runtime capabilities, you need to <a href="action.convert">create an OSGi bundle manifest</a>.</p>\
-</form>
-OverviewPage_error=Error
-OverviewPage_fContent=<form>\
-<p>The content of the fragment is made up of two sections:</p>\
-<li style="image" value="page" bindent="5"><a href="dependencies">Dependencies</a>: lists all the plug-ins required on this fragment's classpath to compile and run.</li>\
-<li style="image" value="page" bindent="5"><a href="runtime">Runtime</a>: lists the libraries that make up this fragment's runtime.</li>\
-</form>
-OverviewPage_fTesting=<form>\
-<p>Test this fragment by launching a separate Eclipse application:</p>\
-<li style="image" value="run" bindent="5"><a href="action.run">Launch an Eclipse application</a></li>\
-<li style="image" value="debug" bindent="5"><a href="action.debug">Launch an Eclipse application in Debug mode</a></li>\
-</form>
-OverviewPage_fDeploying=<form>\
-<p>To package and export the fragment:</p>\
-<li style="text" value="1." bindent="5">Specify what needs to be packaged in the deployable fragment on the <a href="build">Build Configuration</a> page</li>\
-<li style="text" value="2." bindent="5">Export the fragment in a format suitable for deployment using the <a href="export">Export Wizard</a></li>\
-</form>
-OverviewPage_extensionContent=<form>\
-<p>This plug-in may define extensions and extension points:</p>\
-<li style="image" value="page" bindent="5"><a href="extensions">Extensions</a>: declares contributions this plug-in makes to the platform.</li>\
-<li style="image" value="page" bindent="5"><a href="ex-points">Extension Points</a>: declares new function points this plug-in adds to the platform.</li>\
-</form>
-OverviewPage_extensionPageMessageTitle=Extension pages hidden
-OverviewPage_extensionPageMessageBody=The Extension and Extension Point pages are currently hidden, would you like to display them now?
-OverviewPage_fExtensionContent=<form>\
-<p>This fragment may define extensions and extension points:</p>\
-<li style="image" value="page" bindent="5"><a href="extensions">Extensions</a>: declares contributions this fragment makes to the platform.</li>\
-<li style="image" value="page" bindent="5"><a href="ex-points">Extension Points</a>: declares new function points this fragment adds to the platform.</li>\
-</form>
-OverviewPage_buildTitle=Build Configuration
-ClassAttributeRow_dialogTitle=Select Type
-AttributePropertySource_assertBoolean=Boolean value must either be "true" or "false"
-AttributePropertySource_translatable=Translatable
-AttributePropertySource_deprecated=Deprecated
-AttributePropertySource_invalidRestriction=Value "{0}" is not valid for the specified restriction
-ArchivePage_title=Description and Archives
-ArchivePage_name=Archives
-
-SampleWizard_title=Sample Wizard
-SampleEditor_desc=<form>{0}</form>
-SampleWizard_overwrite=Project "{0}" already exists. Do you want to replace it?
-SampleEditor_content=<form>\
-<p><b>What you can do with the sample</b></p>\
-<li>Browse the source code in the workspace.</li>\
-<li>When ready, <a href="run">run the sample</a> and follow instructions in the <img href="help"/><a href="help">help document.</a></li>\
-<li>Later on, you can re-run the sample by pressing the <img href="run"/><b>Run</b> icon on the tool bar.</li>\
-<li>If you place breakpoints in the code, you can <a href="debug">debug it.</a></li>\
-<li>Later on, you can debug the sample by pressing the <img href="debug"/><b>Debug</b> icon on the tool bar.</li>\
-</form>
-SampleOperation_creating=Creating projects...
-SampleStandbyContent_content=<form>\
-<p><b>What you can do with the sample</b></p>\
-<li><a href="browse">Browse the source code</a> in the workspace.</li>\
-<li>When ready, <a href="run">run the sample</a> and follow instructions in the <img href="help"/><a href="help">help document.</a></li>\
-<li>Later on, you can re-run the sample by pressing the <img href="run"/><b>Run</b> icon on the tool bar.</li>\
-<li>If you place breakpoints in the code, you can <a href="debug">debug it.</a></li>\
-<li>Later on, you can debug the sample by pressing the <img href="debug"/><b>Debug</b> icon on the tool bar.</li>\
-</form>
-SampleStandbyContent_desc=<form>{0}</form>
-ReviewPage_title=Review
-ReviewPage_desc=Review the selected sample.
-ReviewPage_descContent = <p>You have selected the following sample:</p>\
-<p><b>{0}</b></p>\
-<p>{1}</p>\
-<p>If the selection is correct, press <b>Finish</b> to create the sample.</p>
-ReviewPage_content = <p>You have selected the following sample:</p>\
-<p><b>{0}</b></p>\
-<p>If the selection is correct, press <b>Finish</b> to create the sample.</p>
-ShowSampleAction_title=Eclipse Samples
-ShowSampleAction_msgDesc=The samples are currently not installed. Do you want to download samples from Eclipse.org?
-SelfHostingPropertyPage_label=By default, all output folders are put on the plug-in's classpath when running a runtime Eclipse application.
-SelfHostingPropertyPage_viewerLabel=Deselect the folders to be excluded:
-MigratePluginWizard_cleanProjects=&Clean up stale project references (recommended)
-RuntimePage_tabName=Runtime
-ApplicationSelectionDialog_debug=Choose an application to debug:
-ApplicationSelectionDialog_run=Choose an application to run:
-ApplicationSelectionDialog_dtitle=Debug
-ApplicationSelectionDialog_rtitle=Run
-
-PluginValidationOperation_missingCore = Plug-in "{0}" is missing
-PluginValidationOperation_missingApp = Application "{0}" will fail to run \
-because plug-in "{1}" is missing
-PluginValidationOperation_missingApp2 = Application "{0}" will fail to run \
-because plug-in "{1}" is disabled
-PluginValidationOperation_missingProduct = Product "{0}" will fail to run \
-because plug-in "{1}" is missing
-PluginValidationOperation_missingProduct2 = Product "{0}" will fail to run \
-because plug-in "{1}" is disabled
-PluginValidationOperation_disableFragment = Fragment "{0}" will be disabled
-PluginValidationOperation_disablePlugin = Plug-in "{0}" will be disabled
-PluginValidationOperation_missingRequired = Required plug-in "{0}" is missing
-PluginValidationOperation_disabledRequired = Required plug-in "{0}" is disabled
-PluginValidationOperation_missingImport = Import package "{0}" is missing
-PluginValidationOperation_missingParent = Fragment host "{0}" is missing
-PluginValidationOperation_disabledParent = Fragment host "{0}" is disabled
-ElementPropertySource_translatable=Translatable
-ElementPropertySource_deprecated=Deprecated
-TargetPlatformPreferencePage_pluginsTab=&Plug-ins
-TargetPlatformPreferencePage_sourceCode=S&ource Code Locations
-TargetPlatformPreferencePage_environmentTab=En&vironment
-EnvironmentBlock_jreGroup=&Target JRE:
-EnvironmentBlock_jreTitle=Java Runtime Environment
-EnvironmentBlock_jreNote=Note: If the selected JRE is not the current default JRE, it will become the default when you apply your changes.
-EnvironmentBlock_targetEnv=Target Environment
-MailTemplate_productName=&Product name:
-MailTemplate_productID=P&roduct ID:
-MailTemplate_appClass=&Application class:
-MailTemplate_packageName=Pa&ckage name:
-
-################Product Editor#####################
-Product_overview_configuration = <form><p>The <a href="navigate.configuration">product configuration</a> is based on:</p></form>
-Product_PluginSection_working=Add Working Set...
-ProductInfoSection_titleLabel=Specify the name that appears in the title bar of the application:
-Product_PluginSection_required=Add Required Plug-ins
-ProductInfoSection_prodIdLabel=Specify the product identifier:
-ProductExportAction_errorTitle=Product Export
-ProductExportWizardPage_title=Eclipse product
-ProductExportWizardPage_config=Con&figuration:
-ProductExportWizardPage_browse=Bro&wse...
-Product_PluginSection_removeAll=Remove All
-Product_PluginSection_newPlugin=New Plug-in...
-Product_ConfigurationPage_title=Configuration
-ProductFileWizadPage_groupTitle=Initialize the file content
-Product_PluginSection_newFragment=New Fragment...
-Product_overview_testing=<form>\
-<li style="text" value="1." bindent="5"><a href="action.synchronize">Synchronize</a> this configuration with the product's defining plug-in.</li>\
-<li style="text" value="2." bindent="5">Test the product by launching a runtime instance of it:</li>\
-<li style="image" value="run" bindent="35"><a href="action.run">Launch the product</a></li>\
-<li style="image" value="debug" bindent="35"><a href="action.debug">Launch the product in Debug mode</a></li>\
-</form>
-ProductInfoSection_title=Product Definition
-ProductIntroWizard_title=New Welcome Page Wizard
-ProductIntroWizardPage_title=New Welcome Page
-ProductIntroWizardPage_description=This wizard creates a new welcome page for your product. Use the welcome page to\ndescribe your application's features in an organized presentation.
-ProductIntroWizardPage_groupText=Product Welcome
-ProductIntroWizardPage_formText=<form><p>A welcome page is defined declaratively as <a href="intro">org.eclipse.ui.intro</a> and <a href="intro.config">org.eclipse.ui.intro.config</a> extensions inside a plug-in.</p></form>
-ProductIntroWizardPage_targetLabel=Target Plugin:
-ProductIntroWizardPage_browse=Browse...
-ProductIntroWizardPage_introLabel=Intro Id:
-ProductIntroWizardPage_introNotSet=Intro Id is not set
-Product_PluginSection_add=Add...
-Product_PluginSection_title=Plug-ins and Fragments
-Product_ExportSection_title=Exporting
-Product_FeatureSection_desc=List the features that constitute the product.  Nested features need not be listed.
-ProductInfoSection_appLabel=Specify the application to run when launching this product:
-ProductExportAction_jobName=Exporting an Eclipse product
-ProductExportJob_jobName=Export Product
-ProductExportWizardPage_desc=Use an existing Eclipse product configuration to export the product in one of the available formats.
-ProductExportWizardPage_root=Roo&t directory:
-ProductExportWizardPage_sync=Synchronization
-ProductExportWizard_error=Error
-ProductExportWizard_corrupt=The specified product configuration is corrupt.
-ProductDefinitionWizard_title=New Product Definition
-ProductDefinitionWizard_error=Error
-ProductDefinitonWizardPage_title=Product Definition
-ProductDefinitonWizardPage_desc=Define a new Eclipse product and specify its plug-in and default application.
-ProductDefinitonWizardPage_descNoName=Define a new Eclipse product and specify its name, plug-in and default application.
-ProductDefinitonWizardPage_plugin=&Defining Plug-in:
-ProductDefinitonWizardPage_browse=B&rowse...
-ProductDefinitonWizardPage_productId=&Product ID:
-ProductDefinitonWizardPage_productName=Product &Name:
-ProductDefinitonWizardPage_noPluginId=Plug-in ID is not set
-ProductDefinitonWizardPage_noPlugin=Specified plug-in does not exist
-ProductDefinitonWizardPage_invalidId=Invalid product ID.  Legal characters are: a-z A-Z 0-9 _
-Product_ExportSection_includeSource=Include source code for plug-ins in the workspace
-ProductIntroWizardPage_targetNotSet=Target Plugin is not set
-Product_FeatureSection_title=Features
-Product_FeatureSection_newFeature=New Feature...
-ProductExportAction_noDestination=An export destination has not been specified.
-ProductExportWizardPage_productGroup=Product Configuration
-ProductIntroWizardPage_introIdExists=Specified intro id already exists
-ProductExportWizardPage_productNotExists=Specified product configuration does not exist.
-ProductExportWizardPage_wrongExtension=A product configuration file name must have a '.product' extension
-ProductExportWizardPage_fileSelection=File Selection
-ProductIntroWizardPage_invalidIntroId=Invalid Intro ID.  Legal characters are: a-z A-Z 0-9 .
-ProductExportWizardPage_productSelection=Select a product configuration
-ProductExportWizardPage_syncText=Synchronization of the product configuration with the product's defining plug-in ensures that the plug-in does not contain stale data.
-ProductExportWizardPage_syncButton=&Synchronize before exporting
-ProductExportWizardPage_noProduct=Product configuration is not specified.
-Product_OverviewPage_testing=Testing
-Product_PluginSection_desc=List all the plug-ins and fragments that constitute the product:
-Product_ExportSection_desc=To package and export this product:
-Product_FeatureSection_add=Add...
-ProductFileWizadPage_title=Create a new product configuration and initialize its content.\nThe name must end with '.product'.
-ProductFileWizadPage_basic=&Create a configuration file with basic settings
-ProductFileWizadPage_error=The file name must end with '.product'
-Product_overview_exporting = <form>\
-<p>Use the <a href="action.export">Eclipse Product export wizard</a> to package and export the product defined in this configuration.</p><p></p>\
-<p>To export the product to multiple platforms:</p>\
-<li style="text" value="1." bindent="5">Install the RCP delta pack in the target platform.</li>\
-<li style="text" value="2." bindent="5">List all the required fragments on the <a href="configuration">Configuration</a> page.</li>\
-</form>
-ProductInfoSection_desc=This section describes general information about the product:
-ProductInfoSection_id=Product ID:
-ProductInfoSection_new=New...
-ProductInfoSection_app=Application:
-SplashSection_title=Splash Screen
-SplashSection_desc=The splash screen appears when the product launches.  If its location is not specified, the 'splash.bmp' file is assumed to be in the product's defining plug-in.
-SplashSection_label=Specify the plug-in in which the splash screen is located:
-SplashSection_plugin=Plug-in:
-SplashSection_browse=Browse...
-SplashSection_selection=Plug-in Selection
-SplashSection_message=Select the plug-in where the splash screen is located:
-BrandingPage_title=Branding
-WindowImagesSection_title=Window Images
-WindowImagesSection_desc=Specify the images that will be associated with the application window.  These GIF images are typically located in the product's defining plug-in.
-WindowImagesSection_browse=Browse...
-WindowImagesSection_open=Open File
-WindowImagesSection_16=16x16 Image:
-WindowImagesSection_32=32x32 Image:
-WindowImagesSection_48=48x48 Image:
-WindowImagesSection_64=64x64 Image:
-WindowImagesSection_128=128x128 Image:
-WindowImagesSection_warning=The specified file could not be found.
-WindowImagesSection_emptyPath=A path to an existing file must be provided.
-WindowImagesSection_dialogTitle=Image Selection
-WindowImagesSection_dialogMessage=Select a GIF image:
-AboutSection_title=About Dialog
-AboutSection_desc=Customize the text and image of the About dialog.  The GIF image is typically located in the product's defining plug-in and its size must not exceed 500x330 pixels.  The text is not shown if the image size exceeds 250x330 pixels.
-AboutSection_image=Image:
-AboutSection_browse=Browse...
-AboutSection_text=Text:
-AboutSection_open=Open Image
-AboutSection_warning=Specified image could not be found
-AboutSection_imgTitle=Image Selection
-AboutSection_imgMessage=Select a GIF image:
-LauncherSection_solarisLabel=Four PM icons are required:
-LauncherSection_launcherName=Launcher Name:
-LauncherSection_dialogTitle=Image Selection
-LauncherSection_dialogMessage=Select an image:
-ProductDefinitonWizardPage_applicationDefinition=<form><p>An Eclipse product must be associated with an <a href="applications">application</a>, the default entry point for the product when it is running.</p></form>
-SWTApplicationLaunchShortcut_noMainInEditor=The active editor does not contain a main type
-SWTApplicationLaunchShortcut_noMainInSelection=The selection does not contain a main type
-SWTApplicationLaunchShortcut_debug=Debug Type
-SWTApplicationLaunchShortcut_run=Run Type
-SWTApplicationLaunchShortcut_launch=Launch Configuration Selection
-SWTApplicationLaunchShortcut_failed=Launch Failed
-SWTApplicationLaunchShortcut_chooseRun=Choose a launch configuration to debug
-SWTApplicationLaunchShortcut_chooseDebug=Choose a launch configuration to run
-SWTApplicationLaunchShortcut_error=Error
-SWTApplicationLaunchShortcut_exception=An exception occurred attempting to create a launch configuration.
-ArgumentsSection_title=Launching Arguments
-ArgumentsSection_desc=Specify the program and VM arguments to launch the product with:
-ArgumentsSection_program=Program Arguments:
-ArgumentsSection_vm=VM Arguments:
-
-Product_FeatureSection_remove = Remove
-Product_FeatureSection_open = Open
-
-ImportPackageSection_desc = Specify packages on which this plug-in depends without explicitly identifying their originating plug-in:
-ImportPackageSection_descFragment = Specify packages on which this fragment depends without explicitly identifying their originating plug-in:
-ImportPackageSection_add=Add...
-ImportPackageSection_remove=Remove
-ImportPackageSection_properties=Properties...
-ImportPackageSection_required=Imported Packages
-ImportPackageSection_exported=Packages exported by other plug-ins:
-ImportPackageSection_selection=Package Selection
-ImportPackageSection_propertyAction=Properties
-ExportPackageSection_desc = Enumerate all the packages that this plug-in exposes to clients.  All other packages will be hidden from clients at all times.
-ExportPackageSection_descFragment = Enumerate all the packages that this fragment exposes to clients.  All other packages will be hidden from clients at all times.
-ExportPackageSection_0=\ (
-ExportPackageSection_add=Add...
-ExportPackageSection_remove=Remove
-ExportPackageSection_properties=Properties...
-ExportPackageSection_title=Exported Packages
-ExportPackageSection_props=Properties
-ExportPackageVisibilitySection_title=Package Visibility (Eclipse 3.1 Only)
-ExportPackageSection_propertyAction=Properties
-ExportPackageVisibilitySection_default=When the runtime is in strict mode, the selected package is:
-ExportPackageVisibilitySection_hideAll=hidden from all plug-ins except:
-CrossPlatformExportPage_available=&Available platforms:
-CrossPlatformExportPage_title=Cross-platform export
-CrossPlatformExportPage_desc=Select the platforms to which you want to deploy your product.
-CreateHelpIndexAction_creating=Creating index...
-IntroSection_sectionDescription=The welcome page appears the first time the product is launched.  It is intended to introduce the features of the product to new users.
-IntroSection_undefinedProductId=Undefined Product Id
-
-
-MainTab_jreSection = Java Runtime Environment
-EquinoxPluginBlock_pluginsColumn=Plug-ins
-EquinoxLaunchConfiguration_oldTarget=Equinox launch configurations cannot be launched with Eclipse 2.1 platforms
-EquinoxPluginBlock_levelColumn=Start Level
-EquinoxPluginsTab_defaultStart=&Default start level:
-EquinoxPluginBlock_autoColumn=Start
-EquinoxPluginsTab_defaultAuto=Start &plug-ins automatically (Default):
-EquinoxSettingsTab_name=Settings
-ModelChangeLabelProvider_instance=\ instance
-ModelChangeLabelProvider_instances=\ instances
-GetNonExternalizedStringsOperation_taskMessage=Scanning workspace for non-externalized manifest strings
-GetNonExternalizedStringsAction_allExternalizedTitle=Externalize Strings
-GetNonExternalizedStringsAction_allExternalizedMessage=All strings in manifest files have been externalized
-RequiredExecutionEnvironmentSection_title=Execution Environment
-RequiredExecutionEnvironmentSection_minJRE=Specify the minimum JRE level on which this plugin can run:
-RequiredExecutionEnvironmentSection_jreProfile=JRE execution environment:
-RequiredExecutionEnvironmentSection_minJ2ME=Specify the minimum J2ME environment where this plugin can run:
-RequiredExecutionEnvironmentSection_fminJRE=Specify the minimum JRE level on which this fragment can run:
-RequiredExecutionEnvironmentSection_fminJ2ME=Specify the minimum J2ME environment where this fragment can run:
-RequiredExecutionEnvironmentSection_j2meProfile=J2ME execution environment:
-ClassSearchParticipant_taskMessage=Searching for types and packages in manifest files
-CreateJREBundleHeaderResolution_desc=Add the Eclipse-JREBundle header and set its value to true.
-CreateJREBundleHeaderResolution_label=add the Eclipse-JREBundle header

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/CompilersConfigurationBlock.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/CompilersConfigurationBlock.java
deleted file mode 100644
index a4a4870..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/CompilersConfigurationBlock.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.preferences;
-
-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.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.pde.internal.PDE;
-import org.eclipse.pde.internal.builders.CompilerFlags;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-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.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.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.swt.widgets.Text;
-
-/**
- */
-public class CompilersConfigurationBlock {
-
-	private Set fBuilders = new HashSet();
-
-	private Set fChangedControls = new HashSet();
-
-	private Composite fFeaturePage;
-
-	private List fFlagControls;
-
-	private Composite fPluginPage;
-
-	private Composite fSchemaPage;
-
-	private Shell fShell;
-	
-	// The size of label array must match CompilerFlag.fFlags
-	private static final String[][] fLabels = {
-			{ PDEUIMessages.compilers_p_unresolved_import,
-					PDEUIMessages.compilers_p_unresolved_ex_points,
-					PDEUIMessages.compilers_p_no_required_att,
-					PDEUIMessages.compilers_p_unknown_element,
-					PDEUIMessages.compilers_p_unknown_attribute,
-					PDEUIMessages.compilers_p_deprecated,
-					PDEUIMessages.compilers_p_unknown_class,
-					PDEUIMessages.compilers_p_unknown_resource,
-					PDEUIMessages.compilers_p_not_externalized_att },
-			{ PDEUIMessages.compilers_s_create_docs,
-					PDEUIMessages.compilers_s_doc_folder,
-					PDEUIMessages.compilers_s_open_tags },
-			{ PDEUIMessages.compilers_f_unresolved_plugins,
-					PDEUIMessages.compilers_f_unresolved_features }, {} };
-
-	/**
-	 * @param project nNot null in property page
-	 */
-	private IProject project;
-
-	public CompilersConfigurationBlock(IProject project) {
-		this.project = project;
-	}
-
-	private void addChangedConrol(Control control) {
-		String flagId = (String) control.getData();
-		boolean doAdd = false;
-		if (control instanceof Combo) {
-			int newIndex = ((Combo) control).getSelectionIndex();
-			int oldIndex = CompilerFlags.getFlag(project, flagId);
-			doAdd = (newIndex != oldIndex);
-		} else if (control instanceof Button) {
-			boolean newValue = ((Button) control).getSelection();
-			boolean oldValue = CompilerFlags.getBoolean(project, flagId);
-			doAdd = oldValue != newValue;
-		} else if (control instanceof Text) {
-			String newValue = ((Text) control).getText();
-			String oldValue = CompilerFlags.getString(project, flagId);
-			doAdd = !newValue.equals(oldValue);
-		}
-		if (doAdd)
-			fChangedControls.add(control);
-		else if (fChangedControls.contains(control))
-			fChangedControls.remove(control);
-	}
-
-	/**
-	 * @see org.eclipse.jface.preference.PreferencePage#createContents(Composite)
-	 */
-	public Control createContents(Composite parent) {
-		setShell(parent.getShell());
-
-		Composite container = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		container.setLayout(layout);
-
-		fFlagControls = new ArrayList();
-		SelectionListener listener = new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				addChangedConrol((Control) e.widget);
-			}
-		};
-
-		ModifyListener mlistener = new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				addChangedConrol((Control) e.widget);
-			}
-		};
-
-		String[] choices = new String[] {
-				PDEUIMessages.CompilersConfigurationBlock_error, PDEUIMessages.CompilersConfigurationBlock_warning, PDEUIMessages.CompilersConfigurationBlock_ignore }; //  
-		
-		if (project != null) { // property page
-			try {
-				if (project.hasNature(PDE.PLUGIN_NATURE)) {
-					fPluginPage = createPage(
-							container,
-							PDEUIMessages.CompilersConfigurationBlock_plugins, CompilerFlags.PLUGIN_FLAGS, choices); 
-
-				}
-			} catch (CoreException ce) {
-				// does not exist or is closed
-			}
-		} else { // preference page
-			TabFolder folder = new TabFolder(container, SWT.NONE);
-			GridData gd = new GridData(GridData.FILL_BOTH);
-			folder.setLayoutData(gd);
-
-			fPluginPage = createPage(
-					folder,
-					PDEUIMessages.CompilersConfigurationBlock_plugins, CompilerFlags.PLUGIN_FLAGS, choices); 
-			fSchemaPage = createPage(
-					folder,
-					PDEUIMessages.CompilersConfigurationBlock_schemas, CompilerFlags.SCHEMA_FLAGS, choices); 
-			fFeaturePage = createPage(
-					folder,
-					PDEUIMessages.CompilersConfigurationBlock_features, CompilerFlags.FEATURE_FLAGS, choices); 
-			// createPage(folder,
-			// PDEPlugin.getResourceString("CompilersConfigurationBlock.sites"),
-			// CompilerFlags.SITE_FLAGS, choices); //$NON-NLS-1$
-		}
-
-		for (int i = 0; i < fFlagControls.size(); i++) {
-			Control control = (Control) fFlagControls.get(i);
-			if (control instanceof Combo)
-				((Combo) control).addSelectionListener(listener);
-			else if (control instanceof Button)
-				((Button) control).addSelectionListener(listener);
-			else if (control instanceof Text)
-				((Text) control).addModifyListener(mlistener);
-		}
-		Dialog.applyDialogFont(parent);
-		return container;
-	}
-
-	private Control createFlag(Composite page, String flagId, String[] choices) {
-		Control control = null;
-		if (CompilerFlags.getFlagType(flagId) == CompilerFlags.MARKER) {
-			Label label = new Label(page, SWT.NULL);
-			label.setText(getFlagLabel(flagId));
-			Combo combo = new Combo(page, SWT.READ_ONLY);
-			combo.setItems(choices);
-			combo.select(CompilerFlags.getFlag(project, flagId));
-			control = combo;
-		} else if (CompilerFlags.getFlagType(flagId) == CompilerFlags.BOOLEAN) {
-			Button button = new Button(page, SWT.CHECK);
-			button.setText(getFlagLabel(flagId));
-			button.setSelection(CompilerFlags.getBoolean(project, flagId));
-			GridData gd = new GridData();
-			gd.horizontalSpan = 2;
-			button.setLayoutData(gd);
-			control = button;
-		} else if (CompilerFlags.getFlagType(flagId) == CompilerFlags.STRING) {
-			Label label = new Label(page, SWT.NULL);
-			label.setText(getFlagLabel(flagId));
-			Text text = new Text(page, SWT.SINGLE | SWT.BORDER);
-			text.setText(CompilerFlags.getString(project, flagId));
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.widthHint = 50;
-			text.setLayoutData(gd);
-
-			new Label(page, SWT.NULL).setLayoutData(new GridData());
-			GridData sgd = new GridData();
-			Label slabel = new Label(page, SWT.NULL);
-			slabel.setText(PDEUIMessages.CompilersConfigurationBlock_label); 
-			sgd.horizontalSpan = 2;
-			slabel.setLayoutData(sgd);
-
-			control = text;
-		}
-		control.setData(flagId);
-		return control;
-	}
-	
-	private String getFlagLabel(String flagId) {
-		for (int i = 0; i < fLabels.length; i++) {
-			String[] flags = CompilerFlags.getFlags(i);
-			for (int j = 0; j < flags.length; j++) {
-				if (flags[j].equals(flagId)) {
-					return fLabels[i][j];
-				}
-			}
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	private Composite createPage(Composite parent, String name, int index,
-			String[] choices) {
-		Group group = new Group(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		group.setLayout(layout);
-
-		String labelText;
-		if (index == CompilerFlags.SCHEMA_FLAGS)
-			labelText = PDEUIMessages.CompilersConfigurationBlock_altlabel; 
-		else
-			labelText = PDEUIMessages.CompilersConfigurationBlock_label; 
-		group.setText(labelText);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		gd.grabExcessHorizontalSpace = true;
-		group.setLayoutData(gd);
-		
-		String[] flagIds = CompilerFlags.getFlags(index);
-		for (int i = 0; i < flagIds.length; i++) {
-			Control control = createFlag(group, flagIds[i], choices);
-			fFlagControls.add(control);
-		}
-		return group;
-	}
-	private Composite createPage(TabFolder folder, String name, int index,
-			String[] choices) {
-		Composite page = new Composite(folder, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		page.setLayout(layout);
-
-		TabItem tab = new TabItem(folder, SWT.NONE);
-		tab.setText(name);
-		tab.setControl(page);
-
-		Label label = new Label(page, SWT.NULL);
-		String labelText;
-		if (index == CompilerFlags.SCHEMA_FLAGS)
-			labelText = PDEUIMessages.CompilersConfigurationBlock_altlabel; 
-		else
-			labelText = PDEUIMessages.CompilersConfigurationBlock_label; 
-		label.setText(labelText);
-		GridData gd = new GridData();
-		gd.horizontalSpan = 2;
-		label.setLayoutData(gd);
-		
-		String[] flagIds = CompilerFlags.getFlags(index);
-		for (int i = 0; i < flagIds.length; i++) {
-			Control control = createFlag(page, flagIds[i], choices);
-			fFlagControls.add(control);
-		}
-		return page;
-	}
-
-	private void doFullBuild() {
-		Job buildJob = new Job(PDEUIMessages.CompilersConfigurationBlock_building) { 
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.core.runtime.jobs.Job#belongsTo(java.lang.Object)
-			 */
-			public boolean belongsTo(Object family) {
-				return ResourcesPlugin.FAMILY_MANUAL_BUILD == family;
-			}
-
-			//$NON-NLS-1$
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
-			 */
-			protected IStatus run(IProgressMonitor monitor) {
-				try {
-					IProject[] projects = null;
-					if (project == null) {
-						projects = PDE.getWorkspace().getRoot().getProjects();
-					} else {
-						projects = new IProject[] { project };
-					}
-					monitor.beginTask("", projects.length * 2); //$NON-NLS-1$
-					for (int i = 0; i < projects.length; i++) {
-						IProject projectToBuild = projects[i];
-						if (!projectToBuild.isOpen())
-							continue;
-						if (projectToBuild.hasNature(PDE.PLUGIN_NATURE)) {
-							if (fBuilders.contains(PDE.MANIFEST_BUILDER_ID))
-								projectToBuild.build(
-										IncrementalProjectBuilder.FULL_BUILD,
-										PDE.MANIFEST_BUILDER_ID, null,
-										new SubProgressMonitor(monitor, 1));
-							else
-								monitor.worked(1);
-							if (fBuilders.contains(PDE.SCHEMA_BUILDER_ID))
-								projectToBuild.build(
-										IncrementalProjectBuilder.FULL_BUILD,
-										PDE.SCHEMA_BUILDER_ID, null,
-										new SubProgressMonitor(monitor, 1));
-							else
-								monitor.worked(1);
-						} else if (projectToBuild.hasNature(PDE.FEATURE_NATURE)) {
-							if (fBuilders.contains(PDE.FEATURE_BUILDER_ID))
-								projectToBuild.build(
-										IncrementalProjectBuilder.FULL_BUILD,
-										PDE.FEATURE_BUILDER_ID, null,
-										new SubProgressMonitor(monitor, 2));
-						} else {
-							monitor.worked(2);
-						}
-					}
-				} catch (CoreException e) {
-					return e.getStatus();
-				} catch (OperationCanceledException e) {
-					return Status.CANCEL_STATUS;
-				} finally {
-					monitor.done();
-				}
-				return Status.OK_STATUS;
-			}
-		};
-		buildJob.setRule(ResourcesPlugin.getWorkspace().getRuleFactory()
-				.buildRule());
-		buildJob.setUser(true);
-		buildJob.schedule();
-	}
-
-	protected Shell getShell() {
-		return fShell;
-	}
-
-	/**
-	 * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
-	 */
-	public void performDefaults() {
-		fChangedControls.clear();
-		for (int i = 0; i < fFlagControls.size(); i++) {
-			boolean hasChange = false;
-			Control control = (Control) fFlagControls.get(i);
-			String flagId = (String) control.getData();
-			if (control instanceof Combo) {
-				if (project != null)
-					hasChange = CompilerFlags.getFlag(project, flagId) != CompilerFlags
-							.getDefaultFlag(flagId);
-				else
-					hasChange = ((Combo) control).getSelectionIndex() != CompilerFlags
-							.getDefaultFlag(flagId);
-				((Combo) control).select(CompilerFlags.getDefaultFlag(flagId));
-			} else if (control instanceof Button) {
-				if (project != null)
-					hasChange = CompilerFlags.getBoolean(project, flagId) != CompilerFlags
-							.getDefaultBoolean(flagId);
-				else
-					hasChange = ((Button) control).getSelection() != CompilerFlags
-							.getDefaultBoolean(flagId);
-				((Button) control).setSelection(CompilerFlags
-						.getDefaultBoolean(flagId));
-			} else if (control instanceof Text) {
-				if (project != null)
-					hasChange = !CompilerFlags.getString(project, flagId)
-							.equals(CompilerFlags.getDefaultString(flagId));
-				else
-					hasChange = ((Text) control).getText() != CompilerFlags
-							.getDefaultString(flagId);
-				((Text) control)
-						.setText(CompilerFlags.getDefaultString(flagId));
-			}
-			if (hasChange)
-				fChangedControls.add(control);
-		}
-	}
-
-	public boolean performOk(boolean enabled) {
-		Set changedControls = fChangedControls;
-		if (!enabled) {
-			// fChangedControls is not a valid change.
-			// The change is the difference between values in
-			// PROJECT,INSTANCE,DEFAULD
-			// and INSTANCE,DEFAULT scopes.
-			changedControls = new HashSet();
-			for (Iterator iter = fFlagControls.iterator(); iter.hasNext();) {
-				Control control = (Control) iter.next();
-				String flagId = (String) control.getData();
-				if (!CompilerFlags.getString(project, flagId).equals(
-						CompilerFlags.getString(null, flagId))) {
-					changedControls.add(control);
-					break;
-				}
-			}
-		}
-		boolean build = false;
-		if (changedControls.size() > 0) {
-			String title;
-			String message;
-			if (project != null) {
-				title = PDEUIMessages.CompilersConfigurationBlock_rebuild_title; 
-				message = PDEUIMessages.CompilersConfigurationBlock_rebuild_message; 
-			} else {
-				title = PDEUIMessages.CompilersConfigurationBlock_rebuild_many_title; 
-				message = PDEUIMessages.CompilersConfigurationBlock_rebuild_many_message; 
-
-			}
-
-			MessageDialog dialog = new MessageDialog(getShell(), title, null,
-					message, MessageDialog.QUESTION, new String[] {
-							IDialogConstants.YES_LABEL,
-							IDialogConstants.NO_LABEL,
-							IDialogConstants.CANCEL_LABEL }, 2);
-			int res = dialog.open();
-
-			if (res == 2) {
-				return false;
-			} else if (res == 0) {
-				build = true;
-			}
-		}
-		if (project != null
-				&& enabled != CompilerFlags.getBoolean(project,
-						CompilerFlags.USE_PROJECT_PREF)) {
-			if (enabled) {
-				CompilerFlags.setBoolean(project,
-						CompilerFlags.USE_PROJECT_PREF, true);
-			} else {
-				CompilerFlags.clear(project, CompilerFlags.USE_PROJECT_PREF);
-			}
-		}
-		if (changedControls.size() > 0) {
-			fBuilders = new HashSet();
-			for (Iterator iter = changedControls.iterator(); iter.hasNext();) {
-				Control control = (Control) iter.next();
-				String flagId = (String) control.getData();
-				if (control instanceof Combo) {
-					int index = ((Combo) control).getSelectionIndex();
-					if (project == null) {
-						CompilerFlags.setFlag(flagId, index);
-					}
-				} else if (control instanceof Button) {
-					boolean value = ((Button) control).getSelection();
-					if (project == null) {
-						CompilerFlags.setBoolean(flagId, value);
-					}
-				} else if (control instanceof Text) {
-					String value = ((Text) control).getText();
-					if (project == null) {
-						CompilerFlags.setString(flagId, value);
-					}
-				}
-				if (control.getParent().equals(fPluginPage))
-					fBuilders.add(PDE.MANIFEST_BUILDER_ID);
-				else if (control.getParent().equals(fSchemaPage))
-					fBuilders.add(PDE.SCHEMA_BUILDER_ID);
-				else if (control.getParent().equals(fFeaturePage)) {
-					fBuilders.add(PDE.FEATURE_BUILDER_ID);
-					fBuilders.add(PDE.SITE_BUILDER_ID);
-				}		
-			}
-			if (project == null) {
-				CompilerFlags.save();
-			}
-		}
-		if (project != null) {
-			for (Iterator iter = fFlagControls.iterator(); iter.hasNext();) {
-				Control control = (Control) iter.next();
-				String flagId = (String) control.getData();
-				if (control instanceof Combo) {
-					int index = ((Combo) control).getSelectionIndex();
-					if (enabled) {
-						CompilerFlags.setFlag(project, flagId, index);
-					} else {
-						CompilerFlags.clear(project, flagId);
-					}
-				} else if (control instanceof Button) {
-					boolean value = ((Button) control).getSelection();
-					if (enabled) {
-						CompilerFlags.setBoolean(project, flagId, value);
-					} else {
-						CompilerFlags.clear(project, flagId);
-					}
-				} else if (control instanceof Text) {
-					String value = ((Text) control).getText();
-					if (enabled) {
-						CompilerFlags.setString(project, flagId, value);
-					} else {
-						CompilerFlags.clear(project, flagId);
-					}
-				}
-			}
-		}
-
-		if (build && fBuilders.size() > 0) {
-			doFullBuild();
-		}
-
-		fChangedControls.clear();
-		return true;
-	}
-
-	protected void setShell(Shell shell) {
-		fShell = shell;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/CompilersPreferencePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/CompilersPreferencePage.java
deleted file mode 100644
index 3b0c4a8..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/CompilersPreferencePage.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.preferences;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-
-public class CompilersPreferencePage extends PreferencePage implements
-		IWorkbenchPreferencePage {
-
-	private CompilersConfigurationBlock configurationBlock;
-
-	/**
-	 *  
-	 */
-	public CompilersPreferencePage() {
-		super();
-		setDescription(PDEUIMessages.CompilersPreferencePage_desc); 
-		// only used when page is shown programatically
-		setTitle(PDEUIMessages.CompilersPreferencePage_title); 
-
-		configurationBlock = new CompilersConfigurationBlock(null);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createContents(Composite parent) {
-		Control result = configurationBlock.createContents(parent);
-		Dialog.applyDialogFont(result);
-		return result;
-	}
-
-	/*
-	 * @see PreferencePage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		super.createControl(parent);
-		PlatformUI.getWorkbench().getHelpSystem()
-				.setHelp(parent, IHelpContextIds.COMPILERS_PREFERENCE_PAGE);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
-	 */
-	public void init(IWorkbench workbench) {
-	}
-
-	/*
-	 * @see PreferencePage#performDefaults()
-	 */
-	protected void performDefaults() {
-		configurationBlock.performDefaults();
-		super.performDefaults();
-	}
-
-	/*
-	 * @see IPreferencePage#performOk()
-	 */
-	public boolean performOk() {
-		if (!configurationBlock.performOk(true)) {
-			getContainer().updateButtons();
-			return false;
-		}
-		return super.performOk();
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/EditorPreferencePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/EditorPreferencePage.java
deleted file mode 100644
index 2945de1..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/EditorPreferencePage.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.preferences;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.preference.BooleanFieldEditor;
-import org.eclipse.jface.preference.ColorFieldEditor;
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.IPreferenceConstants;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.text.IPDEColorConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-
-public class EditorPreferencePage
-	extends FieldEditorPreferencePage
-	implements IWorkbenchPreferencePage, IPreferenceConstants {
-
-	public EditorPreferencePage() {
-		super(GRID);
-		setPreferenceStore(PDEPlugin.getDefault().getPreferenceStore());
-		setDescription(PDEUIMessages.EditorPreferencePage_desc); 
-	}
-	
-	protected void createFieldEditors() {
-		addField(new BooleanFieldEditor(P_USE_SOURCE_PAGE, 
-				PDEUIMessages.EditorPreferencePage_useSourcePage, 
-				getFieldEditorParent()));
-		addLabel("", 2); //$NON-NLS-1$
-		addLabel(PDEUIMessages.EditorPreferencePage_colorSettings, 2); 
-		addSourceColorFields();
-	}
-	
-	public void createControl(Composite parent) {
-		super.createControl(parent);
-		Dialog.applyDialogFont(getControl());
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IHelpContextIds.EDITOR_PREFERENCE_PAGE);
-	}
-	
-	public static boolean getUseSourcePage() {
-		return PDEPlugin.getDefault().getPreferenceStore().getBoolean(P_USE_SOURCE_PAGE);
-	}
-	
-	private void addLabel(String text, int span) {
-		Label label = new Label(getFieldEditorParent(), SWT.NULL);
-		GridData gd = new GridData();
-		gd.horizontalSpan = span;
-		label.setLayoutData(gd);
-		label.setText(text);
-	}
-
-	private void addSourceColorFields() {
-		addField(
-			new ColorFieldEditor(
-				IPDEColorConstants.P_DEFAULT,
-				PDEUIMessages.EditorPreferencePage_text, 
-				getFieldEditorParent()));
-		addField(
-			new ColorFieldEditor(
-				IPDEColorConstants.P_PROC_INSTR,
-				PDEUIMessages.EditorPreferencePage_proc, 
-				getFieldEditorParent()));
-		addField(
-			new ColorFieldEditor(
-				IPDEColorConstants.P_STRING,
-				PDEUIMessages.EditorPreferencePage_string, 
-				getFieldEditorParent()));
-		addField(
-			new ColorFieldEditor(
-				IPDEColorConstants.P_TAG,
-				PDEUIMessages.EditorPreferencePage_tag, 
-				getFieldEditorParent()));
-		addField(
-			new ColorFieldEditor(
-				IPDEColorConstants.P_XML_COMMENT,
-				PDEUIMessages.EditorPreferencePage_comment, 
-				getFieldEditorParent()));
-	}
-
-	public boolean performOk() {
-		PDEPlugin.getDefault().savePluginPreferences();
-		return super.performOk();
-	}
-
-	/**
-	 * Initializes this preference page using the passed desktop.
-	 *
-	 * @param desktop the current desktop
-	 */
-	public void init(IWorkbench workbench) {
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/EnvironmentBlock.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/EnvironmentBlock.java
deleted file mode 100644
index f779a24..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/EnvironmentBlock.java
+++ /dev/null

@@ -1,314 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.preferences;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Locale;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.TreeSet;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.pde.internal.core.IEnvironmentVariables;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.launcher.VMHelper;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-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.ui.PlatformUI;
-
-public class EnvironmentBlock implements IEnvironmentVariables {
-	private Combo fOSCombo;
-	private Combo fWSCombo;
-	private Combo fNLCombo;
-	private Combo fArchCombo;
-	
-	private Preferences preferences;
-	private TreeSet fNLChoices;
-	private TreeSet fOSChoices;
-	private TreeSet fWSChoices;
-	private TreeSet fArchChoices;
-	private Combo fJRECombo;
-	
-	private static boolean LOCALES_INITIALIZED = false;
-	private String fDefaultJRE;
-
-	public EnvironmentBlock() {
-		preferences = PDECore.getDefault().getPluginPreferences();
-	}
-	
-	private void initializeChoices() {
-		fOSChoices = new TreeSet();
-		String[] os = Platform.knownOSValues();
-		for (int i = 0; i < os.length; i++)
-			fOSChoices.add(os[i]);
-		addExtraChoices(fOSChoices, preferences.getString(OS_EXTRA));
-		
-		fWSChoices = new TreeSet();
-		String[] ws = Platform.knownWSValues();
-		for (int i = 0; i < ws.length; i++)
-			fWSChoices.add(ws[i]);
-		addExtraChoices(fWSChoices, preferences.getString(WS_EXTRA));
-		
-		fArchChoices = new TreeSet();
-		String[] arch = Platform.knownOSArchValues();
-		for (int i = 0; i < arch.length; i++)
-			fArchChoices.add(arch[i]);
-		addExtraChoices(fArchChoices, preferences.getString(ARCH_EXTRA));
-		
-		fNLChoices = new TreeSet();
-		if (LOCALES_INITIALIZED) {
-			initializeAllLocales();
-		} else {
-			fNLChoices.add(expandLocaleName(preferences.getString(NL)));
-		}
-	}
-	
-	protected void updateChoices() {
-		if (LOCALES_INITIALIZED)
-			return;
-		final String current = fNLCombo.getText();
-		try {
-			PlatformUI.getWorkbench().getProgressService().busyCursorWhile(new IRunnableWithProgress() {
-				public void run(IProgressMonitor monitor) {
-					initializeAllLocales();
-					LOCALES_INITIALIZED = true;
-				}
-			});
-		} catch (InvocationTargetException e) {
-			PDEPlugin.log(e);
-		} catch (InterruptedException e) {
-			PDEPlugin.log(e);
-		}
-		fNLCombo.setItems((String[])fNLChoices.toArray(new String[fNLChoices.size()]));
-		fNLCombo.setText(current);
-	}
-	
-	private void initializeAllLocales() {
-		String[] nl = getLocales();
-		for (int i = 0; i < nl.length; i++)
-			fNLChoices.add(nl[i]);
-		addExtraChoices(fNLChoices, preferences.getString(NL_EXTRA));	
-	}
-	
-	private void addExtraChoices(Set set, String preference) {
-		StringTokenizer tokenizer = new StringTokenizer(preference);
-		while (tokenizer.hasMoreTokens()) {
-			set.add(tokenizer.nextToken().trim());
-		}
-	}
-
-	public Control createContents(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.verticalSpacing = 15;
-		container.setLayout(layout);
-		container.setLayoutData(new GridData(GridData.FILL_BOTH));
-		
-		createTargetEnvironmentGroup(container);
-		createJREGroup(container);
-		
-		Dialog.applyDialogFont(container);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(container, IHelpContextIds.TARGET_ENVIRONMENT_PREFERENCE_PAGE);
-		return container;
-	}
-	
-	private void createJREGroup(Composite container) {
-		Group group = new Group(container, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		group.setLayout(layout);
-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		group.setText(PDEUIMessages.EnvironmentBlock_jreTitle);
-		
-		Label label = new Label(group, SWT.NONE);
-		label.setText(PDEUIMessages.EnvironmentBlock_jreGroup);  
-		
-		fJRECombo = new Combo(group, SWT.SINGLE|SWT.READ_ONLY);
-		fJRECombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fJRECombo.setItems(VMHelper.getVMInstallNames());
-		fDefaultJRE = VMHelper.getDefaultVMInstallName();
-		fJRECombo.setText(fDefaultJRE);
-		
-		label = new Label(group, SWT.WRAP);
-		label.setText(PDEUIMessages.EnvironmentBlock_jreNote); 
-		GridData gd = new GridData();
-		gd.horizontalSpan = 2;
-		gd.horizontalIndent = 25;
-		gd.widthHint = 400;
-		label.setLayoutData(gd);
-	}
-
-	private void createTargetEnvironmentGroup(Composite container) {
-		Group group = new Group(container, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		group.setLayout(layout);	
-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		group.setText(PDEUIMessages.EnvironmentBlock_targetEnv); 
-		
-		initializeChoices();
-		
-		Label label = new Label(group, SWT.NULL);
-		label.setText(PDEUIMessages.Preferences_TargetEnvironmentPage_os);
-		
-		fOSCombo = new Combo(group, SWT.SINGLE | SWT.BORDER);
-		fOSCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fOSCombo.setItems((String[])fOSChoices.toArray(new String[fOSChoices.size()]));
-		
-		label = new Label(group, SWT.NULL);
-		label.setText(PDEUIMessages.Preferences_TargetEnvironmentPage_ws);
-		
-		fWSCombo = new Combo(group, SWT.SINGLE | SWT.BORDER);
-		fWSCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fWSCombo.setItems((String[])fWSChoices.toArray(new String[fWSChoices.size()]));
-		
-		label = new Label(group, SWT.NULL);
-		label.setText(PDEUIMessages.Preferences_TargetEnvironmentPage_arch);
-		
-		fArchCombo = new Combo(group, SWT.SINGLE | SWT.BORDER);
-		fArchCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fArchCombo.setItems((String[])fArchChoices.toArray(new String[fArchChoices.size()]));
-		
-		label = new Label(group, SWT.NULL);
-		label.setText(PDEUIMessages.Preferences_TargetEnvironmentPage_nl);
-		
-		fNLCombo = new Combo(group, SWT.SINGLE | SWT.BORDER);
-		fNLCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fNLCombo.setItems((String[])fNLChoices.toArray(new String[fNLChoices.size()]));
-				
-		fOSCombo.setText(preferences.getString(OS));
-		fWSCombo.setText(preferences.getString(WS));
-		fNLCombo.setText(expandLocaleName(preferences.getString(NL)));
-		fArchCombo.setText(preferences.getString(ARCH));		
-	}
-	
-	/**
-	 * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
-	 */
-	protected void performDefaults() {
-		fOSCombo.setText(preferences.getDefaultString(OS));
-		fWSCombo.setText(preferences.getDefaultString(WS));
-		fNLCombo.setText(expandLocaleName(preferences.getDefaultString(NL)));
-		fArchCombo.setText(preferences.getDefaultString(ARCH));
-		fJRECombo.setText(VMHelper.getDefaultVMInstallName());
-	}
-
-	public boolean performOk() {
-		applyTargetEnvironmentGroup();
-		applyJREGroup();
-		return true;
-	}
-	
-	private void applyJREGroup() {
-		try {
-			if (!fDefaultJRE.equals(VMHelper.getDefaultVMInstallName()))
-				return;
-			
-			if (!VMHelper.getDefaultVMInstallName().equals(fJRECombo.getText()))
-				JavaRuntime.setDefaultVMInstall(VMHelper.getVMInstall(fJRECombo.getText()), null);
-		} catch (CoreException e) {
-		}
-	}
-	
-	private void applyTargetEnvironmentGroup() {
-		String os = fOSCombo.getText().trim();
-		if (os.length() > 0) {
-			if (!fOSChoices.contains(os)) {
-				String value = preferences.getString(OS_EXTRA);
-				value = (value.length() > 0) ? value + "," + os : os; //$NON-NLS-1$
-				preferences.setValue(OS_EXTRA, value);
-			}
-			preferences.setValue(OS, os);
-		}
-		
-		String ws = fWSCombo.getText().trim();
-		if (ws.length() > 0) {
-			if (!fWSChoices.contains(ws)) {
-				String value = preferences.getString(WS_EXTRA);
-				value = (value.length() > 0) ? value + "," + ws : ws; //$NON-NLS-1$
-				preferences.setValue(WS_EXTRA, value);
-			}
-			preferences.setValue(WS, ws);
-		}
-		
-		String arch = fArchCombo.getText().trim();
-		if (arch.length() > 0) {
-			if (!fArchChoices.contains(arch)) {
-				String value = preferences.getString(ARCH_EXTRA);
-				value = (value.length() > 0) ? value + "," + arch : arch; //$NON-NLS-1$
-				preferences.setValue(ARCH_EXTRA, value);
-			}
-			preferences.setValue(ARCH, arch);
-		}
-		
-		String locale = fNLCombo.getText().trim();
-		if (locale.length() > 0) {
-			if (!fNLChoices.contains(locale)) {
-				String value = preferences.getString(NL_EXTRA);
-				value = (value.length() > 0) ? value + "," + locale : locale; //$NON-NLS-1$
-				preferences.setValue(NL_EXTRA, value);
-			}			
-			int dash = locale.indexOf("-"); //$NON-NLS-1$
-			if (dash != -1)
-				locale = locale.substring(0, dash);
-			locale = locale.trim();
-			preferences.setValue(NL, locale);
-		}
-		PDECore.getDefault().savePluginPreferences();
-	}
-		
-	
-	private String expandLocaleName(String name) {
-		String language = ""; //$NON-NLS-1$
-		String country = ""; //$NON-NLS-1$
-		String variant = ""; //$NON-NLS-1$
-		
-		StringTokenizer tokenizer = new StringTokenizer(name, "_"); //$NON-NLS-1$
-		if (tokenizer.hasMoreTokens())
-			language = tokenizer.nextToken();
-		if (tokenizer.hasMoreTokens())
-			country = tokenizer.nextToken();
-		if (tokenizer.hasMoreTokens())
-			variant = tokenizer.nextToken();
-			
-		Locale locale = new Locale(language, country, variant);
-		return locale.toString() + " - " + locale.getDisplayName(); //$NON-NLS-1$
-	}
-
-	private static String[] getLocales() {
-		Locale[] locales = Locale.getAvailableLocales();
-		String[] result = new String[locales.length];
-		for (int i = 0; i < locales.length; i++) {
-			Locale locale = locales[i];
-			StringBuffer buffer = new StringBuffer();
-			buffer.append(locale.toString());
-			buffer.append(" - "); //$NON-NLS-1$
-			buffer.append(locale.getDisplayName());
-			result[i] = buffer.toString();
-		}
-		return result;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/ExternalPluginsBlock.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/ExternalPluginsBlock.java
deleted file mode 100644
index 5bf713c..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/ExternalPluginsBlock.java
+++ /dev/null

@@ -1,491 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.preferences;
-
-import java.lang.reflect.*;
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jface.operation.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.window.*;
-import org.eclipse.osgi.service.resolver.BundleDescription;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.elements.*;
-import org.eclipse.pde.internal.ui.parts.*;
-import org.eclipse.pde.internal.ui.util.*;
-import org.eclipse.pde.internal.ui.wizards.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.custom.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.dialogs.*;
-import org.eclipse.ui.forms.widgets.*;
-
-
-public class ExternalPluginsBlock {
-	private CheckboxTableViewer fPluginListViewer;
-	private TargetPlatformPreferencePage fPage;
-	private boolean fReloaded;
-	private TablePart fTablePart;
-	private HashSet fChangedModels = new HashSet();
-	private IPluginModelBase[] fInitialModels;
-	private IPluginModelBase[] fModels;
-	private PDEState fCurrentState;
-	private Button fIncludeFragments;
-
-	
-	class ReloadOperation implements IRunnableWithProgress {
-		private String location;
-		
-		public ReloadOperation(String platformPath) {
-			this.location = platformPath;
-		}
-			
-		public void run(IProgressMonitor monitor)
-			throws InvocationTargetException, InterruptedException {	
-			URL[] pluginPaths = PluginPathFinder.getPluginPaths(location);
-			fCurrentState = new PDEState(pluginPaths, true, monitor);
-			fModels = fCurrentState.getModels();		
-		}
-		
-	}
-	
-	public class PluginContentProvider
-		extends DefaultContentProvider
-		implements IStructuredContentProvider {
-		public Object[] getElements(Object parent) {
-			return getAllModels();
-		}
-	}
-
-	class TablePart extends WizardCheckboxTablePart {
-		public TablePart(String[] buttonLabels) {
-			super(null, buttonLabels);
-		}
-
-		protected void buttonSelected(Button button, int index) {
-			switch (index) {
-				case 0:
-					handleReload();
-					break;
-				case 5:
-					handleWorkingSets();
-					break;
-				case 6:
-					handleAddRequired();
-					break;
-				case 7:
-					selectNotInWorkspace();
-					break;
-				default:
-					super.buttonSelected(button, index);
-			}
-		}
-
-		protected StructuredViewer createStructuredViewer(
-			Composite parent,
-			int style,
-			FormToolkit toolkit) {
-			StructuredViewer viewer =
-				super.createStructuredViewer(parent, style, toolkit);
-			viewer.setSorter(ListUtil.PLUGIN_SORTER);
-			return viewer;
-		}
-
-		protected void elementChecked(Object element, boolean checked) {
-			IPluginModelBase model = (IPluginModelBase) element;
-			if (fChangedModels.contains(model) && model.isEnabled() == checked) {
-				fChangedModels.remove(model);
-			} else if (model.isEnabled() != checked) {
-				fChangedModels.add(model);
-			}
-			super.elementChecked(element, checked);
-		}
-		
-		protected void handleSelectAll(boolean select) {
-			super.handleSelectAll(select);
-			IPluginModelBase[] allModels = getAllModels();
-			for (int i = 0; i < allModels.length; i++) {
-				IPluginModelBase model = allModels[i];
-				if (model.isEnabled() != select) {
-					fChangedModels.add(model);
-				} else if (fChangedModels.contains(model) && model.isEnabled() == select) {
-					fChangedModels.remove(model);
-				}
-			}
-		}
-		
-		public void incrementCounter(int increment) {
-			updateCounter(getSelectionCount() + increment);
-		}
-	}
-
-	public ExternalPluginsBlock(TargetPlatformPreferencePage page) {
-		this.fPage = page;
-		String[] buttonLabels =
-			{
-				PDEUIMessages.ExternalPluginsBlock_reload,
-				null,
-				null,
-				PDEUIMessages.WizardCheckboxTablePart_selectAll,
-				PDEUIMessages.WizardCheckboxTablePart_deselectAll,
-				PDEUIMessages.ExternalPluginsBlock_workingSet, 
-				PDEUIMessages.ExternalPluginsBlock_addRequired, 
-				PDEUIMessages.ExternalPluginsBlock_workspace};
-		fTablePart = new TablePart(buttonLabels);
-		fTablePart.setSelectAllIndex(3);
-		fTablePart.setDeselectAllIndex(4);
-		PDEPlugin.getDefault().getLabelProvider().connect(this);
-	}
-
-	void computeDelta() {
-		int type = 0;
-		IModel[] addedArray = null;
-		IModel[] removedArray = null;
-		IModel[] changedArray = null;
-		if (fReloaded) {
-			type =
-				IModelProviderEvent.MODELS_REMOVED
-					| IModelProviderEvent.MODELS_ADDED | IModelProviderEvent.TARGET_CHANGED;
-			removedArray = fInitialModels;
-			addedArray = getAllModels();
-		} else if (fChangedModels.size() > 0) {
-			type |= IModelProviderEvent.MODELS_CHANGED;
-			changedArray = (IModel[]) fChangedModels.toArray(new IModel[fChangedModels.size()]);
-		}
-		fChangedModels.clear();
-		if (type != 0) {
-			ExternalModelManager registry =
-				PDECore.getDefault().getExternalModelManager();
-			ModelProviderEvent event =
-				new ModelProviderEvent(
-					registry,
-					type,
-					addedArray,
-					removedArray,
-					changedArray);
-			registry.fireModelProviderEvent(event);
-		}
-	}
-
-	public Control createContents(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		container.setLayout(layout);
-
-		fTablePart.createControl(container);
-
-		fPluginListViewer = fTablePart.getTableViewer();
-		fPluginListViewer.setContentProvider(new PluginContentProvider());
-		fPluginListViewer.setLabelProvider(PDEPlugin.getDefault().getLabelProvider());
-
-		GridData gd = (GridData) fTablePart.getControl().getLayoutData();
-		gd.heightHint = 100;
-				
-		fIncludeFragments = new Button(container, SWT.CHECK);
-		fIncludeFragments.setText(PDEUIMessages.ExternalPluginsBlock_includeFragments); 
-		gd = new GridData();
-		gd.horizontalSpan = 2;
-		gd.verticalIndent = 5;
-		gd.horizontalIndent = 5;
-		fIncludeFragments.setLayoutData(gd);
-		fIncludeFragments.setSelection(PDECore.getDefault().getPluginPreferences().getBoolean(ICoreConstants.INCLUDE_FRAGMENTS));
-		return container;
-	}
-
-
-	public void dispose() {
-		PDEPlugin.getDefault().getLabelProvider().disconnect(this);
-	}
-
-	public IPluginModelBase[] getAllModels() {
-		if (fModels == null) {
-			fInitialModels =
-				PDECore.getDefault().getModelManager().getExternalModels();
-			return fInitialModels;
-		}
-		return fModels;
-	}
-
-	protected void handleReload() {
-		String platformPath = fPage.getPlatformPath();
-		if (platformPath != null && platformPath.length() > 0) {
-			ReloadOperation op = new ReloadOperation(platformPath);
-			try {
-				PlatformUI.getWorkbench().getProgressService().run(true, false, op);
-			} catch (InvocationTargetException e) {
-			} catch (InterruptedException e) {
-			}
-			fPluginListViewer.setInput(PDECore.getDefault().getExternalModelManager());
-			fChangedModels.clear();
-			handleSelectAll(true);
-			fReloaded = true;
-			fPage.getSourceBlock().resetExtensionLocations(getAllModels());
-		}
-		fPage.resetNeedsReload();
-	}
-
-	public void initialize() {
-		String platformPath = fPage.getPlatformPath();
-		if (platformPath != null && platformPath.length() == 0)
-			return;
-
-		fPluginListViewer.setInput(PDECore.getDefault().getExternalModelManager());
-		IPluginModelBase[] allModels = getAllModels();
-
-		Vector selection = new Vector();
-		for (int i = 0; i < allModels.length; i++) {
-			IPluginModelBase model = allModels[i];
-			if (model.isEnabled()) {
-				selection.add(model);
-			}
-		}
-		fTablePart.setSelection(selection.toArray());
-	}
-
-	public void performOk() {
-		BusyIndicator.showWhile(fPage.getShell().getDisplay(), new Runnable() {
-			public void run() {
-				savePreferences();
-				if (fReloaded)
-					EclipseHomeInitializer.resetEclipseHomeVariable();
-				if (fReloaded) {
-					IPluginModelBase[] models = PDECore.getDefault().getModelManager().getWorkspaceModels();
-					for (int i = 0; i < models.length; i++) {
-						BundleDescription bundle = models[i].getBundleDescription();
-						if (bundle == null)
-							continue;
-						BundleDescription[] conflicts = fCurrentState.getState().getBundles(bundle.getSymbolicName());
-						for (int j = 0; j < conflicts.length; j++)
-							fCurrentState.getState().removeBundle(conflicts[j]);
-						fCurrentState.addBundle(models[i], false);
-					}
-					if (models.length > 0)
-						fCurrentState.resolveState(true);
-					PDECore.getDefault().getExternalModelManager().setModels(fCurrentState.getTargetModels());
-					PDECore.getDefault().getModelManager().setState(fCurrentState);
-					PDECore.getDefault().getFeatureModelManager().targetReloaded();				
-				}
-				updateModels();
-				computeDelta();
-			}
-		});
-	}
-	
-	private void savePreferences() {
-		Preferences preferences = PDECore.getDefault().getPluginPreferences();
-		IPath newPath = new Path(fPage.getPlatformPath());
-		IPath defaultPath = new Path(ExternalModelManager.computeDefaultPlatformPath());
-		String mode =
-			ExternalModelManager.arePathsEqual(newPath, defaultPath)
-				? ICoreConstants.VALUE_USE_THIS
-				: ICoreConstants.VALUE_USE_OTHER;
-		preferences.setValue(ICoreConstants.TARGET_MODE, mode);
-		preferences.setValue(ICoreConstants.PLATFORM_PATH, fPage.getPlatformPath());
-		String[] locations = fPage.getPlatformLocations();
-		for (int i = 0; i < locations.length && i < 5; i++) {
-			preferences.setValue(ICoreConstants.SAVED_PLATFORM + i, locations[i]);
-		}
-		preferences.setValue(ICoreConstants.INCLUDE_FRAGMENTS, fIncludeFragments.getSelection());
-		PDECore.getDefault().savePluginPreferences();
-	}
-	
-	private void updateModels() {
-		Iterator iter = fChangedModels.iterator();
-		while (iter.hasNext()) {
-			IPluginModelBase model = (IPluginModelBase) iter.next();
-			model.setEnabled(fTablePart.getTableViewer().getChecked(model));
-		}
-	}
-	
-	private void selectNotInWorkspace() {
-		IPluginModelBase[] wsModels = PDECore.getDefault().getModelManager().getWorkspaceModels();
-		IPluginModelBase[] exModels = getAllModels();
-		Vector selected = new Vector();
-		for (int i = 0; i < exModels.length; i++) {
-			IPluginModelBase exModel = exModels[i];
-			boolean inWorkspace = false;
-			for (int j = 0; j < wsModels.length; j++) {
-				IPluginModelBase wsModel = wsModels[j];
-				String extId = exModel.getPluginBase().getId();
-				String wsId = wsModel.getPluginBase().getId();
-				if (extId != null && wsId != null && extId.equals(wsId)) {
-					inWorkspace = true;
-					break;
-				}
-			}
-			if (!inWorkspace) {
-				selected.add(exModel);
-			}
-			if (exModel.isEnabled() == inWorkspace)
-				fChangedModels.add(exModel);
-			else if (fChangedModels.contains(exModel))
-				fChangedModels.remove(exModel);
-		}
-		fTablePart.setSelection(selected.toArray());
-	}
-	
-	public void handleSelectAll(boolean selected) {
-		fTablePart.selectAll(selected);
-	}
-	
-	private void handleWorkingSets() {
-		IWorkingSetManager manager = PlatformUI.getWorkbench().getWorkingSetManager();
-		IWorkingSetSelectionDialog dialog = manager.createWorkingSetSelectionDialog(fTablePart.getControl().getShell(), true);
-		if (dialog.open() == Window.OK) {
-			HashSet set = getPluginIDs(dialog.getSelection());
-			IPluginModelBase[] models = getAllModels();
-			int counter = 0;
-			for (int i = 0; i < models.length; i++) {
-				String id = models[i].getPluginBase().getId();
-				if (id == null)
-					continue;
-				if (set.contains(id)) {
-					if (!fPluginListViewer.getChecked(models[i])) {
-						fPluginListViewer.setChecked(models[i], true);
-						counter += 1;
-						if (!models[i].isEnabled())
-							fChangedModels.add(models[i]);
-					}
-					set.remove(id);
-				}
-				if (set.isEmpty())
-					break;				
-			}
-			fTablePart.incrementCounter(counter);
-		}
-	}
-	
-	private HashSet getPluginIDs(IWorkingSet[] workingSets) {
-		HashSet set = new HashSet();
-		for (int i = 0; i < workingSets.length; i++) {
-			IAdaptable[] elements = workingSets[i].getElements();
-			for (int j = 0; j < elements.length; j++) {
-				Object element = elements[j];
-				if (element instanceof PersistablePluginObject) {
-					set.add(((PersistablePluginObject)element).getPluginID());
-				} else {
-					if (element instanceof IJavaProject)
-						element = ((IJavaProject)element).getProject();
-					if (element instanceof IProject) {
-						IPluginModelBase model = PDECore.getDefault().getModelManager().findModel((IProject)element);
-						if (model != null)
-							set.add(model.getPluginBase().getId());
-					}
-				}
-			}
-		}
-		return set;
-	}
-	
-	private void handleAddRequired() {
-		TableItem[] items = fTablePart.getTableViewer().getTable().getItems();
-		
-		if (items.length == 0)
-			return;
-		
-		ArrayList result = new ArrayList();
-		for (int i = 0; i < items.length; i++) {
-			IPluginModelBase model = (IPluginModelBase)items[i].getData();
-			if (fTablePart.getTableViewer().getChecked(model))
-				addPluginAndDependencies((IPluginModelBase) items[i].getData(), result);
-		}
-		fTablePart.setSelection(result.toArray());
-	}
-	
-	protected void addPluginAndDependencies(
-			IPluginModelBase model,
-			ArrayList selected) {
-				
-			if (!selected.contains(model)) {
-				selected.add(model);
-				if (!model.isEnabled())
-					fChangedModels.add(model);
-				addDependencies(getAllModels(), model, selected);
-			}
-		}
-		
-	protected void addDependencies(
-	    IPluginModelBase[] models,
-		IPluginModelBase model,
-		ArrayList selected) {
-		
-		IPluginImport[] required = model.getPluginBase().getImports();
-		if (required.length > 0) {
-			for (int i = 0; i < required.length; i++) {
-				IPluginModelBase found = findModel(models, required[i].getId());
-				if (found != null) {
-					addPluginAndDependencies(found, selected);
-				}
-			}
-		}
-		
-		if (model instanceof IPluginModel) {
-			boolean addFragments = fIncludeFragments.getSelection()
-							|| ClasspathUtilCore.hasExtensibleAPI((IPlugin)model.getPluginBase());
-			if (!addFragments) {
-				IPluginLibrary[] libraries = model.getPluginBase().getLibraries();
-				for (int i = 0; i < libraries.length; i++) {
-					if (ClasspathUtilCore.containsVariables(libraries[i].getName())) {
-						addFragments = true;
-						break;
-					}
-				}
-			}
-			if (addFragments) {
-				IFragmentModel[] fragments = findFragments(models, ((IPluginModel)model).getPlugin());
-				for (int i = 0; i < fragments.length; i++) {
-					addPluginAndDependencies(fragments[i], selected);
-				}
-			}
-		} else {
-			IFragment fragment = ((IFragmentModel) model).getFragment();
-			IPluginModelBase found = findModel(models, fragment.getPluginId());
-			if (found != null) {
-				addPluginAndDependencies(found, selected);
-			}
-		}
-	}
-
-	private IPluginModelBase findModel(IPluginModelBase[] models, String id) {
-		for (int i = 0; i < models.length; i++) {
-			String modelId = models[i].getPluginBase().getId();
-			if (modelId != null && modelId.equals(id))
-				return models[i];
-		}
-		return null;
-	}
-
-	private IFragmentModel[] findFragments(IPluginModelBase[] models, IPlugin plugin) {
-		ArrayList result = new ArrayList();
-		for (int i = 0; i < models.length; i++) {
-			if (models[i] instanceof IFragmentModel) {
-				IFragment fragment = ((IFragmentModel) models[i]).getFragment();
-				if (plugin.getId().equalsIgnoreCase(fragment.getPluginId())) {
-					result.add(models[i]);
-				}
-			}
-		}
-		return (IFragmentModel[]) result.toArray(new IFragmentModel[result.size()]);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/MainPreferencePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/MainPreferencePage.java
deleted file mode 100644
index 0cf1943..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/MainPreferencePage.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.preferences;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.IPreferenceConstants;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.swt.SWT;
-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.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-
-public class MainPreferencePage
-	extends PreferencePage
-	implements IWorkbenchPreferencePage, IPreferenceConstants {
-	private Button useID;
-	private Button useName;
-	
-	public MainPreferencePage() {
-		setPreferenceStore(PDEPlugin.getDefault().getPreferenceStore());
-		setDescription(PDEUIMessages.Preferences_MainPage_Description);
-	}
-
-	protected Control createContents(Composite parent) {
-		IPreferenceStore store = PDEPlugin.getDefault().getPreferenceStore();
-		
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(new GridLayout());
-		
-		Group group = new Group(composite, SWT.NONE);
-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));		
-		group.setText(PDEUIMessages.Preferences_MainPage_showObjects);
-		group.setLayout(new GridLayout());
-		
-		useID = new Button(group, SWT.RADIO);
-		useID.setText(PDEUIMessages.Preferences_MainPage_useIds);
-		
-		useName = new Button(group, SWT.RADIO);
-		useName.setText(PDEUIMessages.Preferences_MainPage_useFullNames);
-		
-		if (store.getString(PROP_SHOW_OBJECTS).equals(VALUE_USE_IDS)) {
-			useID.setSelection(true);
-		} else {
-			useName.setSelection(true);
-		}
-		
-		return composite;		
-	}
-	
-	public void createControl(Composite parent) {
-		super.createControl(parent);
-		Dialog.applyDialogFont(getControl());
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IHelpContextIds.MAIN_PREFERENCE_PAGE);
-	}	
-
-	public boolean performOk() {
-		IPreferenceStore store = PDEPlugin.getDefault().getPreferenceStore();
-		if (useID.getSelection()) {
-			store.setValue(PROP_SHOW_OBJECTS, VALUE_USE_IDS);
-		} else {
-			store.setValue(PROP_SHOW_OBJECTS, VALUE_USE_NAMES);
-		}
-		PDEPlugin.getDefault().savePluginPreferences();
-		return super.performOk();
-	}
-	
-	protected void performDefaults() {
-		IPreferenceStore store = PDEPlugin.getDefault().getPreferenceStore();
-		if (store.getDefaultString(PROP_SHOW_OBJECTS).equals(VALUE_USE_IDS)) {
-			useID.setSelection(true);
-			useName.setSelection(false);
-		} else {
-			useID.setSelection(false);
-			useName.setSelection(true);
-		}
-	}
-
-	/**
-	 * Initializes this preference page using the passed desktop.
-	 *
-	 * @param desktop the current desktop
-	 */
-	public void init(IWorkbench workbench) {
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/PDEPreferencesUtil.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/PDEPreferencesUtil.java
deleted file mode 100644
index c0f10e3..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/PDEPreferencesUtil.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.preferences;
-
-import org.eclipse.jface.preference.IPreferenceNode;
-import org.eclipse.jface.preference.PreferenceDialog;
-import org.eclipse.jface.preference.PreferenceManager;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.dialogs.PreferencesUtil;
-
-public class PDEPreferencesUtil {
-	
-	public static boolean showPreferencePage(String[] pageIds) {
-		final Shell shell = PDEPlugin.getActiveWorkbenchShell();
-		final PreferenceDialog dialog = PreferencesUtil.createPreferenceDialogOn(shell, pageIds[0], pageIds, null);
-		return dialog.open() == PreferenceDialog.OK;
-	}
-	
-	public static boolean showPreferencePage(final IPreferenceNode targetNode) {
-		PreferenceManager manager = new PreferenceManager();
-		manager.addToRoot(targetNode);
-		final Shell shell = PDEPlugin.getActiveWorkbenchShell();
-		final PreferenceDialog dialog = new PreferenceDialog(shell, manager);
-		final boolean[] result = new boolean[] { false };
-		BusyIndicator.showWhile(shell.getDisplay(), new Runnable() {
-			public void run() {
-				dialog.create();
-				dialog.setMessage(targetNode.getLabelText());
-				if (dialog.open() == PreferenceDialog.OK)
-					result[0] = true;
-			}
-		});
-		return result[0];
-	}
-
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/PreferenceInitializer.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/PreferenceInitializer.java
deleted file mode 100644
index 40c50b2..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/PreferenceInitializer.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.preferences;
-
-import org.eclipse.core.runtime.preferences.*;
-import org.eclipse.jface.preference.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.text.*;
-
-public class PreferenceInitializer extends AbstractPreferenceInitializer implements IPreferenceConstants {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
-	 */
-	public void initializeDefaultPreferences() {
-		IPreferenceStore store = PDEPlugin.getDefault().getPreferenceStore();
-		ColorManager.initializeDefaults(store);
-		store.setDefault(P_USE_SOURCE_PAGE, false);
-		store.setDefault(PROP_SHOW_OBJECTS, VALUE_USE_IDS);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/SourceBlock.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/SourceBlock.java
deleted file mode 100644
index 0d04905..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/SourceBlock.java
+++ /dev/null

@@ -1,295 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.preferences;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.pde.core.plugin.IPluginExtensionPoint;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.ICoreConstants;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.SourceLocation;
-import org.eclipse.pde.internal.core.SourceLocationManager;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
-import org.eclipse.pde.internal.ui.search.ShowDescriptionAction;
-import org.eclipse.pde.internal.ui.util.OverlayIcon;
-import org.eclipse.pde.internal.ui.util.SWTUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-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.DirectoryDialog;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-
-
-public class SourceBlock {	
-	private Image fFolderImage;
-	private TreeViewer fTreeViewer;
-	private Image fExtensionImage;
-	private Image fUserImage;
-	
-	private SourceLocation[] fExtensionLocations = new SourceLocation[0];
-	private ArrayList fUserLocations = new ArrayList();
-	private NamedElement fSystemNode;
-	private NamedElement fUserNode;
-	private Button fAddButton;
-	private Button fRemoveButton;
-	
-	class NamedElement {
-		String text;
-		public NamedElement(String text) {
-			this.text = text;
-		}
-		public String toString() {
-			return text;
-		}
-	}
-
-	class SourceProvider extends DefaultContentProvider implements ITreeContentProvider {
-		public Object[] getElements(Object input) {
-			return new Object[] {fSystemNode, fUserNode};
-		}
-
-		public Object[] getChildren(Object element) {
-			if (element.equals(fUserNode))
-				return fUserLocations.toArray();
-			if (element.equals(fSystemNode))
-				return fExtensionLocations;
-			return new Object[0];
-		}
-
-		public Object getParent(Object element) {
-			if (element instanceof SourceLocation) {
-				SourceLocation loc = (SourceLocation)element;
-				return loc.isUserDefined() ? fUserNode : fSystemNode;
-			}
-			return null;
-		}
-
-		public boolean hasChildren(Object element) {
-			if (element.equals(fSystemNode))
-				return fExtensionLocations.length > 0;
-			if (element.equals(fUserNode))
-				return fUserLocations.size() > 0;
-			return false;
-		}
-	}
-
-	class SourceLabelProvider extends LabelProvider {		
-		public String getText(Object obj) {
-			if (obj instanceof SourceLocation) {
-				SourceLocation location = (SourceLocation) obj;
-				return location.getPath().toOSString();
-			}
-			return super.getText(obj);
-		}
-		public Image getImage(Object obj) {
-			if (obj instanceof SourceLocation)
-				return fFolderImage;
-		
-			return obj.equals(fUserNode)? fUserImage : fExtensionImage;
-		}	
-	}
-
-	public SourceBlock() {
-		initializeImages();
-		fSystemNode = new NamedElement(PDEUIMessages.SourceBlock_target); 
-		fUserNode = new NamedElement(PDEUIMessages.SourceBlock_additional); 
-		SourceLocationManager manager = PDECore.getDefault().getSourceLocationManager();
-		fExtensionLocations = manager.getExtensionLocations();
-		fUserLocations.addAll(Arrays.asList(manager.getUserLocations()));
-	}
-	
-	private void initializeImages() {
-		fExtensionImage = PDEPluginImages.DESC_SOURCE_ATTACHMENT_OBJ.createImage();
-		ImageDescriptor userDesc =
-			new OverlayIcon(
-				PDEPluginImages.DESC_SOURCE_ATTACHMENT_OBJ,
-				new ImageDescriptor[][] { { PDEPluginImages.DESC_DOC_CO }
-		});
-		fUserImage = userDesc.createImage();
-		fFolderImage = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FOLDER);
-	}
-	
-	public void resetExtensionLocations(IPluginModelBase[] models) {
-		fExtensionLocations = SourceLocationManager.computeSourceLocations(models);
-		fTreeViewer.refresh(fSystemNode);
-	}
-
-	private String encodeSourceLocations() {
-		StringBuffer buf = new StringBuffer();
-		for (int i = 0; i < fUserLocations.size(); i++) {
-			if (i > 0)
-				buf.append(File.pathSeparatorChar);
-			buf.append(((SourceLocation) fUserLocations.get(i)).getPath().toOSString());
-		}
-		return buf.toString();
-	}
-	
-	public void dispose() {
-		fExtensionImage.dispose();
-		fUserImage.dispose();
-	}
-
-	/**
-	 * @see IPreferencePage#performOk()
-	 */
-	public boolean performOk() {
-		Preferences preferences = PDECore.getDefault().getPluginPreferences();
-		preferences.setValue(ICoreConstants.P_SOURCE_LOCATIONS, encodeSourceLocations());
-		PDECore.getDefault().getSourceLocationManager().setExtensionLocations(fExtensionLocations);
-		PDECore.getDefault().getJavadocLocationManager().reset();
-		return true;
-	}
-	
-	public void performDefaults() {
-		fUserLocations.clear();
-		fTreeViewer.refresh();
-	}
-
-	protected void handleAdd() {
-		String path = getDirectoryDialog(null).open();
-		if (path != null) {
-			SourceLocation location = new SourceLocation(new Path(path));
-			fUserLocations.add(location);
-			fTreeViewer.add(fUserNode, location);
-			fTreeViewer.setSelection(new StructuredSelection(location));
-		}
-	}
-	
-	private DirectoryDialog getDirectoryDialog(String filterPath) {
-		DirectoryDialog dialog = new DirectoryDialog(PDEPlugin.getActiveWorkbenchShell());
-		dialog.setMessage(PDEUIMessages.SourcePreferencePage_dialogMessage); 
-		if (filterPath != null)
-			dialog.setFilterPath(filterPath);
-		return dialog;
-	}
-
-	protected void handleRemove() {
-		IStructuredSelection selection = (IStructuredSelection) fTreeViewer.getSelection();
-		Object object = selection.getFirstElement();
-		if (object instanceof SourceLocation) {
-			SourceLocation location = (SourceLocation) object;
-			if (location.isUserDefined()) {
-				fUserLocations.remove(location);
-				fTreeViewer.remove(location);
-			}
-		}
-	}
-
-	/**
-	 * @see IDialogPage#createControl(Composite)
-	 */
-	public Control createContents(Composite parent) {
-		Composite container = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.verticalSpacing = 10;
-		container.setLayout(layout);
-
-		Link text = new Link(container, SWT.WRAP);
-		text.setText(PDEUIMessages.SourceBlock_desc); 
-		GridData gd = new GridData();
-		gd.horizontalSpan = 2;
-		gd.widthHint = 400;
-		text.setLayoutData(gd);
-		text.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-			IPluginExtensionPoint point = PDECore.getDefault().findExtensionPoint("org.eclipse.pde.core.source"); //$NON-NLS-1$
-			if (point != null)
-				new ShowDescriptionAction(point, true).run();	
-			}
-		});
-
-		fTreeViewer = new TreeViewer(container, SWT.BORDER);
-		fTreeViewer.getTree().setLayoutData(new GridData(GridData.FILL_BOTH));
-		fTreeViewer.setContentProvider(new SourceProvider());
-		fTreeViewer.setLabelProvider(new SourceLabelProvider());
-		fTreeViewer.setInput(this);
-		fTreeViewer.expandAll();
-		fTreeViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				IStructuredSelection ssel = (IStructuredSelection)event.getSelection();
-				boolean removeEnabled = false;
-				if (ssel != null && ssel.size() > 0) {
-					Object object = ssel.getFirstElement();
-					removeEnabled = (object instanceof SourceLocation && ((SourceLocation)object).isUserDefined());
-				}
-				fRemoveButton.setEnabled(removeEnabled);
-			}
-		});
-		fTreeViewer.getTree().addKeyListener(new KeyAdapter() {
-			public void keyPressed(KeyEvent event) {
-				if (event.character == SWT.DEL && event.stateMask == 0) {
-					handleRemove();
-				}
-			}
-		});	
-	
-		Composite buttonContainer = new Composite(container, SWT.NONE);
-		layout = new GridLayout();
-		layout.marginWidth = layout.marginHeight = 0;
-		buttonContainer.setLayout(layout);
-		buttonContainer.setLayoutData(new GridData(GridData.FILL_VERTICAL));
-		
-		fAddButton = new Button(buttonContainer, SWT.PUSH);
-		fAddButton.setText(PDEUIMessages.SourceBlock_add); 
-		fAddButton.setLayoutData(new GridData(GridData.FILL | GridData.VERTICAL_ALIGN_BEGINNING));
-		SWTUtil.setButtonDimensionHint(fAddButton);
-		fAddButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleAdd();
-			}
-		});
-		
-		fRemoveButton = new Button(buttonContainer, SWT.PUSH);
-		fRemoveButton.setText(PDEUIMessages.SourceBlock_remove); 
-		fRemoveButton.setLayoutData(new GridData(GridData.FILL | GridData.VERTICAL_ALIGN_BEGINNING));
-		SWTUtil.setButtonDimensionHint(fRemoveButton);
-		fRemoveButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleRemove();
-			}
-		});
-		fRemoveButton.setEnabled(false);
-		
-		Dialog.applyDialogFont(parent);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IHelpContextIds.SOURCE_PREFERENCE_PAGE);
-		return container;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/SourceCodeLocationsPreferenceNode.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/SourceCodeLocationsPreferenceNode.java
deleted file mode 100644
index 92688b4..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/SourceCodeLocationsPreferenceNode.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package org.eclipse.pde.internal.ui.preferences;
-
-public class SourceCodeLocationsPreferenceNode extends TargetPlatformPreferenceNode {
-
-	protected int getIndex() {
-		return TargetPlatformPreferencePage.SOURCE_INDEX;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/TargetEnvironmentPreferenceNode.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/TargetEnvironmentPreferenceNode.java
deleted file mode 100644
index 4e4e379..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/TargetEnvironmentPreferenceNode.java
+++ /dev/null

@@ -1,8 +0,0 @@
-package org.eclipse.pde.internal.ui.preferences;
-
-public class TargetEnvironmentPreferenceNode extends TargetPlatformPreferenceNode {
-
-	protected int getIndex() {
-		return TargetPlatformPreferencePage.ENVIRONMENT_INDEX;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/TargetPlatformPreferenceNode.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/TargetPlatformPreferenceNode.java
deleted file mode 100644
index d843d8e..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/TargetPlatformPreferenceNode.java
+++ /dev/null

@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.preferences;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.preference.IPreferenceNode;
-import org.eclipse.jface.preference.IPreferencePage;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.swt.graphics.Image;
-
-public class TargetPlatformPreferenceNode implements IPreferenceNode {
-	protected TargetPlatformPreferencePage fPage;
-
-	/**
-	 * @see org.eclipse.jface.preference.IPreferenceNode#add(org.eclipse.jface.preference.IPreferenceNode)
-	 */
-	public void add(IPreferenceNode node) {
-	}
-
-	/**
-	 * @see org.eclipse.jface.preference.IPreferenceNode#createPage()
-	 */
-	public void createPage() {
-		fPage = new TargetPlatformPreferencePage(getIndex());
-	}
-	
-	protected int getIndex() {
-		return TargetPlatformPreferencePage.PLUGINS_INDEX;
-	}
-
-	/**
-	 * @see org.eclipse.jface.preference.IPreferenceNode#disposeResources()
-	 */
-	public void disposeResources() {
-		if (fPage!=null) fPage.dispose();
-		fPage = null;
-	}
-
-	/**
-	 * @see org.eclipse.jface.preference.IPreferenceNode#findSubNode(java.lang.String)
-	 */
-	public IPreferenceNode findSubNode(String id) {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.jface.preference.IPreferenceNode#getId()
-	 */
-	public String getId() {
-		return "org.eclipse.pde.ui.TargetPlatformPreferencePage"; //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.jface.preference.IPreferenceNode#getLabelImage()
-	 */
-	public Image getLabelImage() {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.jface.preference.IPreferenceNode#getLabelText()
-	 */
-	public String getLabelText() {
-		return Platform.getResourceString(PDEPlugin.getDefault().getBundle(), "%preferences.target.name"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.jface.preference.IPreferenceNode#getPage()
-	 */
-	public IPreferencePage getPage() {
-		return fPage;
-	}
-
-	/**
-	 * @see org.eclipse.jface.preference.IPreferenceNode#getSubNodes()
-	 */
-	public IPreferenceNode[] getSubNodes() {
-		return new IPreferenceNode [0];
-	}
-
-	/**
-	 * @see org.eclipse.jface.preference.IPreferenceNode#remove(java.lang.String)
-	 */
-	public IPreferenceNode remove(String id) {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.jface.preference.IPreferenceNode#remove(org.eclipse.jface.preference.IPreferenceNode)
-	 */
-	public boolean remove(IPreferenceNode node) {
-		return false;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/TargetPlatformPreferencePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/TargetPlatformPreferencePage.java
deleted file mode 100644
index 1cf562c..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/TargetPlatformPreferencePage.java
+++ /dev/null

@@ -1,259 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.preferences;
-
-
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.pde.internal.core.ExternalModelManager;
-import org.eclipse.pde.internal.core.ICoreConstants;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.util.SWTUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-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.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-
-public class TargetPlatformPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
-
-	public static final int PLUGINS_INDEX = 0;
-	public static final int ENVIRONMENT_INDEX = 1;
-	public static final int SOURCE_INDEX = 2;
-	
-	private Label fHomeLabel;
-	private Combo fHomeText;
-	private Button fBrowseButton;
-	private ExternalPluginsBlock fPluginsBlock;
-	private EnvironmentBlock fEnvironmentBlock;
-	private SourceBlock fSourceBlock;
-	
-	private Preferences fPreferences = null;
-	private boolean fNeedsReload = false;
-	private String fOriginalText;
-	private int fIndex;
-	private TabFolder fTabFolder;
-	
-	/**
-	 * MainPreferencePage constructor comment.
-	 */
-	public TargetPlatformPreferencePage() {
-		this(PLUGINS_INDEX);
-	}
-	
-	public TargetPlatformPreferencePage(int index) {
-		setDescription(PDEUIMessages.Preferences_TargetPlatformPage_Description); 
-		fPreferences = PDECore.getDefault().getPluginPreferences();
-		fPluginsBlock = new ExternalPluginsBlock(this);
-		fIndex = index;
-	}
-	
-	public void dispose() {
-		fPluginsBlock.dispose();
-		fSourceBlock.dispose();
-		super.dispose();
-	}
-
-	public Control createContents(Composite parent) {
-		Composite container = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		layout.marginHeight = layout.marginWidth = 0;
-		container.setLayout(layout);
-
-		fHomeLabel = new Label(container, SWT.NULL);
-		fHomeLabel.setText(PDEUIMessages.Preferences_TargetPlatformPage_PlatformHome); 
-		
-		fHomeText = new Combo(container, SWT.NONE);
-		fHomeText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		ArrayList locations = new ArrayList();
-		for (int i = 0; i < 5; i++) {
-			String value = fPreferences.getString(ICoreConstants.SAVED_PLATFORM + i);
-			if (value.equals(""))  //$NON-NLS-1$
-				break;
-			locations.add(value);
-		}
-		String homeLocation = fPreferences.getString(ICoreConstants.PLATFORM_PATH);
-		if (!locations.contains(homeLocation))
-			locations.add(0, homeLocation);
-		fHomeText.setItems((String[])locations.toArray(new String[locations.size()]));
-		fHomeText.setText(homeLocation);
-		fOriginalText = fHomeText.getText();
-		fHomeText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				fNeedsReload = true;
-			}
-		});
-		fHomeText.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				fPluginsBlock.handleReload();
-				fNeedsReload = false;
-			}
-		});
-		
-		fBrowseButton = new Button(container, SWT.PUSH);
-		fBrowseButton.setText(PDEUIMessages.Preferences_TargetPlatformPage_PlatformHome_Button); 
-		fBrowseButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-		SWTUtil.setButtonDimensionHint(fBrowseButton);
-		fBrowseButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleBrowse();
-			}
-		});
-		
-		
-		fTabFolder = new TabFolder(container, SWT.NONE);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.horizontalSpan = 3;
-		fTabFolder.setLayoutData(gd);
-		
-		BusyIndicator.showWhile(getShell().getDisplay(), new Runnable() {
-			public void run() {	
-			createPluginsTab(fTabFolder);
-			createEnvironmentTab(fTabFolder);
-			createSourceTab(fTabFolder);
-			fTabFolder.setSelection(fIndex);
-			}
-		});
-		
-		fTabFolder.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (fTabFolder.getSelectionIndex() == ENVIRONMENT_INDEX) {
-					fEnvironmentBlock.updateChoices();
-				}
-			}
-		});
-		
-		Dialog.applyDialogFont(container);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(container, IHelpContextIds.TARGET_PLATFORM_PREFERENCE_PAGE);
-		return container;
-	}
-	
-	private void createPluginsTab(TabFolder folder) {
-		Control block = fPluginsBlock.createContents(folder);
-		block.setLayoutData(new GridData(GridData.FILL_BOTH));	
-		fPluginsBlock.initialize();
-
-		TabItem tab = new TabItem(folder, SWT.NONE);
-		tab.setText(PDEUIMessages.TargetPlatformPreferencePage_pluginsTab); 
-		tab.setControl(block);	
-	}
-	
-	private void createEnvironmentTab(TabFolder folder) {
-		fEnvironmentBlock = new EnvironmentBlock();
-		Control block = fEnvironmentBlock.createContents(folder);
-		
-		TabItem tab = new TabItem(folder, SWT.NONE);
-		tab.setText(PDEUIMessages.TargetPlatformPreferencePage_environmentTab); 
-		tab.setControl(block);
-	}
-	
-	private void createSourceTab(TabFolder folder) {
-		fSourceBlock = new SourceBlock();
-		Control block = fSourceBlock.createContents(folder);
-		
-		TabItem tab = new TabItem(folder, SWT.NONE);
-		tab.setText(PDEUIMessages.TargetPlatformPreferencePage_sourceCode);  
-		tab.setControl(block);
-	}
-
-	String getPlatformPath() {
-		return fHomeText.getText();
-	}
-
-	private void handleBrowse() {
-		DirectoryDialog dialog = new DirectoryDialog(getShell());
-		if (fHomeText.getText().length() > 0)
-			dialog.setFilterPath(fHomeText.getText());
-		String newPath = dialog.open();
-		if (newPath != null
-				&& !ExternalModelManager.arePathsEqual(new Path(fHomeText.getText()), new Path(newPath))) {
-			if (fHomeText.indexOf(newPath) == -1)
-				fHomeText.add(newPath, 0);
-			fHomeText.setText(newPath);
-			fPluginsBlock.handleReload();
-			fNeedsReload = false;
-		}
-	}
-
-	public void init(IWorkbench workbench) {
-	}
-	
-	public void performDefaults() {
-		fHomeText.setText(ExternalModelManager.computeDefaultPlatformPath());
-		fPluginsBlock.handleReload();
-		fEnvironmentBlock.performDefaults();
-		fSourceBlock.performDefaults();
-		super.performDefaults();
-	}
-
-	public boolean performOk() {
-		fEnvironmentBlock.performOk();
-		if (fNeedsReload && !ExternalModelManager.arePathsEqual(new Path(fOriginalText), new Path(fHomeText.getText()))) {
-			MessageDialog dialog =
-				new MessageDialog(
-					getShell(),
-					PDEUIMessages.Preferences_TargetPlatformPage_title, 
-					null,
-					PDEUIMessages.Preferences_TargetPlatformPage_question, 
-					MessageDialog.QUESTION,
-					new String[] {
-						IDialogConstants.YES_LABEL,
-						IDialogConstants.NO_LABEL},
-					1);
-			if (dialog.open() == 1) {
-				getContainer().updateButtons();
-				return false;
-			}
-			fPluginsBlock.handleReload();
-		} 
-		fSourceBlock.performOk();
-		fPluginsBlock.performOk();
-		return super.performOk();
-	}
-	
-	public String[] getPlatformLocations() {
-		return fHomeText.getItems();
-	}
-	 
-	public void resetNeedsReload() {
-		fNeedsReload = false;
-		String location = fHomeText.getText();
-		if (fHomeText.indexOf(location) == -1)
-			fHomeText.add(location, 0);
-	}
-	
-	public SourceBlock getSourceBlock() {
-		return fSourceBlock;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/properties/CompilersPropertyPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/properties/CompilersPropertyPage.java
deleted file mode 100644
index cd20a16..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/properties/CompilersPropertyPage.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.properties;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.dialogs.ControlEnableState;
-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.preference.PreferenceNode;
-import org.eclipse.jface.window.Window;
-import org.eclipse.pde.internal.builders.CompilerFlags;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.preferences.CompilersConfigurationBlock;
-import org.eclipse.pde.internal.ui.preferences.CompilersPreferencePage;
-import org.eclipse.pde.internal.ui.util.SWTUtil;
-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.ui.PlatformUI;
-import org.eclipse.ui.dialogs.PropertyPage;
-
-public class CompilersPropertyPage extends PropertyPage {
-
-	private ControlEnableState blockEnableState;
-
-	private Button changeWorkspaceSettingsButton;
-
-	private CompilersConfigurationBlock configurationBlock;
-
-	private Control configurationBlockControl;
-
-	private Button useProjectButton;
-
-	private Button useWorkspaceButton;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createContents(Composite parent) {
-		configurationBlock = new CompilersConfigurationBlock(getProject());
-
-		SelectionListener listener = new SelectionAdapter() {
-
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-			 */
-			public void widgetSelected(SelectionEvent e) {
-				if (e.getSource() instanceof Button) {
-					doDialogFieldChanged((Button) e.getSource());
-				}
-			}
-		};
-
-		Composite composite = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		layout.numColumns = 2;
-		composite.setLayout(layout);
-
-		// Use Workspace Settings radio button
-		useWorkspaceButton = new Button(composite, SWT.RADIO);
-		useWorkspaceButton.addSelectionListener(listener);
-		useWorkspaceButton
-				.setText(PDEUIMessages.CompilersPropertyPage_useworkspacesettings_label); 
-		GridData gd = new GridData();
-		gd.horizontalSpan = 1;
-		gd.horizontalAlignment = GridData.FILL;
-		// if (fButtonStyle == SWT.PUSH) {
-		// gd.heightHint = SWTUtil.getButtonHeightHint(button);
-		// gd.widthHint = SWTUtil.getButtonWidthHint(button);
-		// }
-		gd.grabExcessHorizontalSpace = true;
-		useWorkspaceButton.setLayoutData(gd);
-
-		// Change Workspace Settings push button
-		changeWorkspaceSettingsButton = new Button(composite, SWT.PUSH);
-		changeWorkspaceSettingsButton
-				.setText(PDEUIMessages.CompilersPropertyPage_useworkspacesettings_change); 
-		changeWorkspaceSettingsButton.addSelectionListener(listener);
-		gd = new GridData();
-		gd.horizontalSpan = 1;
-		gd.horizontalAlignment = GridData.FILL;
-		useWorkspaceButton.setLayoutData(gd);
-		SWTUtil.setButtonDimensionHint(changeWorkspaceSettingsButton);
-
-		// Use Project Settings radio button
-		useProjectButton = new Button(composite, SWT.RADIO);
-		useProjectButton.addSelectionListener(listener);
-		useProjectButton
-				.setText(PDEUIMessages.CompilersPropertyPage_useprojectsettings_label); 
-		gd = new GridData();
-		gd.horizontalSpan = 1;
-		gd.horizontalAlignment = GridData.FILL;
-		gd.grabExcessHorizontalSpace = true;
-		useProjectButton.setLayoutData(gd);
-
-		//
-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL
-				| GridData.VERTICAL_ALIGN_FILL);
-		data.horizontalSpan = 2;
-
-		configurationBlockControl = configurationBlock
-				.createContents(composite);
-		configurationBlockControl.setLayoutData(data);
-
-		boolean useProjectSettings = CompilerFlags.getBoolean(getProject(),
-				CompilerFlags.USE_PROJECT_PREF);
-
-		useProjectButton.setSelection(useProjectSettings);
-		useWorkspaceButton.setSelection(!useProjectSettings);
-		changeWorkspaceSettingsButton.setEnabled(!useProjectSettings);
-
-		updateEnableState();
-		Dialog.applyDialogFont(composite);
-		return composite;
-	}
-
-	/*
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		super.createControl(parent);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(),
-				IHelpContextIds.COMPILERS_PROPERTY_PAGE);
-	}
-
-	private void doDialogFieldChanged(Button button) {
-		if (button == changeWorkspaceSettingsButton) {
-			showPreferencePage();
-		} else {
-			updateEnableState();
-		}
-	}
-
-	private IProject getProject() {
-		return (IProject) getElement().getAdapter(IProject.class);
-	}
-
-	/*
-	 * @see org.eclipse.jface.preference.IPreferencePage#performDefaults()
-	 */
-	protected void performDefaults() {
-		if (useProjectSettings()) {
-			useProjectButton.setSelection(false);
-			useWorkspaceButton.setSelection(true);
-			updateEnableState();
-			configurationBlock.performDefaults();
-		}
-		super.performDefaults();
-	}
-
-	/*
-	 * @see org.eclipse.jface.preference.IPreferencePage#performOk()
-	 */
-	public boolean performOk() {
-		return configurationBlock.performOk(useProjectSettings());
-	}
-
-	private boolean showPreferencePage() {
-		final IPreferenceNode targetNode = new PreferenceNode(
-				"org.eclipse.pde.ui.CompilersPreferencePage", //$NON-NLS-1$
-				new CompilersPreferencePage());
-
-		PreferenceManager manager = new PreferenceManager();
-		manager.addToRoot(targetNode);
-		final PreferenceDialog dialog = new PreferenceDialog(getShell(),
-				manager);
-		final boolean[] result = new boolean[] { false };
-		BusyIndicator.showWhile(getShell().getDisplay(), new Runnable() {
-			public void run() {
-				dialog.create();
-				dialog.setMessage(targetNode.getLabelText());
-				result[0] = (dialog.open() == Window.OK);
-			}
-		});
-		return result[0];
-	}
-
-	private void updateEnableState() {
-		if (useProjectSettings()) {
-			if (blockEnableState != null) {
-				changeWorkspaceSettingsButton.setEnabled(false);
-				blockEnableState.restore();
-				blockEnableState = null;
-			}
-		} else {
-			if (blockEnableState == null) {
-				changeWorkspaceSettingsButton.setEnabled(true);
-				blockEnableState = ControlEnableState
-						.disable(configurationBlockControl);
-			}
-		}
-	}
-
-	private boolean useProjectSettings() {
-		return useProjectButton.getSelection();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/properties/PluginDevelopmentPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/properties/PluginDevelopmentPage.java
deleted file mode 100644
index 4dc1a2f..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/properties/PluginDevelopmentPage.java
+++ /dev/null

@@ -1,87 +0,0 @@
-package org.eclipse.pde.internal.ui.properties;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ProjectScope;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.pde.internal.core.ICoreConstants;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.swt.SWT;
-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.ui.IWorkbenchPropertyPage;
-import org.eclipse.ui.dialogs.PropertyPage;
-import org.osgi.service.prefs.BackingStoreException;
-import org.osgi.service.prefs.Preferences;
-
-public class PluginDevelopmentPage extends PropertyPage implements
-		IWorkbenchPropertyPage {
-
-	private Button fExtensionButton;
-	private Button fEquinoxButton;
-	
-	public PluginDevelopmentPage() {
-		noDefaultAndApplyButton();
-	}
-
-	protected Control createContents(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(new GridLayout());
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		
-		Group group = new Group(composite, SWT.NONE);
-		group.setText(PDEUIMessages.PluginDevelopmentPage_presentation);
-		group.setLayout(new GridLayout());
-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		fExtensionButton = new Button(group, SWT.CHECK);
-		fExtensionButton.setText(PDEUIMessages.PluginDevelopmentPage_extensions);
-
-		fEquinoxButton = new Button(group, SWT.CHECK);
-		fEquinoxButton.setText(PDEUIMessages.PluginDevelopmentPage_equinox);
-
-		initialize();
-		Dialog.applyDialogFont(composite);
-		return composite;
-	}
-
-	private void initialize() {
-		Preferences pref = getPreferences((IProject)getElement());
-		if (pref != null) {
-			fExtensionButton.setSelection(pref.getBoolean(ICoreConstants.EXTENSIONS_PROPERTY, true));
-			fEquinoxButton.setSelection(pref.getBoolean(ICoreConstants.EQUINOX_PROPERTY, true));
-		}
-	}
-	
-	private Preferences getPreferences(IProject project) {
-		return new ProjectScope(project).getNode(PDECore.PLUGIN_ID);
-	}
-	
-	public boolean performOk() {
-		Preferences pref = getPreferences((IProject)getElement());
-		if (pref != null) {
-			if (!fExtensionButton.getSelection())
-				pref.putBoolean(ICoreConstants.EXTENSIONS_PROPERTY, false);	
-			else
-				pref.remove(ICoreConstants.EXTENSIONS_PROPERTY);
-			
-			if (!fEquinoxButton.getSelection())
-				pref.putBoolean(ICoreConstants.EQUINOX_PROPERTY, false);	
-			else
-				pref.remove(ICoreConstants.EQUINOX_PROPERTY);
-			
-			try {
-				pref.flush();
-			} catch (BackingStoreException e) {
-				PDEPlugin.logException(e);
-			}
-		}
-		return super.performOk();
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/properties/SelfHostingPropertyPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/properties/SelfHostingPropertyPage.java
deleted file mode 100644
index f1f3956..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/properties/SelfHostingPropertyPage.java
+++ /dev/null

@@ -1,194 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.properties;
-
-import java.util.ArrayList;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ProjectScope;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IClasspathEntry;
-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.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.pde.internal.core.ICoreConstants;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.elements.DefaultTableProvider;
-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.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.PropertyPage;
-import org.osgi.service.prefs.BackingStoreException;
-import org.osgi.service.prefs.Preferences;
-
-public class SelfHostingPropertyPage extends PropertyPage {
-	
-	private Image fImage;
-	private CheckboxTableViewer fViewer;
-	
-	class ContentProvider extends DefaultTableProvider {
-		public Object[] getElements(Object input) {
-			return getOutputFolders();
-		}
-	}
-	
-	class FolderLabelProvider extends LabelProvider {
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object)
-		 */
-		public Image getImage(Object element) {
-			return fImage;
-		}		
-	}
-	
-	private String[] getOutputFolders() {
-		IProject project = (IProject) getElement();
-		ArrayList list = new ArrayList();
-		try {
-			if (project.hasNature(JavaCore.NATURE_ID)) {
-				IJavaProject jProject = JavaCore.create(project);
-				list.add(jProject.getOutputLocation().toString());
-				IClasspathEntry[] entries = jProject.getRawClasspath();
-				for (int i = 0; i < entries.length; i++) {
-					IClasspathEntry entry = entries[i];
-					if (entry.getEntryKind() == IClasspathEntry.CPE_SOURCE
-							&& entry.getContentKind() == IPackageFragmentRoot.K_SOURCE) {
-						IPath path = entry.getOutputLocation();
-						if (path != null)
-							list.add(path.toString());
-					}
-				}
-			}
-		} catch (JavaModelException e) {
-		} catch (CoreException e) {
-		}
-		return (String[]) list.toArray(new String[list.size()]);
-	}
-	
-	public SelfHostingPropertyPage() {
-		fImage = PDEPluginImages.DESC_OUTPUT_FOLDER_OBJ.createImage();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.IDialogPage#dispose()
-	 */
-	public void dispose() {
-		if (fImage != null)
-			fImage.dispose();
-	}
-
-	/**
-	 * @see PreferencePage#createContents(Composite)
-	 */
-	protected Control createContents(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(new GridLayout());
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		
-		Label label = new Label(composite, SWT.WRAP);
-		label.setText(PDEUIMessages.SelfHostingPropertyPage_label); 
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.widthHint = 300;
-		label.setLayoutData(gd);
-		
-		new Label(composite, SWT.NONE);
-		
-		label = new Label(composite, SWT.WRAP);
-		label.setText(PDEUIMessages.SelfHostingPropertyPage_viewerLabel); 
-		
-		fViewer = CheckboxTableViewer.newCheckList(composite, SWT.BORDER);
-		fViewer.setContentProvider(new ContentProvider());
-		fViewer.setLabelProvider(new FolderLabelProvider());
-		fViewer.setInput(getElement());
-		fViewer.setSorter(new ViewerSorter());
-		fViewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
-		
-		initialize();
-
-		Dialog.applyDialogFont(composite);
-		return composite;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		super.createControl(parent);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IHelpContextIds.SELFHOSTING_PROPERTY_PAGE);
-	}
-	
-	private void initialize() {
-		fViewer.setAllChecked(true);
-		Preferences pref = getPreferences((IProject)getElement());
-		if (pref != null) {
-			String binExcludes = pref.get(ICoreConstants.SELFHOSTING_BIN_EXLCUDES, ""); //$NON-NLS-1$
-			StringTokenizer tokenizer = new StringTokenizer(binExcludes, ","); //$NON-NLS-1$
-			while (tokenizer.hasMoreTokens()) {
-				String token = tokenizer.nextToken().trim();
-				fViewer.setChecked(token, false);
-			}
-		}
-	}
-	
-	private Preferences getPreferences(IProject project) {
-		return new ProjectScope(project).getNode(PDECore.PLUGIN_ID);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
-	 */
-	protected void performDefaults() {
-		fViewer.setAllChecked(true);
-	}
-	
-	public boolean performOk() {
-		Preferences pref = getPreferences((IProject)getElement());
-		StringBuffer buffer = new StringBuffer();
-		for (int i = 0; i < fViewer.getTable().getItemCount(); i++) {
-			Object object = fViewer.getElementAt(i);
-			if (!fViewer.getChecked(object)) {
-				if (buffer.length() > 0)
-					buffer.append(","); //$NON-NLS-1$
-				buffer.append(object.toString());
-			}
-		}
-		if (pref != null) {
-			if (buffer.length() > 0)
-				pref.put(ICoreConstants.SELFHOSTING_BIN_EXLCUDES, buffer.toString());
-			else
-				pref.remove(ICoreConstants.SELFHOSTING_BIN_EXLCUDES);
-			
-			try {
-				pref.flush();
-			} catch (BackingStoreException e) {
-				PDEPlugin.logException(e);
-			}
-		}
-		return super.performOk();
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/BundleManifestChange.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/BundleManifestChange.java
deleted file mode 100644
index 21b1ee9..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/BundleManifestChange.java
+++ /dev/null

@@ -1,247 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.refactoring;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.TextUtilities;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.osgi.util.ManifestElement;
-import org.eclipse.pde.internal.core.ICoreConstants;
-import org.eclipse.pde.internal.core.bundle.BundlePluginBase;
-import org.eclipse.pde.internal.core.ibundle.IBundle;
-import org.eclipse.pde.internal.ui.model.bundle.BasePackageHeader;
-import org.eclipse.pde.internal.ui.model.bundle.Bundle;
-import org.eclipse.pde.internal.ui.model.bundle.BundleModel;
-import org.eclipse.pde.internal.ui.model.bundle.ExportPackageHeader;
-import org.eclipse.pde.internal.ui.model.bundle.ExportPackageObject;
-import org.eclipse.pde.internal.ui.model.bundle.ManifestHeader;
-import org.eclipse.pde.internal.ui.model.bundle.PackageObject;
-import org.eclipse.text.edits.DeleteEdit;
-import org.eclipse.text.edits.InsertEdit;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.text.edits.ReplaceEdit;
-import org.eclipse.text.edits.TextEdit;
-import org.osgi.framework.Constants;
-
-public class BundleManifestChange {
-	
-	public static Change createMoveToPackageChange(IFile file, ManifestElement element, IProgressMonitor monitor) throws CoreException {
-		try {
-			Bundle bundle = getBundle(file, monitor);
-			if (bundle == null)
-				return null;
-			
-			TextEdit edit = addPackage(
-					(ExportPackageHeader)bundle.getManifestHeader(getExportedPackageHeader(bundle)),
-					(BundleModel)bundle.getModel(),
-					element);
-			if (edit != null) {
-				TextFileChange change = new TextFileChange("", file); //$NON-NLS-1$
-				change.setEdit(edit);
-				return change;
-			}
-		} catch (CoreException e) {
-		} catch (MalformedTreeException e) {
-		} catch (BadLocationException e) {
-		} finally {
-			FileBuffers.getTextFileBufferManager().disconnect(file.getFullPath(), monitor);
-		}
-		return null;
-	}
-	
-	public static MoveFromChange createMovePackageChange(IFile file, String packageName, IProgressMonitor monitor) throws CoreException {
-		try {
-			Bundle bundle = getBundle(file, monitor);
-			if (bundle == null)
-				return null;
-			
-			MultiTextEdit multiEdit = new MultiTextEdit();
-
-			ManifestElement export = removePackage(bundle.getManifestHeader(Constants.EXPORT_PACKAGE), 
-					packageName, 
-					multiEdit);
-
-			ManifestElement provide = removePackage(bundle.getManifestHeader(ICoreConstants.PROVIDE_PACKAGE),
-					packageName, 
-					multiEdit);
-
-			removePackage(bundle.getManifestHeader(Constants.IMPORT_PACKAGE), 
-					packageName, 
-					multiEdit);
-
-			if (multiEdit.hasChildren()) {
-				MoveFromChange change = new MoveFromChange("", file); //$NON-NLS-1$
-				change.setEdit(multiEdit);
-				if (export != null)
-					change.setMovedElement(export);
-				else if (provide != null)
-					change.setMovedElement(provide);
-				return change;
-			}
-		} catch (CoreException e) {
-		} catch (MalformedTreeException e) {
-		} catch (BadLocationException e) {
-		} finally {
-			FileBuffers.getTextFileBufferManager().disconnect(file.getFullPath(), monitor);
-		}
-		return null;
-	}
-
-	
-	public static Change createRenameChange(IFile file, IJavaElement element, String newText,
-			IProgressMonitor monitor) throws CoreException {
-		try {
-			Bundle bundle = getBundle(file, monitor);
-			if (bundle == null)
-				return null;
-			
-			MultiTextEdit multiEdit = new MultiTextEdit();
-			
-			if (element instanceof IType) {
-				String oldText = ((IType)element).getFullyQualifiedName('$');
-				resetHeaderValue(bundle.getManifestHeader(Constants.BUNDLE_ACTIVATOR), 
-						oldText, 
-						newText,
-						multiEdit);
-				
-				resetHeaderValue(bundle.getManifestHeader("Plugin-Class"),  //$NON-NLS-1$
-						oldText, 
-						newText,
-						multiEdit);
-			} else if (element instanceof IPackageFragment) {
-				String oldText = element.getElementName();				
-				resetHeaderValue(bundle.getManifestHeader(Constants.BUNDLE_ACTIVATOR), 
-						oldText, 
-						newText,
-						multiEdit);			
-
-				resetHeaderValue(bundle.getManifestHeader("Plugin-Class"),  //$NON-NLS-1$
-						oldText, 
-						newText,
-						multiEdit);					
-				
-				renamePackage(bundle.getManifestHeader(Constants.EXPORT_PACKAGE), 
-						oldText, 
-						newText,
-						multiEdit);
-
-				renamePackage(bundle.getManifestHeader(ICoreConstants.PROVIDE_PACKAGE),
-						oldText, 
-						newText,
-						multiEdit);
-
-				renamePackage(bundle.getManifestHeader(Constants.IMPORT_PACKAGE), 
-						oldText, 
-						newText,
-						multiEdit);
-			}
-			
-			if (multiEdit.hasChildren()) {
-				TextFileChange change = new TextFileChange("", file); //$NON-NLS-1$
-				change.setEdit(multiEdit);
-				return change;
-			}
-		} catch (CoreException e) {
-		} catch (MalformedTreeException e) {
-		} catch (BadLocationException e) {
-		} finally {
-			FileBuffers.getTextFileBufferManager().disconnect(file.getFullPath(), monitor);
-		}
-		return null;
-	}
-	
-	private static void resetHeaderValue(ManifestHeader header, String oldText, String newText, MultiTextEdit multi) {
-		if (header != null) {
-			String value = header.getValue();
-			if (value != null && value.startsWith(oldText) && value.lastIndexOf('.') <= oldText.length()) {
-				StringBuffer buffer = new StringBuffer(newText);
-				buffer.append(value.substring(oldText.length()));
-				header.setValue(buffer.toString());
-				multi.addChild(new ReplaceEdit(header.getOffset(), header.getLength(), header.write()));
-			}
-		}
-	}
-	
-	private static void renamePackage(ManifestHeader header, String oldName, String newName, MultiTextEdit multi) {
-		if (header instanceof BasePackageHeader) {
-			BasePackageHeader bHeader = (BasePackageHeader)header;
-			if (bHeader.renamePackage(oldName, newName))
-				multi.addChild(new ReplaceEdit(header.getOffset(), header.getLength(), bHeader.write()));
-		}	
-	}
-
-	private static ManifestElement removePackage(ManifestHeader header, String name, MultiTextEdit multi) {
-		ManifestElement result = null;
-		if (header instanceof BasePackageHeader) {
-			BasePackageHeader bHeader = (BasePackageHeader)header;
-			Object obj = bHeader.removePackage(name);
-			if (obj instanceof PackageObject) {
-				if (!bHeader.isEmpty())
-					multi.addChild(new ReplaceEdit(header.getOffset(), header.getLength(), bHeader.write()));
-				else
-					multi.addChild(new DeleteEdit(header.getOffset(), header.getLength()));
-				result = ((PackageObject)obj).getManifestElement();
-			}
-		}
-		return result;
-	}
-
-	private static TextEdit addPackage(ExportPackageHeader header, BundleModel model, ManifestElement element) {
-		if (header != null) {
-			if (!header.hasPackage(element.getValue())) {
-				header.addPackage(new ExportPackageObject(header, element, getVersionAttribute(header.getBundle())));
-				return new ReplaceEdit(header.getOffset(), header.getLength(), header.write());
-			}
-		} else {
-			String ld = TextUtilities.getDefaultLineDelimiter(model.getDocument());
-			header = new ExportPackageHeader(
-							getExportedPackageHeader(model.getBundle()), 
-							"",  //$NON-NLS-1$
-							model.getBundle(), 
-							ld);
-			header.addPackage(new ExportPackageObject(header, element, getVersionAttribute(header.getBundle())));
-			return new InsertEdit(model.getDocument().getLength(), header.write()); 
-		}
-		return null;
-	}
-	
-    private static String getVersionAttribute(IBundle bundle) {
-        int manifestVersion = BundlePluginBase.getBundleManifestVersion(bundle);
-        return (manifestVersion < 2) ? ICoreConstants.PACKAGE_SPECIFICATION_VERSION : Constants.VERSION_ATTRIBUTE;
-    }
-	
-    private static String getExportedPackageHeader(IBundle bundle) {
-        int manifestVersion = BundlePluginBase.getBundleManifestVersion(bundle);
-        return (manifestVersion < 2) ? ICoreConstants.PROVIDE_PACKAGE : Constants.EXPORT_PACKAGE;
-    }
-
-	public static Bundle getBundle(IFile file, IProgressMonitor monitor) throws CoreException, MalformedTreeException, BadLocationException {
-		ITextFileBufferManager manager = FileBuffers.getTextFileBufferManager();
-		manager.connect(file.getFullPath(), monitor);
-		
-		IDocument document = manager.getTextFileBuffer(file.getFullPath()).getDocument();		
-		BundleModel model = new BundleModel(document, false);
-		model.load();
-		return model.isLoaded() ? (Bundle)model.getBundle() : null;		
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/ManifestPackageMoveParticipant.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/ManifestPackageMoveParticipant.java
deleted file mode 100644
index 335ffcc..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/ManifestPackageMoveParticipant.java
+++ /dev/null

@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.refactoring;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.CompositeChange;
-import org.eclipse.pde.internal.core.WorkspaceModelManager;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-
-public class ManifestPackageMoveParticipant extends PDEMoveParticipant {
-
-	protected boolean initialize(Object element) {
-		if (element instanceof IPackageFragment) {
-			IPackageFragment fragment = (IPackageFragment)element;
-			IJavaProject javaProject = (IJavaProject)fragment.getAncestor(IJavaElement.JAVA_PROJECT);
-			IProject project = javaProject.getProject();
-			if (WorkspaceModelManager.hasBundleManifest(project)) {
-				fProject = javaProject.getProject();
-				fElement = fragment;
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public String getName() {
-		return PDEUIMessages.ManifestPackageRenameParticipant_packageRename;
-	}
-
-	protected void addBundleManifestChange(CompositeChange result, IProgressMonitor pm) throws CoreException {
-		IFile file = fProject.getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$
-		if (file.exists()) {
-			IProject destProject = getDestinationProject();
-			if (destProject != null && !fProject.equals(destProject)) {
-				MoveFromChange change = BundleManifestChange.createMovePackageChange(file, 
-						fElement.getElementName(), 
-						pm);
-				if (change != null) {
-					result.add(change);
-					IFile dest = destProject.getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$
-					if (dest.exists()) {
-						Change second = BundleManifestChange.createMoveToPackageChange(
-								dest,  
-								change.getMovedElement(), pm);
-						if (second != null)
-							result.add(second);
-					}
-				}
-			}
-		}
-	}
-	
-	private IProject getDestinationProject() {
-		Object dest = getArguments().getDestination();
-		if (dest instanceof IAdaptable) {
-			IResource resource = (IResource)((IAdaptable)dest).getAdapter(IResource.class);
-			if (resource != null) 
-				return resource.getProject();
-		}
-		return null;		
-	}
-
-	protected boolean isInterestingForExtensions() {
-		return false;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/ManifestPackageRenameParticipant.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/ManifestPackageRenameParticipant.java
deleted file mode 100644
index 5cfed50..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/ManifestPackageRenameParticipant.java
+++ /dev/null

@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.refactoring;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.ltk.core.refactoring.CompositeChange;
-import org.eclipse.osgi.service.resolver.BaseDescription;
-import org.eclipse.osgi.service.resolver.BundleDescription;
-import org.eclipse.osgi.service.resolver.ExportPackageDescription;
-import org.eclipse.osgi.service.resolver.ImportPackageSpecification;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.PluginModelManager;
-import org.eclipse.pde.internal.core.WorkspaceModelManager;
-import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelBase;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-
-public class ManifestPackageRenameParticipant extends PDERenameParticipant {
-	
-	protected boolean initialize(Object element) {
-		try {
-			if (element instanceof IPackageFragment) {
-				IPackageFragment fragment = (IPackageFragment)element;
-				if (!fragment.containsJavaResources())
-					return false;
-				IJavaProject javaProject = (IJavaProject)fragment.getAncestor(IJavaElement.JAVA_PROJECT);
-				IProject project = javaProject.getProject();
-				if (WorkspaceModelManager.isPluginProject(project)) {
-					fProject = javaProject.getProject();
-					fElement = fragment;
-					return true;
-				}
-			}
-		} catch (JavaModelException e) {
-		}
-		return false;
-	}
-
-	public String getName() {
-		return PDEUIMessages.ManifestPackageRenameParticipant_packageRename;
-	}
-	
-	protected void addBundleManifestChange(CompositeChange result, IProgressMonitor pm) throws CoreException {
-		super.addBundleManifestChange(result, pm);
-		PluginModelManager manager = PDECore.getDefault().getModelManager();
-		IPluginModelBase model = manager.findModel(fProject);
-		if (model != null) {
-			BundleDescription desc = model.getBundleDescription();
-			if (desc != null) {
-				BundleDescription[] dependents = desc.getDependents();
-				for (int i = 0; i < dependents.length; i++) {
-					if (isAffected(desc, dependents[i])) {
-						IPluginModelBase candidate = manager.findModel(dependents[i]);
-						if (candidate instanceof IBundlePluginModelBase) {
-							IFile file = (IFile)candidate.getUnderlyingResource();
-							addBundleManifestChange(file, result, pm);
-						}
-					}
-				}
-			}
-		}
-	}
-	
-	private boolean isAffected(BundleDescription desc, BundleDescription dependent) {
-		ImportPackageSpecification[] imports = dependent.getImportPackages();
-		String name = fElement.getElementName();
-		for (int i = 0; i < imports.length; i++) {
-			if (name.equals(imports[i].getName())) {
-				BaseDescription supplier = imports[i].getSupplier();
-				if (supplier instanceof ExportPackageDescription) {
-					if (desc.equals(((ExportPackageDescription)supplier).getExporter()))
-						return true;
-				}
-			}
-		}
-		return false;
-	}
-
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/ManifestTypeMoveParticipant.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/ManifestTypeMoveParticipant.java
deleted file mode 100644
index e13e7d0..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/ManifestTypeMoveParticipant.java
+++ /dev/null

@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.refactoring;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.CompositeChange;
-import org.eclipse.pde.internal.core.WorkspaceModelManager;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-
-public class ManifestTypeMoveParticipant extends PDEMoveParticipant {
-
-	protected boolean initialize(Object element) {
-		if (element instanceof IType) {
-			IType type = (IType) element;
-			IJavaProject javaProject = (IJavaProject) type
-					.getAncestor(IJavaElement.JAVA_PROJECT);
-			IProject project = javaProject.getProject();
-			if (WorkspaceModelManager.isPluginProject(project)) {
-				fProject = javaProject.getProject();
-				fElement = type;
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public String getName() {
-		return PDEUIMessages.ManifestTypeRenameParticipant_composite;
-	}
-	
-	protected boolean isInterestingForExtensions() {
-		Object dest = getArguments().getDestination();
-		if (dest instanceof IJavaElement) {
-			IJavaElement destination = (IJavaElement)dest;
-			IJavaProject jProject = (IJavaProject)destination.getAncestor(IJavaElement.JAVA_PROJECT);
-			return jProject.getProject().equals(fProject);
-		}
-		return false;		
-	}
-
-	protected void addChange(CompositeChange result, String filename, IProgressMonitor pm)
-			throws CoreException {
-		IFile file = fProject.getFile(filename);
-		if (file.exists()) {
-			Change change = PluginManifestChange.createRenameChange(file, 
-					getOldName(), 
-					getNewName(), 
-					pm);
-			if (change != null)
-				result.add(change);				
-		}
-	}
-	
-	private String getOldName() {
-		return ((IType)fElement).getFullyQualifiedName('$');
-	}
-	
-	private String getNewName() {
-		Object destination = getArguments().getDestination();
-		StringBuffer buffer = new StringBuffer();
-		if (destination instanceof IPackageFragment) {
-			buffer.append(((IPackageFragment)destination).getElementName());
-			if (buffer.length() > 0)
-				buffer.append("."); //$NON-NLS-1$
-		}
-		buffer.append(fElement.getElementName());
-		return buffer.toString();
-	}
-
-	protected void addBundleManifestChange(CompositeChange result, IProgressMonitor pm)
-			throws CoreException {
-		IFile file = fProject.getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$
-		if (file.exists()) {
-			Change change = BundleManifestChange.createRenameChange(file, fElement,
-					getNewName(), pm);
-			if (change != null)
-				result.add(change);
-		}
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/ManifestTypeRenameParticipant.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/ManifestTypeRenameParticipant.java
deleted file mode 100644
index ebc8acb..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/ManifestTypeRenameParticipant.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.refactoring;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.pde.internal.core.WorkspaceModelManager;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-
-public class ManifestTypeRenameParticipant extends PDERenameParticipant {
-
-	protected boolean initialize(Object element) {
-		if (element instanceof IType) {
-			IType type = (IType)element;
-			IJavaProject javaProject = (IJavaProject)type.getAncestor(IJavaElement.JAVA_PROJECT);
-			IProject project = javaProject.getProject();
-			if (WorkspaceModelManager.isPluginProject(project)) {
-				fProject = javaProject.getProject();
-				fElement = type;
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	protected String getOldName() {
-		return ((IType)fElement).getFullyQualifiedName('$');
-	}
-	
-	protected String getNewName() {
-		IType type = (IType)fElement;
-		String oldName = type.getFullyQualifiedName('$');
-		int index = oldName.lastIndexOf(fElement.getElementName());
-		StringBuffer buffer = new StringBuffer(oldName.substring(0, index));
-		buffer.append(getArguments().getNewName());
-		return buffer.toString();
-	}
-
-	public String getName() {
-		return PDEUIMessages.ManifestTypeRenameParticipant_composite;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/MoveFromChange.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/MoveFromChange.java
deleted file mode 100644
index 2f58c18..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/MoveFromChange.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.refactoring;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.osgi.util.ManifestElement;
-
-public class MoveFromChange extends TextFileChange {
-	
-	ManifestElement fElement;
-
-	public MoveFromChange(String name, IFile file) {
-		super(name, file);
-	}
-	
-	public ManifestElement getMovedElement() {
-		return fElement;
-	}
-	
-	public void setMovedElement(ManifestElement element) {
-		fElement = element;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/PDEMoveParticipant.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/PDEMoveParticipant.java
deleted file mode 100644
index 96f4081..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/PDEMoveParticipant.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.refactoring;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.jdt.core.IJavaElement;
-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.MoveParticipant;
-
-public abstract class PDEMoveParticipant extends MoveParticipant {
-
-	protected IProject fProject;
-	protected IJavaElement fElement;
-
-	public RefactoringStatus checkConditions(IProgressMonitor pm,
-			CheckConditionsContext context) throws OperationCanceledException {
-		return new RefactoringStatus();
-	}
-
-	public Change createChange(IProgressMonitor pm) throws CoreException,
-			OperationCanceledException {	
-		CompositeChange result = new CompositeChange(getName());
-		addBundleManifestChange(result, pm);
-		if (isInterestingForExtensions()) {
-			addChange(result, "plugin.xml", pm); //$NON-NLS-1$
-			addChange(result, "fragment.xml", pm); //$NON-NLS-1$
-		}
-		return (result.getChildren().length == 0) ? null : result;
-	}
-	
-	protected abstract boolean isInterestingForExtensions();
-	
-	protected void addChange(CompositeChange result, String filename, IProgressMonitor pm)
-		throws CoreException {		
-	}
-	
-	protected void addBundleManifestChange(CompositeChange result, IProgressMonitor pm)
-		throws CoreException {
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/PDERenameParticipant.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/PDERenameParticipant.java
deleted file mode 100644
index 58b03a0..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/PDERenameParticipant.java
+++ /dev/null

@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.refactoring;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.jdt.core.IJavaElement;
-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 PDERenameParticipant extends RenameParticipant {
-	
-	protected IProject fProject;
-	protected IJavaElement fElement;
-
-	public RefactoringStatus checkConditions(IProgressMonitor pm,
-			CheckConditionsContext context) throws OperationCanceledException {
-		return new RefactoringStatus();
-	}
-
-	public Change createChange(IProgressMonitor pm) throws CoreException,
-			OperationCanceledException {
-		if (!getArguments().getUpdateReferences())
-			return null;
-		CompositeChange result = new CompositeChange(getName());
-		addBundleManifestChange(result, pm);
-		addChange(result, "plugin.xml", pm); //$NON-NLS-1$
-		addChange(result, "fragment.xml", pm); //$NON-NLS-1$
-		return (result.getChildren().length == 0) ? null : result;
-	}
-	
-	private void addChange(CompositeChange result, String filename, IProgressMonitor pm)
-			throws CoreException {
-		IFile file = fProject.getFile(filename);
-		if (file.exists()) {
-			Change change = PluginManifestChange.createRenameChange(
-					file, getOldName(), getNewName(), pm);
-			if (change != null)
-				result.add(change);
-		}
-	}
-	
-	protected String getOldName() {
-		return fElement.getElementName();
-	}
-	
-	protected String getNewName() {
-		return getArguments().getNewName();
-	}
-
-	protected void addBundleManifestChange(CompositeChange result, IProgressMonitor pm)
-			throws CoreException {
-		addBundleManifestChange(fProject.getFile("META-INF/MANIFEST.MF"), result, pm); //$NON-NLS-1$
-	}
-	
-	protected void addBundleManifestChange(IFile file, CompositeChange result, 
-			IProgressMonitor pm) throws CoreException {
-		if (file.exists()) {
-			Change change = BundleManifestChange.createRenameChange(file, fElement,
-					getNewName(), pm);
-			if (change != null)
-				result.add(change);
-		}
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/PluginManifestChange.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/PluginManifestChange.java
deleted file mode 100644
index 8af17a3..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/refactoring/PluginManifestChange.java
+++ /dev/null

@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.refactoring;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.pde.core.plugin.IPluginAttribute;
-import org.eclipse.pde.core.plugin.IPluginElement;
-import org.eclipse.pde.core.plugin.IPluginExtension;
-import org.eclipse.pde.core.plugin.IPluginObject;
-import org.eclipse.pde.core.plugin.IPluginParent;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.ischema.IMetaAttribute;
-import org.eclipse.pde.internal.core.ischema.ISchema;
-import org.eclipse.pde.internal.core.ischema.ISchemaAttribute;
-import org.eclipse.pde.internal.core.ischema.ISchemaElement;
-import org.eclipse.pde.internal.core.schema.SchemaRegistry;
-import org.eclipse.pde.internal.ui.model.IDocumentAttribute;
-import org.eclipse.pde.internal.ui.model.plugin.FragmentModel;
-import org.eclipse.pde.internal.ui.model.plugin.PluginModel;
-import org.eclipse.pde.internal.ui.model.plugin.PluginModelBase;
-import org.eclipse.pde.internal.ui.model.plugin.PluginNode;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.text.edits.ReplaceEdit;
-import org.eclipse.text.edits.TextEdit;
-
-public class PluginManifestChange {
-	
-	public static Change createRenameChange(IFile file, String oldName, String newName, IProgressMonitor monitor) 
-			throws CoreException {
-		ITextFileBufferManager manager = FileBuffers.getTextFileBufferManager();
-		try {
-			manager.connect(file.getFullPath(), monitor);
-			ITextFileBuffer buffer = manager.getTextFileBuffer(file.getFullPath());
-			
-			IDocument document = buffer.getDocument();
-			
-			try {
-				PluginModelBase model;
-				if ("fragment.xml".equals(file.getName())) //$NON-NLS-1$
-					model = new FragmentModel(document, false);
-				else
-					model = new PluginModel(document, false);
-
-				model.load();
-				if (!model.isLoaded())
-					return null;
-				
-				MultiTextEdit multiEdit = new MultiTextEdit();
-				
-				if (model instanceof PluginModel) {
-					PluginNode plugin = (PluginNode)model.getPluginBase();
-					IDocumentAttribute attr = plugin.getDocumentAttribute("class"); //$NON-NLS-1$
-					TextEdit edit = createTextEdit(attr, oldName, newName);
-					if (edit != null)
-						multiEdit.addChild(edit);					
-				}
-				
-				SchemaRegistry registry = PDECore.getDefault().getSchemaRegistry();
-				IPluginExtension[] extensions = model.getPluginBase().getExtensions();
-				for (int i = 0; i < extensions.length; i++) {
-					ISchema schema = registry.getSchema(extensions[i].getPoint());
-					if (schema != null)
-						addExtensionAttributeEdit(schema, extensions[i], multiEdit, oldName, newName);
-				}
-				
-				if (multiEdit.hasChildren()) {
-					TextFileChange change = new TextFileChange("", file); //$NON-NLS-1$
-					change.setEdit(multiEdit);
-					return change;
-				}
-			} catch (CoreException e) {
-				return null;
-			}	
-			return null;
-		} finally {
-			manager.disconnect(file.getFullPath(), monitor);
-		}	
-	}
-	
-	private static void addExtensionAttributeEdit(ISchema schema, IPluginParent parent, MultiTextEdit multi, String oldName, String newName) {
-		IPluginObject[] children = parent.getChildren();
-		for (int i = 0; i < children.length; i++) {
-			IPluginElement child = (IPluginElement)children[i];
-			ISchemaElement schemaElement = schema.findElement(child.getName());
-			if (schemaElement != null) {
-				IPluginAttribute[] attributes = child.getAttributes();
-				for (int j = 0; j < attributes.length; j++) {
-					IPluginAttribute attr = attributes[j];
-					ISchemaAttribute attInfo = schemaElement.getAttribute(attr.getName());
-					if (attInfo != null && attInfo.getKind() == IMetaAttribute.JAVA) {
-						IDocumentAttribute docAttr = (IDocumentAttribute)attr;
-						TextEdit edit = createTextEdit(docAttr, oldName, newName);
-						if (edit != null)
-							multi.addChild(edit);
-					}
-				}
-			}
-			addExtensionAttributeEdit(schema, child, multi, oldName, newName);
-		}
-	}
-	
-	private static TextEdit createTextEdit(IDocumentAttribute attr, String oldName, String newName) {
-		if (attr == null)
-			return null;
-		
-		String value = attr.getAttributeValue();
-		if (value != null && value.startsWith(oldName) && value.lastIndexOf('.') <= oldName.length()) {
-			int offset = attr.getValueOffset();
-			if (offset >= 0)
-				return new ReplaceEdit(offset, oldName.length(), newName);
-		}
-		return null;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/AbstractSearchResultPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/AbstractSearchResultPage.java
deleted file mode 100644
index 589e8a3..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/AbstractSearchResultPage.java
+++ /dev/null

@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.search;
-
-import org.eclipse.jface.viewers.*;
-import org.eclipse.search.ui.text.*;
-
-public abstract class AbstractSearchResultPage extends AbstractTextSearchViewPage {
-	
-	class ContentProvider implements IStructuredContentProvider {
-
-		private TableViewer fTableViewer;
-		private AbstractTextSearchResult fSearchResult;
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-		 */
-		public Object[] getElements(Object inputElement) {
-			if (inputElement instanceof AbstractTextSearchResult)
-				return ((AbstractTextSearchResult) inputElement).getElements();
-			return new Object[0];
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-		 */
-		public void dispose() {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-		 */
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-			fTableViewer = (TableViewer)viewer;
-			fSearchResult = (AbstractTextSearchResult)newInput;
-		}
-		
-		public void clear() {
-			fTableViewer.refresh();
-		}
-		
-		public void elementsChanged(Object[] updatedElements) {
-			for (int i= 0; i < updatedElements.length; i++) {
-				if (fSearchResult.getMatchCount(updatedElements[i]) > 0) {
-					if (fTableViewer.testFindItem(updatedElements[i]) != null)
-						fTableViewer.refresh(updatedElements[i]);
-					else
-						fTableViewer.add(updatedElements[i]);
-				} else {
-					fTableViewer.remove(updatedElements[i]);
-				}
-			}
-		}
-	}
-
-	private ContentProvider fContentProvider;
-
-	public AbstractSearchResultPage() {
-		super(AbstractTextSearchViewPage.FLAG_LAYOUT_FLAT);
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#elementsChanged(java.lang.Object[])
-	 */
-	protected void elementsChanged(Object[] objects) {
-		if (fContentProvider != null)
-			fContentProvider.elementsChanged(objects);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#clear()
-	 */
-	protected void clear() {
-		if (fContentProvider != null)
-			fContentProvider.clear();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#configureTreeViewer(org.eclipse.jface.viewers.TreeViewer)
-	 */
-	protected void configureTreeViewer(TreeViewer viewer) {
-		throw new IllegalStateException("Doesn't support tree mode."); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#configureTableViewer(org.eclipse.jface.viewers.TableViewer)
-	 */
-	protected void configureTableViewer(TableViewer viewer) {
-		viewer.setSorter(createViewerSorter());
-		viewer.setLabelProvider(createLabelProvider());
-		fContentProvider= new ContentProvider();
-		viewer.setContentProvider(fContentProvider);
-	}
-	
-	protected abstract ILabelProvider createLabelProvider();
-	
-	protected abstract ViewerSorter createViewerSorter();
-	
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/BaseSearchAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/BaseSearchAction.java
deleted file mode 100644
index a0a588d..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/BaseSearchAction.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.search;
-
-import org.eclipse.jface.action.*;
-import org.eclipse.search.ui.*;
-
-
-public abstract class BaseSearchAction extends Action {
-
-	public BaseSearchAction(String text) {
-		setText(text);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() {
-		NewSearchUI.activateSearchResultView();
-		NewSearchUI.runQueryInBackground(createSearchQuery());
-	}
-	
-	protected abstract ISearchQuery createSearchQuery();
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/FindDeclarationsAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/FindDeclarationsAction.java
deleted file mode 100644
index badf6f5..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/FindDeclarationsAction.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.search;
-
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.search.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.search.ui.*;
-
-
-public class FindDeclarationsAction extends BaseSearchAction {
-	
-	private Object fSelectedObject;
-
-	public FindDeclarationsAction(Object object) {
-		super(PDEUIMessages.SearchAction_Declaration);
-		this.fSelectedObject = object;
-	}
-	
-	protected ISearchQuery createSearchQuery() {
-		PluginSearchInput input = new PluginSearchInput();
-
-		if (fSelectedObject instanceof IPluginImport) {
-			input.setSearchString(((IPluginImport) fSelectedObject).getId());
-			input.setSearchElement(PluginSearchInput.ELEMENT_PLUGIN);
-		} else if (fSelectedObject instanceof IPluginExtension)  {
-			input.setSearchString(((IPluginExtension)fSelectedObject).getPoint());
-			input.setSearchElement(PluginSearchInput.ELEMENT_EXTENSION_POINT);
-		} else if (fSelectedObject instanceof IPlugin) {
-			input.setSearchString(((IPlugin)fSelectedObject).getId());
-			input.setSearchElement(PluginSearchInput.ELEMENT_PLUGIN);
-		} else if (fSelectedObject instanceof IFragment) {
-			input.setSearchString(((IFragment)fSelectedObject).getId());
-			input.setSearchElement(PluginSearchInput.ELEMENT_FRAGMENT);
-		}
-		input.setSearchLimit(PluginSearchInput.LIMIT_DECLARATIONS);
-		input.setSearchScope(new PluginSearchScope());
-		return new PluginSearchQuery(input);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/FindPluginReferencesAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/FindPluginReferencesAction.java
deleted file mode 100644
index 4808bbf..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/FindPluginReferencesAction.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.search;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.core.search.*;
-import org.eclipse.search.ui.*;
-import org.eclipse.ui.*;
-
-public class FindPluginReferencesAction implements IObjectActionDelegate {
-	private String fSearchString = null;
-	/**
-	 * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-	}
-
-	/**
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		if (fSearchString != null) {
-			NewSearchUI.activateSearchResultView();
-			NewSearchUI.runQueryInBackground(createSearchQuery());
-		}
-	}
-	
-	private ISearchQuery createSearchQuery() {
-		PluginSearchInput input = new PluginSearchInput();
-		input.setSearchElement(PluginSearchInput.ELEMENT_PLUGIN);
-		input.setSearchLimit(PluginSearchInput.LIMIT_REFERENCES);
-		input.setSearchString(fSearchString);
-		input.setSearchScope(new PluginSearchScope());
-		return new PluginSearchQuery(input);
-	}
-
-	/**
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		fSearchString = null;
-		if (selection instanceof IStructuredSelection) {
-			IStructuredSelection sSelection = (IStructuredSelection) selection;
-			if (sSelection.size() == 1) {
-				IFile file = (IFile) sSelection.getFirstElement();
-				ModelEntry entry =
-					PDECore.getDefault().getModelManager().findEntry(file.getProject());
-				if (entry != null) {
-					IPluginModelBase model = entry.getActiveModel();
-					if (model != null)
-						fSearchString = model.getPluginBase().getId();
-				}
-			}
-		}
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/FindReferencesAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/FindReferencesAction.java
deleted file mode 100644
index c808ee1..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/FindReferencesAction.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.search;
-
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.search.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.search.ui.*;
-
-
-public class FindReferencesAction extends BaseSearchAction {
-	
-	private Object fSelectedObject;
-	private String fPluginID;
-	
-	public FindReferencesAction(Object object) {
-		this(object, null);
-	}
-	
-	public FindReferencesAction(Object object, String pluginID) {
-		super(PDEUIMessages.SearchAction_references);
-		fSelectedObject = object;
-		fPluginID = pluginID;
-	}
-	
-	protected ISearchQuery createSearchQuery() {
-		PluginSearchInput input = new PluginSearchInput();
-		if (fSelectedObject instanceof IPlugin) {
-			input.setSearchElement(PluginSearchInput.ELEMENT_PLUGIN);
-			input.setSearchString(((IPlugin) fSelectedObject).getId());
-		} else if (fSelectedObject instanceof IPluginExtensionPoint) {
-			input.setSearchElement(PluginSearchInput.ELEMENT_EXTENSION_POINT);
-			IPluginModelBase model = ((IPluginExtensionPoint) fSelectedObject).getPluginModel();
-			String id = model.getPluginBase().getId();
-			if (id == null || id.trim().length() == 0)
-				id = fPluginID;
-			if (id == null || id.trim().length() == 0)
-				id = "*"; //$NON-NLS-1$
-			input.setSearchString(
-						id
-						+ "." //$NON-NLS-1$
-						+ ((IPluginExtensionPoint) fSelectedObject).getId());
-		} else if (fSelectedObject instanceof IPluginImport) {
-			input.setSearchElement(PluginSearchInput.ELEMENT_PLUGIN);
-			input.setSearchString(((IPluginImport) fSelectedObject).getId());
-		}
-		input.setSearchLimit(PluginSearchInput.LIMIT_REFERENCES);
-		input.setSearchScope(new PluginSearchScope());
-		return new PluginSearchQuery(input);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/ISearchResultCollector.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/ISearchResultCollector.java
deleted file mode 100644
index d2abab3..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/ISearchResultCollector.java
+++ /dev/null

@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.search;
-
-public interface ISearchResultCollector {
-	void accept (Object match);
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/ManifestEditorOpener.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/ManifestEditorOpener.java
deleted file mode 100644
index 032d1cb..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/ManifestEditorOpener.java
+++ /dev/null

@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.search;
-
-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.Region;
-import org.eclipse.pde.core.plugin.IFragment;
-import org.eclipse.pde.core.plugin.IPlugin;
-import org.eclipse.pde.core.plugin.IPluginExtension;
-import org.eclipse.pde.core.plugin.IPluginExtensionPoint;
-import org.eclipse.pde.core.plugin.IPluginImport;
-import org.eclipse.pde.core.plugin.IPluginObject;
-import org.eclipse.pde.internal.ui.editor.plugin.ManifestEditor;
-import org.eclipse.search.ui.text.Match;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PartInitException;
-
-
-public class ManifestEditorOpener {
-
-	public static IEditorPart open(Match match, boolean activate) throws PartInitException {
-		IEditorPart editorPart = null;
-		editorPart = ManifestEditor.open(match.getElement(), true);
-		if (editorPart != null && editorPart instanceof ManifestEditor) {
-			ManifestEditor editor = (ManifestEditor)editorPart;
-			IDocument doc = editor.getDocument(match);
-			if (doc != null) {
-				Match exact = findExactMatch(doc, match);
-				editor.openToSourcePage(match.getElement(), exact.getOffset(), exact.getLength());
-			}
-		}
-		return editorPart;
-	}
-	
-	public static Match findExactMatch(IDocument document, Match match) {
-		if (match.getOffset() == -1 && match.getBaseUnit() == Match.UNIT_LINE)
-			return new Match(match.getElement(), Match.UNIT_CHARACTER, 0,0);
-		IPluginObject element = (IPluginObject)match.getElement();
-		String name = null;
-		String value = null;
-		if (element instanceof IPluginExtension) {
-			name = "point"; //$NON-NLS-1$
-			value = ((IPluginExtension)element).getPoint();
-		} else if (element instanceof IPluginExtensionPoint) {
-			name = "id"; //$NON-NLS-1$
-			value = ((IPluginExtensionPoint)element).getId();
-		} else if (element instanceof IPluginImport) {
-			name = "plugin"; //$NON-NLS-1$
-			value = ((IPluginImport)element).getId();
-		} else if (element instanceof IPlugin) {
-			name = "id"; //$NON-NLS-1$
-			value = ((IPlugin)element).getId();
-		} else if (element instanceof IFragment) {
-			name = "id"; //$NON-NLS-1$
-			value = ((IFragment)element).getId();
-		}
-		IRegion region = getAttributeRegion(document, name, value, match.getOffset());
-		if (region != null) {
-			return new Match(element, Match.UNIT_CHARACTER, region.getOffset(), region.getLength());
-		}	
-		return match;
-	}
-	
-	private static IRegion getAttributeRegion(IDocument document, String name, String value, int line) {
-		try {
-			int offset = document.getLineOffset(line) + document.getLineLength(line);
-			FindReplaceDocumentAdapter findReplaceAdapter = new FindReplaceDocumentAdapter(document);
-			IRegion nameRegion = findReplaceAdapter.find(offset, name+"\\s*=\\s*\""+value, false, false, false, true); //$NON-NLS-1$
-			if (nameRegion != null) {
-				if (document.get(nameRegion.getOffset() + nameRegion.getLength() - value.length(), value.length()).equals(value))
-					return new Region(nameRegion.getOffset() + nameRegion.getLength() - value.length(), value.length());
-			}
-		} catch (BadLocationException e) {
-		}
-		return null;
-	}
-
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchActionGroup.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchActionGroup.java
deleted file mode 100644
index 3ade051..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchActionGroup.java
+++ /dev/null

@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.search;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.core.plugin.*;
-import org.eclipse.pde.internal.ui.search.dependencies.*;
-import org.eclipse.ui.actions.*;
-
-
-public class PluginSearchActionGroup extends ActionGroup {
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.actions.ActionGroup#fillContextMenu(org.eclipse.jface.action.IMenuManager)
-	 */
-	public void fillContextMenu(IMenuManager menu) {
-		ActionContext context = getContext();
-		ISelection selection = context.getSelection();
-		if (selection instanceof IStructuredSelection) {
-			IStructuredSelection sSelection = (IStructuredSelection) selection;
-			if (sSelection.size() == 1) {
-				Object object = sSelection.getFirstElement();
-				addFindDeclarationsAction(object, menu);
-				addFindReferencesAction(object, menu);
-				addShowDescriptionAction(object, menu);
-				addDependencyExtentAction(object, menu);
-			}
-		}
-	}
-
-	private void addFindDeclarationsAction(Object object, IMenuManager menu) {
-		if (object instanceof ImportObject)
-			object = ((ImportObject)object).getImport();
-		
-		if (object instanceof IPluginBase 
-				|| object instanceof IPluginExtension
-				|| object instanceof IPluginImport) {
-			menu.add(new FindDeclarationsAction(object));
-		}
-	}
-
-	private void addShowDescriptionAction(Object object, IMenuManager menu) {
-		if (object instanceof IPluginExtensionPoint) {
-			menu.add(new ShowDescriptionAction((IPluginExtensionPoint)object));
-		} else if (object instanceof IPluginExtension) {
-			String point = ((IPluginExtension)object).getPoint();
-			IPluginExtensionPoint extPoint = PDECore.getDefault().findExtensionPoint(point);
-			if (extPoint != null)
-				menu.add(new ShowDescriptionAction(extPoint));
-		}
-	}
-
-	private void addFindReferencesAction(Object object, IMenuManager menu) {
-		if (object instanceof ModelEntry) {
-			object = ((ModelEntry) object).getActiveModel().getPluginBase();
-		} else if (object instanceof ImportObject) {
-			object = ((ImportObject) object).getImport();
-		}
-		if (object instanceof IPluginExtensionPoint
-			|| object instanceof IPluginImport
-			|| (object instanceof IPlugin))
-			menu.add(new FindReferencesAction(object));
-	}
-	
-	private void addDependencyExtentAction(Object object, IMenuManager menu) {
-		if (object instanceof ImportObject) {
-			object = ((ImportObject)object).getImport();
-		}
-		
-		if (object instanceof IPluginImport) {
-			String id = ((IPluginImport)object).getId();
-			IResource resource = ((IPluginImport)object).getModel().getUnderlyingResource();
-			if (resource != null) {
-				menu.add(new DependencyExtentAction(resource.getProject(), id));
-			}
-		}
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchOperation.java
deleted file mode 100644
index 048ab6d..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchOperation.java
+++ /dev/null

@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.search;
-
-import java.util.*;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.search.*;
-import org.eclipse.pde.internal.core.util.*;
-
-
-public class PluginSearchOperation {
-	protected PluginSearchInput fInput;
-	private ISearchResultCollector fCollector;
-	private Pattern fPattern;
-	
-	public PluginSearchOperation(
-		PluginSearchInput input,
-		ISearchResultCollector collector) {
-		this.fInput = input;
-		this.fCollector = collector;
-		this.fPattern = PatternConstructor.createPattern(
-				input.getSearchString(), input.isCaseSensitive());
-	}
-	
-	public void execute(IProgressMonitor monitor) {
-		IPluginModelBase[] entries = fInput.getSearchScope().getMatchingModels();
-		monitor.beginTask("", entries.length); //$NON-NLS-1$
-
-		try {
-			for (int i = 0; i < entries.length; i++) {
-				IPluginModelBase candidate = entries[i];
-				visit(candidate);
-				monitor.worked(1);
-			}
-		} finally {
-			monitor.done();
-		}
-	}
-	
-	private void visit(IPluginModelBase model) {
-		ArrayList matches = findMatch(model);
-		for (int i = 0; i < matches.size(); i++) {
-			fCollector.accept(matches.get(i));
-		}
-	}
-	
-	private ArrayList findMatch(IPluginModelBase model) {
-		ArrayList result = new ArrayList();
-		int searchLimit = fInput.getSearchLimit();
-		switch (fInput.getSearchElement()) {
-			case PluginSearchInput.ELEMENT_PLUGIN :
-				if (searchLimit != PluginSearchInput.LIMIT_REFERENCES)
-					findPluginDeclaration(model, result);
-				if (searchLimit != PluginSearchInput.LIMIT_DECLARATIONS)
-					findPluginReferences(model, result);
-				break;
-			case PluginSearchInput.ELEMENT_FRAGMENT :
-				findFragmentDeclaration(model, result);
-				break;
-			case PluginSearchInput.ELEMENT_EXTENSION_POINT :
-				if (searchLimit != PluginSearchInput.LIMIT_REFERENCES)
-					findExtensionPointDeclarations(model, result);
-				if (searchLimit != PluginSearchInput.LIMIT_DECLARATIONS)
-					findExtensionPointReferences(model, result);
-				break;
-		}
-		return result;
-	}
-	
-	private void findFragmentDeclaration(
-		IPluginModelBase model,
-		ArrayList result) {
-		IPluginBase pluginBase = model.getPluginBase();
-		if (pluginBase instanceof IFragment
-				&& fPattern.matcher(pluginBase.getId()).matches()) {
-			result.add(pluginBase); }
-	}
-				
-	private void findPluginDeclaration(IPluginModelBase model, ArrayList result) {
-		IPluginBase pluginBase = model.getPluginBase();
-		if (pluginBase instanceof IPlugin
-				&& fPattern.matcher(pluginBase.getId()).matches())
-			result.add(pluginBase);
-	}
-	
-	private void findPluginReferences(
-		IPluginModelBase model,
-		ArrayList result) {
-		IPluginBase pluginBase = model.getPluginBase();
-		if (pluginBase instanceof IFragment) {
-			if (fPattern.matcher(((IFragment) pluginBase).getPluginId())
-					.matches())
-				result.add(pluginBase);
-		}
-		IPluginImport[] imports = pluginBase.getImports();
-		for (int i = 0; i < imports.length; i++) {
-			if (fPattern.matcher(imports[i].getId()).matches())
-				result.add(imports[i]);
-		}
-	}
-
-	private void findExtensionPointDeclarations(
-		IPluginModelBase model,
-		ArrayList result) {
-		IPluginExtensionPoint[] extensionPoints =
-			model.getPluginBase().getExtensionPoints();
-		for (int i = 0; i < extensionPoints.length; i++) {
-			if (fPattern.matcher(extensionPoints[i].getFullId()).matches())
-				result.add(extensionPoints[i]);
-		}
-	}
-	
-	private void findExtensionPointReferences(IPluginModelBase model, ArrayList result) {
-		IPluginExtension[] extensions = model.getPluginBase().getExtensions();
-		for (int i = 0; i < extensions.length; i++) {
-			if (fPattern.matcher(extensions[i].getPoint()).matches())
-				result.add(extensions[i]);
-		}
-	}
-		
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchPage.java
deleted file mode 100644
index e21357d..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchPage.java
+++ /dev/null

@@ -1,354 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.search;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.DialogPage;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.pde.internal.core.search.PluginSearchInput;
-import org.eclipse.pde.internal.core.search.PluginSearchScope;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.search.ui.ISearchPage;
-import org.eclipse.search.ui.ISearchPageContainer;
-import org.eclipse.search.ui.NewSearchUI;
-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.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.IWorkingSet;
-import org.eclipse.ui.PlatformUI;
-
-
-
-public class PluginSearchPage extends DialogPage implements ISearchPage {
-	
-	class QueryData {
-		public String text;
-		public boolean isCaseSensitive;
-		public int searchElement;
-		public int limit;
-		public int externalScope;
-		public int workspaceScope;
-		public IWorkingSet[] workingSets;
-		
-		public boolean equals(Object obj) {
-			if (obj instanceof QueryData) {
-				if (((QueryData)obj).text.equals(text))
-					return true;
-			}
-			return false;
-		}
-		
-	}
-	
-	private static ArrayList previousQueries = new ArrayList();
-	
-	private Button caseSensitive;
-	private ISearchPageContainer container;
-	private Button[] externalScopeButtons = new Button[3];
-	private boolean firstTime = true;
-	private Button[] limitToButtons = new Button[3];
-	private Combo patternCombo;
-	private Button[] searchForButtons = new Button[3];
-
-	public void createControl(Composite parent)  {
-		Composite result = new Composite(parent,SWT.NONE);
-		GridLayout layout = new GridLayout(1, true);
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		result.setLayout(layout);
-		result.setLayoutData(new GridData(GridData.FILL_HORIZONTAL|GridData.GRAB_HORIZONTAL));
-		
-		createPatternSection(result);
-		createSettingsSection(result);
-		
-		hookListeners();	
-		
-		setControl(result);
-		Dialog.applyDialogFont(result);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(result, IHelpContextIds.SEARCH_PAGE);
-	}
-		
-	private void createGroup(
-		Composite parent,
-		Button[] buttons,
-		String groupLabel,
-		String[] buttonLabels,
-		int defaultEnabled) {
-		Group group = new Group(parent, SWT.NONE);
-		group.setLayout(new GridLayout(1, true));
-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		group.setText(groupLabel);
-		for (int i = 0; i < buttonLabels.length; i++) {
-			buttons[i] = new Button(group, SWT.RADIO);
-			buttons[i].setText(buttonLabels[i]);
-			buttons[i].setSelection(i == defaultEnabled);
-		}
-	}
-		
-	private void createPatternSection(Composite parent) {
-		Composite result = new Composite(parent, SWT.NONE);
-		result.setLayout(new GridLayout(2, false));
-		result.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		Label label = new Label(result, SWT.NONE);
-		GridData data = new GridData();
-		data.horizontalSpan = 2;
-		label.setLayoutData(data);
-		label.setText(PDEUIMessages.SearchPage_searchString);
-
-		patternCombo = new Combo(result, SWT.SINGLE | SWT.BORDER);
-		patternCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		caseSensitive = new Button(result, SWT.CHECK);
-		caseSensitive.setText(PDEUIMessages.SearchPage_caseSensitive);
-	}
-	
-	private void createSettingsSection(Composite parent) {
-		Composite result = new Composite(parent, SWT.NONE);
-		result.setLayout(new GridLayout(3, true));
-		result.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		createGroup(
-			result,
-			searchForButtons,
-			PDEUIMessages.SearchPage_searchFor,
-			new String[] {
-				PDEUIMessages.SearchPage_plugin,
-				PDEUIMessages.SearchPage_fragment,
-				PDEUIMessages.SearchPage_extPt},
-			2);
-		createGroup(
-			result,
-			limitToButtons,
-			PDEUIMessages.SearchPage_limitTo,
-			new String[] {
-				PDEUIMessages.SearchPage_declarations,
-				PDEUIMessages.SearchPage_references,
-				PDEUIMessages.SearchPage_allOccurrences},
-			1);
-		createGroup(
-			result,
-			externalScopeButtons,
-			PDEUIMessages.SearchPage_externalScope,
-			new String[] {
-				PDEUIMessages.SearchPage_all,
-				PDEUIMessages.SearchPage_enabledOnly,
-				PDEUIMessages.SearchPage_none},
-			1);
-	}
-	
-	private int getExternalScope() {
-		if (externalScopeButtons[0].getSelection())
-			return PluginSearchScope.EXTERNAL_SCOPE_ALL;
-		if (externalScopeButtons[1].getSelection())
-			return PluginSearchScope.EXTERNAL_SCOPE_ENABLED;
-		return PluginSearchScope.EXTERNAL_SCOPE_NONE;
-	}
-	
-	private PluginSearchInput getInput() {
-		PluginSearchScope scope =
-			new PluginSearchScope(
-				getWorkspaceScope(),
-				getExternalScope(),
-				getSelectedResources());
-
-		PluginSearchInput input = new PluginSearchInput();
-		int searchFor = getSearchFor();
-		input.setSearchElement(searchFor);
-		input.setSearchLimit(getLimitTo());
-		input.setSearchScope(scope);
-		String searchString = patternCombo.getText().trim();
-		if (searchFor == PluginSearchInput.ELEMENT_EXTENSION_POINT
-			&& searchString.indexOf('.') == -1) {
-			searchString = "*." + searchString; //$NON-NLS-1$
-		}
-		input.setSearchString(searchString);
-		input.setCaseSensitive(caseSensitive.getSelection());
-		return input;
-	}
-	
-	private int getLimitTo() {
-		if (limitToButtons[0].getSelection())
-			return PluginSearchInput.LIMIT_DECLARATIONS;
-		if (limitToButtons[1].getSelection())
-			return PluginSearchInput.LIMIT_REFERENCES;
-		return PluginSearchInput.LIMIT_ALL;
-	}
-	
-	private int getSearchFor() {
-		if (searchForButtons[0].getSelection())
-			return PluginSearchInput.ELEMENT_PLUGIN;
-		if (searchForButtons[1].getSelection())
-			return PluginSearchInput.ELEMENT_FRAGMENT;
-		return PluginSearchInput.ELEMENT_EXTENSION_POINT;
-	}
-	
-	private HashSet getSelectedResources() {
-		HashSet result = new HashSet();
-		int scope = container.getSelectedScope();
-		if (scope == ISearchPageContainer.WORKSPACE_SCOPE)
-			return null;
-		if (scope == ISearchPageContainer.SELECTION_SCOPE || scope == ISearchPageContainer.SELECTED_PROJECTS_SCOPE) {
-			if (container.getSelection() instanceof IStructuredSelection) {
-				IStructuredSelection selection =
-					(IStructuredSelection) container.getSelection();
-				Iterator iter = selection.iterator();
-				while (iter.hasNext()) {
-					Object item = iter.next();
-					if (item instanceof IResource)
-						result.add(((IResource)item).getProject());
-				}
-			}
-		} else if (scope == ISearchPageContainer.WORKING_SET_SCOPE) {
-			IWorkingSet[] workingSets = container.getSelectedWorkingSets();
-			if (workingSets != null) {
-				for (int i = 0; i < workingSets.length; i++) {
-					IAdaptable[] elements = workingSets[i].getElements();
-					for (int j = 0; j < elements.length; j++) {
-						IResource resource = (IResource)elements[j].getAdapter(IResource.class);
-						if (resource != null)
-							result.add(resource.getProject());
-					}
-				}
-			}
-		}
-		return result;
-	}
-	
-	private int getWorkspaceScope() {
-		switch(container.getSelectedScope()) {
-			case ISearchPageContainer.SELECTION_SCOPE:
-				return PluginSearchScope.SCOPE_SELECTION;
-			case ISearchPageContainer.WORKING_SET_SCOPE:
-				return PluginSearchScope.SCOPE_WORKING_SETS;
-			default:
-				return PluginSearchScope.SCOPE_WORKSPACE;
-		}
-	}
-		
-	private void hookListeners() {
-		searchForButtons[1].addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				boolean selected = searchForButtons[1].getSelection();
-				if (selected) {
-					limitToButtons[0].setSelection(true);
-					limitToButtons[1].setSelection(false);
-					limitToButtons[2].setSelection(false);
-				}
-				limitToButtons[1].setEnabled(!selected);
-				limitToButtons[2].setEnabled(!selected);
-			} 
-		});
-		
-		patternCombo.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				int index = previousQueries.size() - patternCombo.getSelectionIndex() - 1;
-				QueryData data = (QueryData)previousQueries.get(index);
-				resetPage(data);
-				container.setPerformActionEnabled(patternCombo.getText().length() > 0);
-			}
-		});
-		
-		patternCombo.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				container.setPerformActionEnabled(patternCombo.getText().trim().length() > 0);
-			}
-		});	
-	}
-	
-	public boolean performAction() {
-		saveQueryData();
-		NewSearchUI.activateSearchResultView();
-		NewSearchUI.runQueryInBackground(new PluginSearchQuery(getInput()));
-		return true;
-	}
-	
-	private void resetPage (QueryData data) {
-		caseSensitive.setSelection(data.isCaseSensitive);
-		
-		searchForButtons[0].setSelection(data.searchElement == PluginSearchInput.ELEMENT_PLUGIN);
-		searchForButtons[1].setSelection(data.searchElement == PluginSearchInput.ELEMENT_FRAGMENT);
-		searchForButtons[2].setSelection(data.searchElement == PluginSearchInput.ELEMENT_EXTENSION_POINT);
-
-		limitToButtons[0].setSelection(data.limit == PluginSearchInput.LIMIT_DECLARATIONS);
-		limitToButtons[1].setSelection(data.limit == PluginSearchInput.LIMIT_REFERENCES);
-		limitToButtons[1].setEnabled(!searchForButtons[1].getSelection());
-		limitToButtons[2].setSelection(data.limit == PluginSearchInput.LIMIT_ALL);
-		limitToButtons[2].setEnabled(!searchForButtons[1].getSelection());
-		
-		externalScopeButtons[0].setSelection(data.externalScope == PluginSearchScope.EXTERNAL_SCOPE_ALL);
-		externalScopeButtons[1].setSelection(data.externalScope == PluginSearchScope.EXTERNAL_SCOPE_ENABLED);
-		externalScopeButtons[2].setSelection(data.externalScope == PluginSearchScope.EXTERNAL_SCOPE_NONE);
-		
-		container.setSelectedScope(data.workspaceScope);
-		if (data.workingSets != null)
-			container.setSelectedWorkingSets(data.workingSets);		
-	}
-		
-	private void saveQueryData() {
-		QueryData data = new QueryData();
-		data.text = patternCombo.getText();
-		data.isCaseSensitive = caseSensitive.getSelection();
-		data.searchElement = getSearchFor();
-		data.limit = getLimitTo();
-		data.externalScope = getExternalScope();
-		data.workspaceScope = container.getSelectedScope();
-		data.workingSets = container.getSelectedWorkingSets();
-		
-		if (previousQueries.contains(data))
-			previousQueries.remove(data);
-			
-		previousQueries.add(data);			
-		if (previousQueries.size() > 10)
-			previousQueries.remove(0);
-	}
-	
-	public void setContainer(ISearchPageContainer container) {
-		this.container = container;
-	}
-	
-	public void setVisible(boolean visible) {
-		if (visible && patternCombo != null) {
-			if (firstTime) {
-				firstTime = false;
-				String[] patterns = new String[previousQueries.size()];
-				for (int i = previousQueries.size() - 1, j = 0;
-					i >= 0;
-					i--, j++) {
-					patterns[j] = ((QueryData) previousQueries.get(i)).text;
-				}
-				patternCombo.setItems(patterns);
-				container.setPerformActionEnabled(
-					patternCombo.getText().length() > 0);
-			}
-			patternCombo.setFocus();
-		}
-		super.setVisible(visible);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchQuery.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchQuery.java
deleted file mode 100644
index 456e017..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchQuery.java
+++ /dev/null

@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.search;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.internal.core.search.*;
-import org.eclipse.search.ui.*;
-import org.eclipse.search.ui.text.*;
-
-public class PluginSearchQuery implements ISearchQuery {
-
-	private SearchResult fSearchResult;
-
-	private PluginSearchInput fSearchInput;
-
-	public PluginSearchQuery(PluginSearchInput input) {
-		fSearchInput = input;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.search.ui.ISearchQuery#run(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public IStatus run(IProgressMonitor monitor) {
-		final AbstractTextSearchResult result = (AbstractTextSearchResult) getSearchResult();
-		result.removeAll();
-		ISearchResultCollector collector = new ISearchResultCollector() {
-			public void accept(Object match) {
-				if (match instanceof ISourceObject) {
-					ISourceObject object = (ISourceObject) match;
-					result.addMatch(new Match(match, Match.UNIT_LINE,
-							object.getStartLine() - 1, 1));
-				}
-			}
-		};
-		PluginSearchOperation op = new PluginSearchOperation(fSearchInput, collector);
-		op.execute(monitor);
-		monitor.done();
-		return Status.OK_STATUS;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.search.ui.ISearchQuery#getLabel()
-	 */
-	public String getLabel() {
-		return fSearchInput.getSearchString();
-	}
-	
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.search.ui.ISearchQuery#canRerun()
-	 */
-	public boolean canRerun() {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.search.ui.ISearchQuery#canRunInBackground()
-	 */
-	public boolean canRunInBackground() {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.search.ui.ISearchQuery#getSearchResult()
-	 */
-	public ISearchResult getSearchResult() {
-		if (fSearchResult == null)
-			fSearchResult = new SearchResult(this);
-		return fSearchResult;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchResultPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchResultPage.java
deleted file mode 100644
index da84a7e..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PluginSearchResultPage.java
+++ /dev/null

@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.search;
-
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.search.ui.text.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.actions.*;
-
-
-public class PluginSearchResultPage extends AbstractSearchResultPage {
-
-	class SearchLabelProvider extends LabelProvider {
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object)
-		 */
-		public Image getImage(Object element) {
-			return PDEPlugin.getDefault().getLabelProvider().getImage(element);
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)
-		 */
-		public String getText(Object object) {
-			if (object instanceof IPluginBase)
-				return ((IPluginBase)object).getId();
-			
-			if (object instanceof IPluginImport) {
-				IPluginImport dep = (IPluginImport)object;
-				return dep.getId() 
-					+ " - " //$NON-NLS-1$
-					+ dep.getPluginBase().getId();
-			} 
-			
-			if (object instanceof IPluginExtension) {
-				IPluginExtension extension = (IPluginExtension)object;
-				return extension.getPoint() + " - " + extension.getPluginBase().getId(); //$NON-NLS-1$
-			}
-			
-			if (object instanceof IPluginExtensionPoint)
-				return ((IPluginExtensionPoint)object).getFullId();
-
-			return PDEPlugin.getDefault().getLabelProvider().getText(object);
-		}
-	}
-	
-	public PluginSearchResultPage() {
-		super();
-		PDEPlugin.getDefault().getLabelProvider().connect(this);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#fillContextMenu(org.eclipse.jface.action.IMenuManager)
-	 */
-	protected void fillContextMenu(IMenuManager mgr) {
-		super.fillContextMenu(mgr);
-		mgr.add(new Separator());
-		PluginSearchActionGroup actionGroup = new PluginSearchActionGroup();
-		actionGroup.setContext(new ActionContext(getViewer().getSelection()));
-		actionGroup.fillContextMenu(mgr);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.search.AbstractSearchResultPage#createLabelProvider()
-	 */
-	protected ILabelProvider createLabelProvider() {
-		return new SearchLabelProvider();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.search.AbstractSearchResultPage#createViewerSorter()
-	 */
-	protected ViewerSorter createViewerSorter() {
-		return new ViewerSorter();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#showMatch(org.eclipse.search.ui.text.Match, int, int, boolean)
-	 */
-	protected void showMatch(Match match, int currentOffset, int currentLength,
-			boolean activate) throws PartInitException {
-		ManifestEditorOpener.open(match, activate);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#dispose()
-	 */
-	public void dispose() {
-		PDEPlugin.getDefault().getLabelProvider().disconnect(this);
-		super.dispose();
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PreviewReferenceAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PreviewReferenceAction.java
deleted file mode 100644
index 0ad52ab..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/PreviewReferenceAction.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.search;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.internal.core.ischema.ISchema;
-import org.eclipse.pde.internal.core.schema.*;
-import org.eclipse.ui.*;
-
-public class PreviewReferenceAction implements IObjectActionDelegate {
-	private IFile fFile;
-	private ShowDescriptionAction fDelegate;
-	
-	/**
-	 * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-	}
-
-	/**
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		if (fFile == null)
-			return;
-		SchemaDescriptor sd = new SchemaDescriptor(fFile, false);
-		ISchema schema = sd.getSchema(false);
-		if (fDelegate == null) {
-			fDelegate = new ShowDescriptionAction(schema);
-		} else
-			fDelegate.setSchema(schema);
-		fDelegate.run();
-	}
-
-	/**
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		fFile = null;
-		if (selection instanceof IStructuredSelection) {
-			Object obj = ((IStructuredSelection)selection).getFirstElement();
-			if (obj instanceof IFile)
-				fFile = (IFile)obj;
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/SearchResult.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/SearchResult.java
deleted file mode 100644
index 1c45a96..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/SearchResult.java
+++ /dev/null

@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.search;
-
-import java.io.*;
-import java.util.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.resource.*;
-import org.eclipse.jface.text.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.search.ui.*;
-import org.eclipse.search.ui.text.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.texteditor.*;
-
-public class SearchResult extends AbstractTextSearchResult implements IEditorMatchAdapter {
-	protected ISearchQuery fQuery;
-	
-	public SearchResult(ISearchQuery query) {
-		fQuery = query;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.search.ui.text.AbstractTextSearchResult#getEditorMatchAdapter()
-	 */
-	public IEditorMatchAdapter getEditorMatchAdapter() {
-		return this;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.search.ui.ISearchResult#getLabel()
-	 */
-	public String getLabel() {
-		int numMatches = getMatchCount();	
-		return fQuery.getLabel() + " - " + numMatches + " " + (numMatches == 1 ? PDEUIMessages.SearchResult_match : PDEUIMessages.SearchResult_matches); //$NON-NLS-1$ //$NON-NLS-2$  
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.search.ui.ISearchResult#getTooltip()
-	 */
-	public String getTooltip() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.search.ui.ISearchResult#getImageDescriptor()
-	 */
-	public ImageDescriptor getImageDescriptor() {
-		return PDEPluginImages.DESC_PSEARCH_OBJ;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.search.ui.ISearchResult#getQuery()
-	 */
-	public ISearchQuery getQuery() {
-		return fQuery;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.search.ui.text.IEditorMatchAdapter#isShownInEditor(org.eclipse.search.ui.text.Match, org.eclipse.ui.IEditorPart)
-	 */
-	public boolean isShownInEditor(Match match, IEditorPart editor) {
-		Object element = match.getElement();
-		if (element instanceof IPluginObject)
-			return isMatchContained(editor, (IPluginObject)element);
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.search.ui.text.IEditorMatchAdapter#computeContainedMatches(org.eclipse.search.ui.text.AbstractTextSearchResult, org.eclipse.ui.IEditorPart)
-	 */
-	public Match[] computeContainedMatches(AbstractTextSearchResult result, IEditorPart editor) {
-		ArrayList list = new ArrayList();
-		Object[] objects = result.getElements();
-		for (int i = 0; i < objects.length; i++) {
-			if (objects[i] instanceof IPluginObject) {
-				IPluginObject object = (IPluginObject)objects[i];
-				if (isMatchContained(editor, object)){
-					Match[] matches = getMatches(object);
-					for (int j = 0; j < matches.length; j++) {
-						IDocument document = getDocument(editor, matches[j]);
-						if (document != null)
-							list.add(ManifestEditorOpener.findExactMatch(document, matches[j]));
-					}
-				}
-			}
-		}
-		return (Match[]) list.toArray(new Match[list.size()]);
-	}
-	
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.search.ui.text.AbstractTextSearchResult#getFileMatchAdapter()
-	 */
-	public IFileMatchAdapter getFileMatchAdapter() {
-		return null;
-	}
-	
-	protected boolean isMatchContained(IEditorPart editor, IPluginObject object) {
-		IFile resource = (IFile)editor.getEditorInput().getAdapter(IFile.class);
-		if (resource != null) {
-			IResource objectResource = object.getModel().getUnderlyingResource();
-			if (objectResource != null)
-				return resource.getProject().equals(objectResource.getProject());
-		}
-		File file = (File)editor.getEditorInput().getAdapter(File.class);
-		if (file != null) {
-			IPath path = new Path(object.getModel().getInstallLocation());
-			IPath filePath = null;
-			if ("MANIFEST.MF".equals(file.getName())) //$NON-NLS-1$
-				filePath = new Path(file.getParentFile().getParent());
-			else if (file.getName().endsWith("jar")) { //$NON-NLS-1$
-				filePath = new Path(file.getPath());
-			} else {
-				filePath = new Path(file.getParent());
-			}
-			return path.equals(filePath);		
-		}
-		return false;
-	}
-	
-	protected IDocument getDocument(IEditorPart editor, Match match) {
-		IDocument document = null;
-		if (editor instanceof ISearchEditorAccess) {
-			document = ((ISearchEditorAccess)editor).getDocument(match);
-		} else if (editor instanceof ITextEditor) {
-			document = ((ITextEditor)editor).getDocumentProvider().getDocument(editor.getEditorInput());
-		}
-		return document;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/ShowDescriptionAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/ShowDescriptionAction.java
deleted file mode 100644
index 29ea3ce..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/ShowDescriptionAction.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.search;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.core.plugin.IPluginExtensionPoint;
-import org.eclipse.pde.internal.builders.SchemaTransformer;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.ischema.ISchema;
-import org.eclipse.pde.internal.core.ischema.ISchemaDescriptor;
-import org.eclipse.pde.internal.core.schema.SchemaDescriptor;
-import org.eclipse.pde.internal.core.schema.SchemaRegistry;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.browser.IWebBrowser;
-import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
-
-
-public class ShowDescriptionAction extends Action {
-	private String fPointID;
-	private ISchema fSchema;
-	private File fPreviewFile;
-	private boolean forceExternal;
-	
-	public ShowDescriptionAction(String pointID) {
-		fPointID = pointID;
-	}
-
-	public ShowDescriptionAction(IPluginExtensionPoint point) {
-		this(point, false);
-	}
-	
-	public ShowDescriptionAction(IPluginExtensionPoint point, boolean forceExternal) {
-		setExtensionPoint(point);
-		this.forceExternal = forceExternal;
-	}
-	
-	public ShowDescriptionAction(ISchema schema) {
-		setSchema(schema);
-	}
-	
-	public void setSchema(ISchema schema) {
-		fSchema = schema;
-		fPointID = schema.getQualifiedPointId();
-	}
-	
-	public void setExtensionPoint(IPluginExtensionPoint point) {
-		fPointID = point.getFullId();
-		setText(PDEUIMessages.ShowDescriptionAction_label); 
-		fSchema = null;
-	}
-	
-	public void run() {
-		if (fSchema == null) {
-			IPluginExtensionPoint point = PDECore.getDefault().findExtensionPoint(fPointID);
-			URL url = null;
-			if (point != null) {
-				url = SchemaRegistry.getSchemaURL(point);
-				if (url != null) {
-					ISchemaDescriptor desc = new SchemaDescriptor(fPointID, url);
-					fSchema = desc.getSchema(false);
-				}
-			}
-			if (point == null|| url == null || fSchema == null) {
-				showNoSchemaMessage();
-				return;
-			}
-		} 
-		showSchemaDocument();
-	}
-	
-	private void showNoSchemaMessage() {
-		String title = PDEUIMessages.ShowDescriptionAction_title; 
-		String message = NLS.bind(PDEUIMessages.ShowDescriptionAction_noPoint_desc, fPointID); // 
-		MessageDialog.openWarning(PDEPlugin.getActiveWorkbenchShell(), title, message);
-	}
-
-	private void showSchemaDocument() {
-		try {
-			fPreviewFile = getPreviewFile();
-			if (fPreviewFile == null)
-				return;
-
-			SchemaTransformer transformer = new SchemaTransformer();
-			OutputStream os = new FileOutputStream(fPreviewFile);
-			PrintWriter printWriter = new PrintWriter(os, true);
-			transformer.transform(fSchema, printWriter); 
-			os.flush();
-			os.close();
-			showURL(fPreviewFile, forceExternal);
-		} catch (IOException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-	
-	private File getPreviewFile(){
-		try {
-			File file = File.createTempFile("pde", ".html"); //$NON-NLS-1$ //$NON-NLS-2$
-			file.deleteOnExit();
-			return file;
-		} catch (IOException e) {
-		}
-		return null;
-	}
-	
-	private void showURL(File file, boolean forceExternal) {
-		try {
-			IWorkbenchBrowserSupport support = PlatformUI.getWorkbench().getBrowserSupport();
-			URL url = file.toURL();
-			
-			if (forceExternal) {
-				IWebBrowser browser = support.getExternalBrowser();
-				browser.openURL(url); 
-			} else {
-				IWebBrowser browser = support.createBrowser(
-						IWorkbenchBrowserSupport.AS_EDITOR
-								| IWorkbenchBrowserSupport.STATUS,
-						"org.eclipse.pde", fPointID, fPointID); //$NON-NLS-1$
-				browser.openURL(url); 
-			}
-		} catch (MalformedURLException e) {
-			PDEPlugin.logException(e);
-		}
-		catch (PartInitException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentAction.java
deleted file mode 100644
index 7654f0e..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentAction.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.search.dependencies;
-
-
-import org.eclipse.core.resources.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.search.ui.*;
-
-public class DependencyExtentAction extends Action {
-	
-	private IProject fProject;
-
-	private String fImportID;
-	
-	public DependencyExtentAction(IProject project, String importID) {
-		fProject = project;
-		fImportID = importID;
-		setText(PDEUIMessages.DependencyExtentAction_label);
-	}
-		
-	public void run() {
-		NewSearchUI.activateSearchResultView();
-		NewSearchUI.runQueryInBackground(new DependencyExtentQuery(fProject, fImportID));
-	}	
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentOperation.java
deleted file mode 100644
index f2212ce..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentOperation.java
+++ /dev/null

@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.search.dependencies;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.core.search.*;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.core.search.PluginJavaSearchUtil;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.search.ui.*;
-import org.eclipse.search.ui.text.*;
-
-
-public class DependencyExtentOperation {
-	
-	class TypeReferenceSearchRequestor extends SearchRequestor {
-		boolean fUsed = false;
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jdt.core.search.SearchRequestor#acceptSearchMatch(org.eclipse.jdt.core.search.SearchMatch)
-		 */
-		public void acceptSearchMatch(SearchMatch match) throws CoreException {
-			if (match.getAccuracy() == SearchMatch.A_ACCURATE && !match.isInsideDocComment()) {
-				fUsed = true;
-			}
-		}
-		
-		public boolean containMatches() {
-			return fUsed;
-		}
-	}
-	
-	class TypeDeclarationSearchRequestor extends SearchRequestor {
-		
-		private Match fMatch;
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jdt.core.search.SearchRequestor#acceptSearchMatch(org.eclipse.jdt.core.search.SearchMatch)
-		 */
-		public void acceptSearchMatch(SearchMatch match) throws CoreException {
-			if (!match.isInsideDocComment())
-				fMatch = new Match(match.getElement(), Match.UNIT_CHARACTER, match.getOffset(), match.getLength()); 
-		}
-		
-		public Match getMatch() {
-			return fMatch;
-		}		
-	}
-	
-	private DependencyExtentSearchResult fSearchResult;
-	private String fImportID;
-	private IPluginModelBase fModel;
-	private IProject fProject;
-
-	public DependencyExtentOperation(IProject project, String importID, ISearchResult searchResult) {
-		fSearchResult = (DependencyExtentSearchResult)searchResult;
-		fProject = project;
-		fImportID = importID;
-		fModel = PDECore.getDefault().getModelManager().findModel(project);
-	}
-	
-	public void execute(IProgressMonitor monitor) {
-		IPlugin[] plugins = PluginJavaSearchUtil.getPluginImports(fImportID);
-		monitor.beginTask(PDEUIMessages.DependencyExtentOperation_searching + " " + fImportID + "...", 10);  //$NON-NLS-1$//$NON-NLS-2$ 
-		checkForJavaDependencies(plugins, new SubProgressMonitor(monitor, 9));
-		for (int i = 0; i < plugins.length; i++) {
-			checkForExtensionPointsUsed(plugins[i]);
-		}
-		monitor.done();
-	}
-
-	private void checkForExtensionPointsUsed(IPlugin plugin) {
-		IPluginExtensionPoint[] extPoints = plugin.getExtensionPoints();
-		for (int i = 0; i < extPoints.length; i++) {
-			findMatches(extPoints[i]);
-		}
-	}
-	
-	private void findMatches(IPluginExtensionPoint point) {
-		String fullID = point.getFullId();
-		if (fullID == null)
-			return;
-
-		IPluginExtension[] extensions = fModel.getPluginBase().getExtensions();
-		for (int i = 0; i < extensions.length; i++) {
-			if (fullID.equals(extensions[i].getPoint())) {
-				int line = ((ISourceObject)extensions[i]).getStartLine()-1;
-				if (line >= 0) {
-					fSearchResult.addMatch(new Match(point, Match.UNIT_LINE, line, 1));
-					break;
-				}
-			}
-		}
-	}
-	
-	private void checkForJavaDependencies(IPlugin[] plugins, IProgressMonitor monitor) {
-		try {
-			if (!fProject.hasNature(JavaCore.NATURE_ID)) 
-				return;
-			
-			IJavaProject jProject = JavaCore.create(fProject);
-			IPackageFragment[] packageFragments = PluginJavaSearchUtil.collectPackageFragments(plugins, jProject, true);
-			monitor.beginTask("", packageFragments.length); //$NON-NLS-1$
-			SearchEngine engine = new SearchEngine();
-			for (int i = 0; i < packageFragments.length; i++) {
-				if (monitor.isCanceled())
-					break;
-				IPackageFragment pkgFragment = packageFragments[i];
-				monitor.subTask(PDEUIMessages.DependencyExtentOperation_inspecting + " " + pkgFragment.getElementName()); //$NON-NLS-1$ 
-				if (pkgFragment.hasChildren()) {
-					IJavaElement[] children = pkgFragment.getChildren();
-					for (int j = 0; j < children.length; j++) {
-						if (monitor.isCanceled())
-							break;
-						IJavaElement child = children[j];
-						IType[] types = new IType[0];
-						if (child instanceof IClassFile) {
-							types = new IType[] {((IClassFile) child).getType()};
-						} else if (child instanceof ICompilationUnit) {
-							types = ((ICompilationUnit) child).getTypes();
-						}
-						if (types.length > 0)
-							searchForTypesUsed(engine, child, types, PluginJavaSearchUtil.createSeachScope(jProject));
-					}
-				} 
-				monitor.worked(1);
-			}	
-		} catch (CoreException e) {			
-		} finally {
-			monitor.done();
-		}
-	}
-	
-	private void searchForTypesUsed(SearchEngine engine, IJavaElement parent, IType[] types, IJavaSearchScope scope) throws CoreException {
-		for (int i = 0; i < types.length; i++) {
-			TypeReferenceSearchRequestor requestor = new TypeReferenceSearchRequestor();
-			engine.search(
-					SearchPattern.createPattern(types[i], IJavaSearchConstants.REFERENCES),
-					new SearchParticipant[] {SearchEngine.getDefaultSearchParticipant()},
-					scope,
-					requestor,
-					null);
-			if (requestor.containMatches()) {
-				TypeDeclarationSearchRequestor decRequestor = new TypeDeclarationSearchRequestor();
-				engine.search(
-						SearchPattern.createPattern(types[i], IJavaSearchConstants.DECLARATIONS),
-						new SearchParticipant[] {SearchEngine.getDefaultSearchParticipant()},
-						SearchEngine.createJavaSearchScope(new IJavaElement[] {parent}),
-						decRequestor,
-						null);
-				fSearchResult.addMatch(decRequestor.getMatch());	
-			}
-		}
-		
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentQuery.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentQuery.java
deleted file mode 100644
index 599a173..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentQuery.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.search.dependencies;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.search.ui.*;
-import org.eclipse.search.ui.text.*;
-
-
-public class DependencyExtentQuery implements ISearchQuery {
-	
-	private ISearchResult fSearchResult;
-	private IProject fProject;
-	private String fImportID;
-	
-	public DependencyExtentQuery(IProject project, String importID) {
-		fProject = project;
-		fImportID = importID;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.search.ui.ISearchQuery#run(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public IStatus run(IProgressMonitor monitor) {
-		final AbstractTextSearchResult result = (AbstractTextSearchResult) getSearchResult();
-		result.removeAll();
-		DependencyExtentOperation op = new DependencyExtentOperation(fProject, fImportID, result);
-		op.execute(monitor);
-		return Status.OK_STATUS;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.search.ui.ISearchQuery#getLabel()
-	 */
-	public String getLabel() {
-		return PDEUIMessages.DependencyExtentQuery_label + " " + fImportID; //$NON-NLS-1$ 
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.search.ui.ISearchQuery#canRerun()
-	 */
-	public boolean canRerun() {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.search.ui.ISearchQuery#canRunInBackground()
-	 */
-	public boolean canRunInBackground() {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.search.ui.ISearchQuery#getSearchResult()
-	 */
-	public ISearchResult getSearchResult() {
-		if (fSearchResult == null)
-			fSearchResult = new DependencyExtentSearchResult(this);
-		return fSearchResult;
-	}
-	
-	public IPackageFragmentRoot[] getDirectRoots() {
-		ArrayList result = new ArrayList();
-		try {
-			IPackageFragmentRoot[] roots = JavaCore.create(fProject).getPackageFragmentRoots();
-			for (int i = 0; i < roots.length; i++) {
-				if (roots[i].getKind() == IPackageFragmentRoot.K_SOURCE
-						|| (roots[i].isArchive() && !roots[i].isExternal())) {
-					result.add(roots[i]);
-				}
-			}
-		} catch (JavaModelException e) {
-		}
-		return (IPackageFragmentRoot[]) result
-				.toArray(new IPackageFragmentRoot[result.size()]);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentSearchResult.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentSearchResult.java
deleted file mode 100644
index 4ef4cce..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentSearchResult.java
+++ /dev/null

@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.search.dependencies;
-
-import java.util.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.internal.ui.javaeditor.*;
-import org.eclipse.jface.resource.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.search.*;
-import org.eclipse.search.ui.*;
-import org.eclipse.search.ui.text.*;
-import org.eclipse.ui.*;
-
-
-public class DependencyExtentSearchResult extends SearchResult implements IEditorMatchAdapter {
-
-	/**
-	 * @param query
-	 */
-	public DependencyExtentSearchResult(ISearchQuery query) {
-		super(query);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.search.ui.text.AbstractTextSearchResult#getEditorMatchAdapter()
-	 */
-	public IEditorMatchAdapter getEditorMatchAdapter() {
-		return this;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.search.ui.text.AbstractTextSearchResult#getFileMatchAdapter()
-	 */
-	public IFileMatchAdapter getFileMatchAdapter() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.search.ui.text.IEditorMatchAdapter#isShownInEditor(org.eclipse.search.ui.text.Match, org.eclipse.ui.IEditorPart)
-	 */
-	public boolean isShownInEditor(Match match, IEditorPart editor) {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.search.ui.text.IEditorMatchAdapter#computeContainedMatches(org.eclipse.search.ui.text.AbstractTextSearchResult, org.eclipse.ui.IEditorPart)
-	 */
-	public Match[] computeContainedMatches(AbstractTextSearchResult result, IEditorPart editor) {
-		IEditorInput editorInput= editor.getEditorInput();
-		if (editorInput instanceof IFileEditorInput)  {
-			IFileEditorInput fileEditorInput= (IFileEditorInput) editorInput;
-			IFile file = fileEditorInput.getFile();
-			if (JavaCore.create(file) != null)
-				return computeContainedMatches(result, file);
-		} else if (editorInput instanceof IClassFileEditorInput) {
-			IClassFileEditorInput classFileEditorInput= (IClassFileEditorInput) editorInput;
-			Set matches= new HashSet();
-			collectMatches(matches, classFileEditorInput.getClassFile());
-			return (Match[]) matches.toArray(new Match[matches.size()]);
-		}
-		return super.computeContainedMatches(result, editor);
-
-	}
-	
-	public Match[] computeContainedMatches(AbstractTextSearchResult result, IFile file) {
-		IJavaElement javaElement= JavaCore.create(file);
-		if (!(javaElement instanceof ICompilationUnit || javaElement instanceof IClassFile))
-			return new Match[0];
-		Set matches= new HashSet();
-		collectMatches(matches, javaElement);
-		return (Match[]) matches.toArray(new Match[matches.size()]);
-	}
-
-	
-	private void collectMatches(Set matches, IJavaElement element) {
-		Match[] m= getMatches(element);
-		if (m.length != 0) {
-			for (int i= 0; i < m.length; i++) {
-				matches.add(m[i]);
-			}
-		}
-		if (element instanceof IParent) {
-			IParent parent= (IParent) element;
-			try {
-				IJavaElement[] children= parent.getChildren();
-				for (int i= 0; i < children.length; i++) {
-					collectMatches(matches, children[i]);
-				}
-			} catch (JavaModelException e) {
-				// we will not be tracking these results
-			}
-		}
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.search.ui.ISearchResult#getLabel()
-	 */
-	public String getLabel() {
-		int count = getMatchCount();
-		return fQuery.getLabel() + " - " + count + " " + (count == 1 ? PDEUIMessages.DependencyExtentSearchResult_dependency : PDEUIMessages.DependencyExtentSearchResult_dependencies); //$NON-NLS-1$ //$NON-NLS-2$  
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.search.ui.ISearchResult#getTooltip()
-	 */
-	public String getTooltip() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.search.ui.ISearchResult#getImageDescriptor()
-	 */
-	public ImageDescriptor getImageDescriptor() {
-		return PDEPluginImages.DESC_PSEARCH_OBJ;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.search.ui.ISearchResult#getQuery()
-	 */
-	public ISearchQuery getQuery() {
-		return fQuery;
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentSearchResultPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentSearchResultPage.java
deleted file mode 100644
index 4853362..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/DependencyExtentSearchResultPage.java
+++ /dev/null

@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.search.dependencies;
-
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.ui.*;
-import org.eclipse.jdt.ui.actions.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.search.*;
-import org.eclipse.search.ui.text.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.actions.*;
-
-
-public class DependencyExtentSearchResultPage extends
-		AbstractSearchResultPage {
-	
-
-	class Sorter extends ViewerSorter {
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ViewerSorter#category(java.lang.Object)
-		 */
-		public int category(Object element) {
-			try {
-				if (element instanceof IType) {
-					if (((IType)element).isClass())
-						return 1;
-					return 0;
-				}
-			} catch (JavaModelException e) {
-			}
-			return 2;
-		}
-	}
-	
-	class LabelProvider extends JavaElementLabelProvider {
-		/* (non-Javadoc)
-		 * @see org.eclipse.jdt.ui.JavaElementLabelProvider#getImage(java.lang.Object)
-		 */
-		public Image getImage(Object element) {
-			if (element instanceof IPluginObject)
-				return PDEPlugin.getDefault().getLabelProvider().getImage(element);
-			return super.getImage(element);
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jdt.ui.JavaElementLabelProvider#getText(java.lang.Object)
-		 */
-		public String getText(Object element) {
-			if (element instanceof IPluginExtensionPoint) 
-				return ((IPluginExtensionPoint) element).getFullId();
-			
-			if (element instanceof IPluginExtension)
-				return ((IPluginExtension)element).getPoint();
-			
-			if (element instanceof IJavaElement) {
-				IJavaElement javaElement = (IJavaElement) element;
-				String text =
-					super.getText(javaElement)
-						+ " - " //$NON-NLS-1$
-						+ javaElement
-							.getAncestor(IJavaElement.PACKAGE_FRAGMENT)
-							.getElementName();
-				if (!(javaElement instanceof IType)) {
-					IJavaElement ancestor = javaElement.getAncestor(IJavaElement.TYPE);
-					if (ancestor == null)
-						ancestor = javaElement.getAncestor(IJavaElement.CLASS_FILE);
-					if (ancestor == null)
-						ancestor = javaElement.getAncestor(IJavaElement.COMPILATION_UNIT);
-					if (ancestor != null)
-						text += "." + ancestor.getElementName(); //$NON-NLS-1$
-				}
-				return text;
-			}
-			return super.getText(element);
-		}
-	}
-
-	public DependencyExtentSearchResultPage() {
-		PDEPlugin.getDefault().getLabelProvider().connect(this);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#dispose()
-	 */
-	public void dispose() {
-		PDEPlugin.getDefault().getLabelProvider().disconnect(this);
-		super.dispose();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#fillContextMenu(org.eclipse.jface.action.IMenuManager)
-	 */
-	protected void fillContextMenu(IMenuManager mgr) {
-		super.fillContextMenu(mgr);
-		mgr.add(new Separator());
-		JavaSearchActionGroup group = new JavaSearchActionGroup(this);
-		group.setContext(new ActionContext(getViewer().getSelection()));
-		group.fillContextMenu(mgr);
-		addJavaSearchGroup(mgr);
-		PluginSearchActionGroup actionGroup = new PluginSearchActionGroup();
-		actionGroup.setContext(new ActionContext(getViewer().getSelection()));
-		actionGroup.fillContextMenu(mgr);
-	}
-	
-	private void addJavaSearchGroup(IMenuManager mgr) {
-		IStructuredSelection ssel = (IStructuredSelection)getViewer().getSelection();
-		if (ssel.size() == 1) {
-			final Object object = ssel.getFirstElement();
-			if (object instanceof IType) {
-				mgr.add(new Separator());
-				mgr.add(new Action(PDEUIMessages.DependencyExtentSearchResultPage_referencesInPlugin) {
-					public void run() {
-						DependencyExtentQuery query = (DependencyExtentQuery)getInput().getQuery();
-						IWorkingSetManager manager = PlatformUI.getWorkbench().getWorkingSetManager();
-						IWorkingSet set = manager.createWorkingSet("temp", query.getDirectRoots()); //$NON-NLS-1$
-						new FindReferencesInWorkingSetAction(getViewPart().getSite(), new IWorkingSet[] {set}).run((IType)object);
-						manager.removeWorkingSet(set);
-					}
-				});
-			}
-		}		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#showMatch(org.eclipse.search.ui.text.Match, int, int, boolean)
-	 */
-	protected void showMatch(Match match, int currentOffset, int currentLength,
-			boolean activate) throws PartInitException {
-		if (match.getElement() instanceof IPluginObject) {
-			ManifestEditorOpener.open(match, activate);
-		} else {
-			try {
-				JavaEditorOpener.open(match, currentOffset, currentLength, activate);
-			} catch (PartInitException e) {
-			} catch (JavaModelException e) {
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.search.AbstractSearchResultPage#createLabelProvider()
-	 */
-	protected ILabelProvider createLabelProvider() {
-		return new LabelProvider();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.search.AbstractSearchResultPage#createViewerSorter()
-	 */
-	protected ViewerSorter createViewerSorter() {
-		return new Sorter();
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/JavaEditorOpener.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/JavaEditorOpener.java
deleted file mode 100644
index 2ae9311..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/JavaEditorOpener.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.search.dependencies;
-
-import java.util.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.ui.*;
-import org.eclipse.search.ui.*;
-import org.eclipse.search.ui.text.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.ide.*;
-import org.eclipse.ui.texteditor.*;
-
-
-public class JavaEditorOpener {
-	
-	public static IEditorPart open(Match match, int offset, int length, boolean activate) throws PartInitException, JavaModelException {
-		IEditorPart editor = null;
-		Object element = match.getElement();
-		if (element instanceof IJavaElement) {
-			editor = JavaUI.openInEditor((IJavaElement)element);
-		}
-		if (editor != null && activate)
-			editor.getEditorSite().getPage().activate(editor);
-		if (editor instanceof ITextEditor) {
-			ITextEditor textEditor= (ITextEditor) editor;
-			textEditor.selectAndReveal(offset, length);
-		} else if (editor != null){
-			if (element instanceof IFile) {
-				IFile file= (IFile) element;
-				showWithMarker(editor, file, offset, length);
-			}
-		}		
-		return editor;
-	}
-	
-	private static void showWithMarker(IEditorPart editor, IFile file, int offset, int length) throws PartInitException {
-		try {
-			IMarker marker= file.createMarker(NewSearchUI.SEARCH_MARKER);
-			HashMap attributes= new HashMap(4);
-			attributes.put(IMarker.CHAR_START, new Integer(offset));
-			attributes.put(IMarker.CHAR_END, new Integer(offset + length));
-			marker.setAttributes(attributes);
-			IDE.gotoMarker(editor, marker);
-			marker.delete();
-		} catch (CoreException e) {
-		}
-	}
-
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/ShowResultsAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/ShowResultsAction.java
deleted file mode 100644
index 22755e8..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/ShowResultsAction.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.search.dependencies;
-
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.ui.dialogs.ListDialog;
-
-public class ShowResultsAction extends Action {
-	
-	private IPluginModelBase fModel;
-	Object[] fUnusedImports;
-	private boolean fReadOnly;
-
-	public ShowResultsAction(IPluginModelBase model, Object[] unused, boolean readOnly) {
-		fModel = model;
-		fUnusedImports = unused;
-		fReadOnly = readOnly;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
-	public void run() {
-		if (fUnusedImports.length == 0) {
-			MessageDialog.openInformation(
-				PDEPlugin.getActiveWorkbenchShell(),
-				PDEUIMessages.UnusedDependencies_title, 
-				PDEUIMessages.UnusedDependencies_notFound); 
-		} else {
-			Dialog dialog;
-			if (fReadOnly) {
-				// Launched from Dependencies View, show information dialog
-				dialog = getUnusedDependeciesInfoDialog();
-			} else {
-				dialog = new UnusedImportsDialog(PDEPlugin
-						.getActiveWorkbenchShell(), fModel, fUnusedImports);
-			}
-			dialog.create();
-			dialog.getShell().setText(
-				PDEUIMessages.UnusedDependencies_title); 
-			dialog.open();
-		} 
-	}
-
-	/**
-	 * @return Dialog
-	 */
-	private Dialog getUnusedDependeciesInfoDialog() {
-		ListDialog dialog = new ListDialog(PDEPlugin.getActiveWorkbenchShell());
-		dialog.setAddCancelButton(false);
-		dialog.setContentProvider(new IStructuredContentProvider() {
-			public Object[] getElements(Object inputElement) {
-				return fUnusedImports;
-			}
-
-			public void dispose() {
-			}
-
-			public void inputChanged(Viewer viewer, Object oldInput,
-					Object newInput) {
-			}
-		});
-		dialog.setLabelProvider(PDEPlugin.getDefault().getLabelProvider());
-		dialog.setInput(this);
-		dialog.getTableViewer().setSorter(new UnusedImportsDialog.Sorter());
-		return dialog;
-	}
-}
-
-

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/UnusedDependenciesAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/UnusedDependenciesAction.java
deleted file mode 100644
index 408bd87..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/UnusedDependenciesAction.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.search.dependencies;
-
-import org.eclipse.core.runtime.jobs.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.ui.progress.*;
-
-public class UnusedDependenciesAction extends Action {
-	
-	private IPluginModelBase fModel;
-
-	private boolean fReadOnly;
-
-	public UnusedDependenciesAction(IPluginModelBase model, boolean readOnly) {
-		fModel = model;
-		setText(PDEUIMessages.UnusedDependencies_action); 
-		fReadOnly = readOnly;
-	}
-
-	public void run() {
-		Job job = new UnusedDependenciesJob(PDEUIMessages.UnusedDependenciesAction_jobName, fModel, fReadOnly); 
-		job.setUser(true);
-		job.setProperty(IProgressConstants.ICON_PROPERTY, PDEPluginImages.DESC_PSEARCH_OBJ.createImage());
-		job.schedule();
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/UnusedDependenciesJob.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/UnusedDependenciesJob.java
deleted file mode 100644
index 244d2b4..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/UnusedDependenciesJob.java
+++ /dev/null

@@ -1,256 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.search.dependencies;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IProject;
-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.runtime.jobs.Job;
-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.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.jface.action.Action;
-import org.eclipse.pde.core.plugin.IPlugin;
-import org.eclipse.pde.core.plugin.IPluginImport;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.ClasspathUtilCore;
-import org.eclipse.pde.internal.core.ibundle.IBundle;
-import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelBase;
-import org.eclipse.pde.internal.core.search.PluginJavaSearchUtil;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.model.bundle.Bundle;
-import org.eclipse.pde.internal.ui.model.bundle.ImportPackageHeader;
-import org.eclipse.pde.internal.ui.model.bundle.ImportPackageObject;
-import org.eclipse.swt.widgets.Display;
-import org.osgi.framework.Constants;
-
-
-public class UnusedDependenciesJob extends Job {
-	
-	class Requestor extends SearchRequestor {
-		boolean found = false;
-		public void acceptSearchMatch(SearchMatch match) throws CoreException {
-			found = true;
-		}
-		public boolean foundMatches() {
-			return found;
-		}
-	}
-
-	private IPluginModelBase fModel;
-	private boolean fReadOnly;
-
-	public UnusedDependenciesJob(String name, IPluginModelBase model, boolean readOnly) {
-		super(name);
-		fModel = model;
-		fReadOnly = readOnly;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.internal.jobs.InternalJob#run(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected IStatus run(IProgressMonitor monitor) {
-		ImportPackageObject[] packages = null;
-		if (ClasspathUtilCore.isBundle(fModel)) {
-			IBundle bundle = ((IBundlePluginModelBase)fModel).getBundleModel().getBundle();
-			ImportPackageHeader header = (ImportPackageHeader)((Bundle)bundle).getManifestHeader(Constants.IMPORT_PACKAGE);
-			if (header != null)
-				packages = header.getPackages();
-		}
-		IPluginImport[] imports = fModel.getPluginBase().getImports();
-		try {
-			int totalWork = (packages != null) ? (packages.length + imports.length*3) : imports.length*3;
-			monitor.beginTask("", totalWork); //$NON-NLS-1$
-			ArrayList list = new ArrayList();
-			for (int i = 0; i < imports.length; i++) {
-				if (monitor.isCanceled())
-					break;
-				if (isUnused(imports[i], new SubProgressMonitor(monitor, 3))) {
-					list.add(imports[i]);
-				}
-				updateMonitor(monitor, list.size());
-			}
-			
-			if (packages != null && !monitor.isCanceled()) {
-				for (int i = 0; i < packages.length; i++) {
-					if (isUnused(packages[i], new SubProgressMonitor(monitor, 1))) {
-						list.add(packages[i]);
-						updateMonitor(monitor, list.size());
-					}
-				}
-			}
-			// List can contain IPluginImports or ImportPackageObjects
-			showResults((Object[])list.toArray(new Object[list.size()]));
-		} finally {
-			monitor.done();
-		}
-		return new Status(IStatus.OK, PDEPlugin.getPluginId(), IStatus.OK, PDEUIMessages.UnusedDependenciesJob_viewResults, null); 
-	}
-	
-	private void updateMonitor(IProgressMonitor monitor, int size) {
-		monitor.setTaskName(
-				PDEUIMessages.UnusedDependencies_analyze
-					+ size
-					+ " " //$NON-NLS-1$
-					+ PDEUIMessages.UnusedDependencies_unused
-					+ " " //$NON-NLS-1$
-					+ (size == 1
-						? PDEUIMessages.DependencyExtent_singular
-						: PDEUIMessages.DependencyExtent_plural) 
-					+ " " //$NON-NLS-1$
-					+ PDEUIMessages.DependencyExtent_found); 
-	}
-	
-	private boolean isUnused(IPluginImport plugin, SubProgressMonitor monitor) {
-		IPlugin[] plugins = PluginJavaSearchUtil.getPluginImports(plugin);
-		return !provideJavaClasses(plugins, monitor);
-	}
-	
-	private boolean isUnused(ImportPackageObject pkg, SubProgressMonitor monitor) {
-		return !provideJavaClasses(pkg, monitor);
-	}
-	
-	private boolean provideJavaClasses(IPlugin[] plugins, IProgressMonitor monitor) {
-		try {
-			IProject project = fModel.getUnderlyingResource().getProject();
-			if (!project.hasNature(JavaCore.NATURE_ID))
-				return false;
-			
-			IJavaProject jProject = JavaCore.create(project);
-			IPackageFragment[] packageFragments = PluginJavaSearchUtil.collectPackageFragments(plugins, jProject, true);
-			SearchEngine engine = new SearchEngine();
-			IJavaSearchScope searchScope = PluginJavaSearchUtil.createSeachScope(jProject);
-			monitor.beginTask("", packageFragments.length*2); //$NON-NLS-1$
-			for (int i = 0; i < packageFragments.length; i++) {
-				IPackageFragment pkgFragment = packageFragments[i];
-				if (pkgFragment.hasChildren()) {
-					Requestor requestor = new Requestor();
-					engine.search(
-							SearchPattern.createPattern(pkgFragment, IJavaSearchConstants.REFERENCES),
-							new SearchParticipant[] {SearchEngine.getDefaultSearchParticipant()},
-							searchScope,
-							requestor, 
-							new SubProgressMonitor(monitor, 1));
-					if (requestor.foundMatches()) {
-						if (provideJavaClasses(packageFragments[i], engine,
-								searchScope, new SubProgressMonitor(monitor, 1))) {
-							return true;
-						}
-					} else
-						monitor.worked(1);
-				} else {
-					monitor.worked(2);
-				}
-			}	
-		} catch (CoreException e) {
-		} finally {
-			monitor.done();
-		}
-		return false;
-	}
-
-	private boolean provideJavaClasses(IPackageFragment packageFragment,
-			SearchEngine engine, IJavaSearchScope searchScope,
-			IProgressMonitor monitor) throws JavaModelException, CoreException {
-		Requestor requestor;
-		IJavaElement[] children = packageFragment.getChildren();
-		monitor.beginTask("", children.length); //$NON-NLS-1$
-
-		try {
-			for (int j = 0; j < children.length; j++) {
-				IType[] types = null;
-				if (children[j] instanceof ICompilationUnit) {
-					types = ((ICompilationUnit) children[j]).getAllTypes();
-				} else if (children[j] instanceof IClassFile) {
-					types = new IType[] { ((IClassFile) children[j]).getType() };
-				}
-				if (types != null) {
-					for (int t = 0; t < types.length; t++) {
-						requestor = new Requestor();
-						engine.search(SearchPattern.createPattern(types[t],
-								IJavaSearchConstants.REFERENCES),
-								new SearchParticipant[] { SearchEngine
-										.getDefaultSearchParticipant() },
-								searchScope, requestor, new SubProgressMonitor(
-										monitor, 1));
-						if (requestor.foundMatches()) {
-							return true;
-						}
-					}
-				}
-			}
-		} finally {
-			monitor.done();
-		}
-		return false;
-	}
-	
-	private boolean provideJavaClasses(ImportPackageObject pkg, IProgressMonitor monitor) {
-		try {
-			IProject project = fModel.getUnderlyingResource().getProject();
-			
-			if (!project.hasNature(JavaCore.NATURE_ID))
-				return false;
-			
-			monitor.beginTask("", 1); //$NON-NLS-1$
-			IJavaProject jProject = JavaCore.create(project);
-			SearchEngine engine = new SearchEngine();
-			IJavaSearchScope searchScope = PluginJavaSearchUtil.createSeachScope(jProject);
-			Requestor requestor = new Requestor();
-			String packageName = pkg.getName();
-			
-			engine.search(
-					SearchPattern.createPattern(packageName, IJavaSearchConstants.PACKAGE, 
-							IJavaSearchConstants.REFERENCES, SearchPattern.R_EXACT_MATCH),
-							new SearchParticipant[] {SearchEngine.getDefaultSearchParticipant()},
-							searchScope, 
-							requestor, 
-							new SubProgressMonitor(monitor, 1));
-			
-			if (requestor.foundMatches()) 
-				return true;
-		} catch (CoreException e) {
-		} finally {
-			monitor.done();
-		}
-		return false;
-	}
-	
-	private Action getShowResultsAction(Object[] unused) {
-		return new ShowResultsAction(fModel, unused, fReadOnly);
-	}
-	
-    protected void showResults(final Object[] unused) {
-        Display.getDefault().asyncExec(new Runnable() {
-           public void run() {
-              getShowResultsAction(unused).run();
-           }
-        });
-     }
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/UnusedImportsDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/UnusedImportsDialog.java
deleted file mode 100644
index 8d9a930..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dependencies/UnusedImportsDialog.java
+++ /dev/null

@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.search.dependencies;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.core.plugin.IPluginImport;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.elements.DefaultTableProvider;
-import org.eclipse.pde.internal.ui.model.bundle.*;
-import org.eclipse.pde.internal.ui.parts.WizardCheckboxTablePart;
-import org.eclipse.pde.internal.ui.wizards.ListUtil.PluginSorter;
-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.Shell;
-
-public class UnusedImportsDialog extends Dialog {
-	private IPluginModelBase model;
-	private Object[] unused;
-	private WizardCheckboxTablePart checkboxTablePart;
-	private CheckboxTableViewer choiceViewer;
-	
-	static class Sorter extends PluginSorter {
-
-		public int compare(Viewer viewer, Object e1, Object e2) {
-			if (e1.getClass() == e2.getClass())
-				return super.compare(viewer, e1, e2);
-			else if (e1 instanceof ImportPackageObject)
-				return 1;
-			else
-				return -1;
-		}
-	}
-	
-	class ContentProvider extends DefaultTableProvider {
-		public Object[] getElements(Object parent) {
-			return unused;
-		}
-	}
-
-	public UnusedImportsDialog(
-		Shell parentShell,
-		IPluginModelBase model,
-		Object[] unused) {
-		super(parentShell);
-		this.model = model;
-		this.unused = unused;
-		checkboxTablePart =
-			new WizardCheckboxTablePart(
-				PDEUIMessages.UnusedDependencies_remove); 
-	}
-
-	protected void createButtonsForButtonBar(Composite parent) {
-		createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-		createButton(
-			parent,
-			IDialogConstants.CANCEL_ID,
-			IDialogConstants.CANCEL_LABEL,
-			false);
-	}
-
-	protected Control createDialogArea(Composite parent) {
-		Composite container = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginWidth = layout.marginHeight = 9;
-		container.setLayout(layout);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		container.setLayoutData(gd);
-
-		checkboxTablePart.createControl(container);
-		choiceViewer = checkboxTablePart.getTableViewer();
-		choiceViewer.setContentProvider(new ContentProvider());
-		choiceViewer.setLabelProvider(PDEPlugin.getDefault().getLabelProvider());
-		choiceViewer.setSorter(new Sorter());
-
-		gd = (GridData) checkboxTablePart.getControl().getLayoutData();
-		gd.widthHint = 250;
-		gd.heightHint = 275;
-
-		choiceViewer.setInput(PDEPlugin.getDefault());
-		checkboxTablePart.setSelection(unused);
-		return container;
-	}
-
-	protected void okPressed() {
-		try {
-			ImportPackageHeader pkgHeader = null;
-			Object[] elements = choiceViewer.getCheckedElements();
-			for (int i = 0; i < elements.length; i++) {
-				if (elements[i] instanceof IPluginImport)
-					model.getPluginBase().remove((IPluginImport) elements[i]);
-				else {
-					if (pkgHeader == null) 
-						pkgHeader = (ImportPackageHeader)((ImportPackageObject)elements[i]).getHeader();
-					pkgHeader.removePackage((ImportPackageObject)elements[i]);			
-				}
-			}
-			super.okPressed();
-		} catch (CoreException e) {
-		}
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/javaparticipant/ClassSearchParticipant.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/javaparticipant/ClassSearchParticipant.java
deleted file mode 100644
index af83274..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/javaparticipant/ClassSearchParticipant.java
+++ /dev/null

@@ -1,316 +0,0 @@
-package org.eclipse.pde.internal.ui.search.javaparticipant;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.ui.search.ElementQuerySpecification;
-import org.eclipse.jdt.ui.search.IMatchPresentation;
-import org.eclipse.jdt.ui.search.IQueryParticipant;
-import org.eclipse.jdt.ui.search.ISearchRequestor;
-import org.eclipse.jdt.ui.search.PatternQuerySpecification;
-import org.eclipse.jdt.ui.search.QuerySpecification;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.osgi.util.ManifestElement;
-import org.eclipse.pde.core.plugin.IPluginAttribute;
-import org.eclipse.pde.core.plugin.IPluginElement;
-import org.eclipse.pde.core.plugin.IPluginExtension;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.core.plugin.IPluginObject;
-import org.eclipse.pde.core.plugin.IPluginParent;
-import org.eclipse.pde.internal.core.ICoreConstants;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.ibundle.IBundleModel;
-import org.eclipse.pde.internal.core.ischema.IMetaAttribute;
-import org.eclipse.pde.internal.core.ischema.ISchema;
-import org.eclipse.pde.internal.core.ischema.ISchemaAttribute;
-import org.eclipse.pde.internal.core.ischema.ISchemaElement;
-import org.eclipse.pde.internal.core.schema.SchemaRegistry;
-import org.eclipse.pde.internal.core.util.PatternConstructor;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.model.AbstractEditingModel;
-import org.eclipse.pde.internal.ui.model.bundle.Bundle;
-import org.eclipse.pde.internal.ui.model.bundle.BundleModel;
-import org.eclipse.pde.internal.ui.model.bundle.ManifestHeader;
-import org.eclipse.pde.internal.ui.model.plugin.FragmentModel;
-import org.eclipse.pde.internal.ui.model.plugin.PluginAttribute;
-import org.eclipse.pde.internal.ui.model.plugin.PluginModel;
-import org.eclipse.pde.internal.ui.model.plugin.PluginModelBase;
-import org.eclipse.search.ui.text.Match;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.Constants;
-
-public class ClassSearchParticipant implements IQueryParticipant {
-
-	private static final int S_PLUGIN = 0;
-	private static final int S_FRAGMENT = 1;
-	private static final int S_MANIFEST = 2;
-	private static final int S_TOTAL = 3;
-	private static final String[] SEARCH_FILES = new String[S_TOTAL];
-	static {
-		SEARCH_FILES[S_PLUGIN] = "plugin.xml"; //$NON-NLS-1$
-		SEARCH_FILES[S_FRAGMENT] = "fragment.xml"; //$NON-NLS-1$
-		SEARCH_FILES[S_MANIFEST] = "META-INF/MANIFEST.MF"; //$NON-NLS-1$
-	}
-	private static final int H_IMP = 0;
-	private static final int H_EXP = 1;
-	private static final int H_BUNACT = 2;
-	private static final int H_PLUGCLASS = 3;
-	private static final int H_TOTAL = 4;
-	private static final String[] SEARCH_HEADERS = new String[H_TOTAL];
-	static {
-		SEARCH_HEADERS[H_IMP] = Constants.IMPORT_PACKAGE;
-		SEARCH_HEADERS[H_EXP] = Constants.EXPORT_PACKAGE;
-		SEARCH_HEADERS[H_BUNACT] = Constants.BUNDLE_ACTIVATOR;
-		SEARCH_HEADERS[H_PLUGCLASS] = ICoreConstants.PLUGIN_CLASS;
-	}
-	// the following are from JavaSearchPage (radio button indexes)
-	private static final int S_LIMIT_REF = 2;
-	private static final int S_LIMIT_ALL = 3;
-	private static final int S_FOR_TYPES = 0;
-	private static final int S_FOR_PACKAGES = 2;
-	
-	private ISearchRequestor fSearchRequestor;
-	private Pattern fSearchPattern;
-	private int fSearchFor;
-	
-	public ClassSearchParticipant() {
-	}
-	
-	public void search(ISearchRequestor requestor,
-			QuerySpecification querySpecification, IProgressMonitor monitor)
-			throws CoreException {
-		
-		if (querySpecification.getLimitTo() != S_LIMIT_REF && 
-				querySpecification.getLimitTo() != S_LIMIT_ALL) 
-			return;
-		
-		String search;
-		if (querySpecification instanceof ElementQuerySpecification) {
-			search = ((ElementQuerySpecification)querySpecification).getElement().getElementName();
-			if (((ElementQuerySpecification)querySpecification).getElement().getElementType() == IJavaElement.TYPE)
-				fSearchFor = S_FOR_TYPES;
-		} else {
-			fSearchFor = ((PatternQuerySpecification)querySpecification).getSearchFor();
-			if (fSearchFor != S_FOR_TYPES && fSearchFor != S_FOR_PACKAGES)
-				return;
-			search = ((PatternQuerySpecification)querySpecification).getPattern();
-		}
-		fSearchPattern = PatternConstructor.createPattern(search, true);
-		fSearchRequestor = requestor;
-		
-		IPath[] enclosingPaths = querySpecification.getScope().enclosingProjectsAndJars();
-		IPluginModelBase[] pluginModels = PDECore.getDefault().getModelManager().getWorkspaceModels();
-		monitor.beginTask(PDEUIMessages.ClassSearchParticipant_taskMessage, pluginModels.length);
-		for (int i = 0; i < pluginModels.length; i++) {
-			IProject project = pluginModels[i].getUnderlyingResource().getProject();
-			if (!monitor.isCanceled() && encloses(enclosingPaths, project.getFullPath())) {
-				searchProject(project, monitor);
-			}
-		}
-	}
-	
-	private boolean encloses(IPath[] paths, IPath path) {
-		for (int i = 0; i < paths.length; i++) {
-			if (paths[i].equals(path))
-				return true;
-		}
-		return false;
-	}
-	
-	
-	private void searchProject(IProject project, IProgressMonitor monitor) throws CoreException {
-		for (int i = 0; i < S_TOTAL; i++) {
-			IFile file = project.getFile(SEARCH_FILES[i]);
-			if (!file.exists() 
-//					|| !fQuerySpecification.getScope().encloses(file.getFullPath().toOSString())
-					)
-				continue;
-			ITextFileBufferManager manager = FileBuffers.getTextFileBufferManager();
-			try {
-				manager.connect(file.getFullPath(), monitor);
-				ITextFileBuffer buffer = manager.getTextFileBuffer(file.getFullPath());
-				IDocument document = buffer.getDocument();
-				AbstractEditingModel loadModel = null;
-				switch(i) {
-				case S_PLUGIN:
-					loadModel = new PluginModel(document, false);
-					break;
-				case S_FRAGMENT:
-					loadModel = new FragmentModel(document, false);
-					break;
-				case S_MANIFEST:
-					loadModel = new BundleModel(document, false);
-				}	
-				if (loadModel == null) continue;
-				loadModel.load();
-				if (!loadModel.isLoaded()) continue;
-				
-				if ((i == S_FRAGMENT || i == S_PLUGIN) && loadModel instanceof IPluginModelBase) {
-					loadModel.setUnderlyingResource(file);
-					PluginModelBase modelBase = (PluginModelBase)loadModel;
-					SchemaRegistry registry = PDECore.getDefault().getSchemaRegistry();
-					IPluginExtension[] extensions = modelBase.getPluginBase().getExtensions();
-					for (int j = 0; j < extensions.length; j++) {
-						ISchema schema = registry.getSchema(extensions[j].getPoint());
-						if (schema != null && !monitor.isCanceled())
-							inspectExtension(schema, extensions[j], file);
-					}
-				} else if (i == S_MANIFEST && loadModel instanceof IBundleModel) {
-					loadModel.setUnderlyingResource(file);
-					Bundle bundle = (Bundle)((IBundleModel)loadModel).getBundle();
-					if (bundle != null)
-						inspectBundle(bundle, file);
-				}
-			} finally {
-				manager.disconnect(file.getFullPath(), monitor);
-			}
-		}
-	}
-
-	private void inspectExtension(ISchema schema, IPluginParent parent, IFile file) {
-		IPluginObject[] children = parent.getChildren();
-		for (int i = 0; i < children.length; i++) {
-			IPluginElement child = (IPluginElement)children[i];
-			ISchemaElement schemaElement = schema.findElement(child.getName());
-			if (schemaElement != null) {
-				IPluginAttribute[] attributes = child.getAttributes();
-				for (int j = 0; j < attributes.length; j++) {
-					IPluginAttribute attr = attributes[j];
-					ISchemaAttribute attInfo = schemaElement.getAttribute(attr.getName());
-					if (attInfo != null 
-							&& attInfo.getKind() == IMetaAttribute.JAVA
-							&& attr instanceof PluginAttribute) {
-						String value = null;
-						Matcher matcher = null;
-						if (fSearchFor == S_FOR_TYPES) {
-							value = attr.getValue();
-							matcher = getMatcher(value);
-						}
-						if (value == null || (matcher != null && !matcher.matches()) ){
-							value = getProperValue(attr.getValue());
-							matcher = getMatcher(value);
-						}
-						if (matcher.matches()) {
-							String group = matcher.group(0);
-							int offset = ((PluginAttribute)attr).getValueOffset() + value.indexOf(group) + attr.getValue().indexOf(value);
-							int length = group.length();
-							fSearchRequestor.reportMatch(new Match(file, Match.UNIT_CHARACTER, offset, length));
-						}
-					}
-				}
-			}
-			inspectExtension(schema, child, file);
-		}
-	}
-
-	private void inspectBundle(Bundle bundle, IFile file) {
-		for (int i = 0; i < H_TOTAL; i++) {
-			if (fSearchFor == S_FOR_TYPES && (i == H_IMP || i == H_EXP))
-				continue;
-			ManifestHeader header = bundle.getManifestHeader(SEARCH_HEADERS[i]);
-			if (header != null) {
-				try {
-					ManifestElement[] elements = ManifestElement.parseHeader(header.getName(), header.getValue());
-					if (elements == null) continue;
-					int initOff = 0;
-					for (int j = 0; j < elements.length; j++) {
-						String value = null;
-						Matcher matcher = null;
-						if (fSearchFor == S_FOR_TYPES) {
-							value = elements[j].getValue();
-							matcher = getMatcher(value);
-						} 
-						if (value == null || (matcher != null && !matcher.matches()) ){
-							value = getProperValue(elements[j].getValue());
-							matcher = getMatcher(value);
-						} 
-						if (matcher.matches()) {
-							String group = matcher.group(0);
-							int[] offlen;
-							try {
-								offlen = getOffsetOfElement(header, group, initOff);
-								initOff = offlen[0] - header.getOffset();
-							} catch (CoreException e) {
-								offlen = new int[]{header.getOffset(), header.getLength()};
-							}
-							fSearchRequestor.reportMatch(new Match(file, Match.UNIT_CHARACTER, offlen[0], offlen[1]));
-						}
-					}
-				} catch (BundleException e) {
-				}
-			}
-		}
-	}
-	
-	private Matcher getMatcher(String value) {
-		return fSearchPattern.matcher(value.subSequence(0, value.length()));
-	}
-	
-	private int[] getOffsetOfElement(ManifestHeader header, String value, int initOff) throws CoreException {
-		int offset = 0;
-		int length = 0;
-		IResource res = header.getModel().getUnderlyingResource();
-		if (res instanceof IFile) {
-			IFile file = (IFile)res;
-			IProgressMonitor monitor = new NullProgressMonitor();
-			ITextFileBufferManager pManager = FileBuffers.getTextFileBufferManager();
-			try {
-				pManager.connect(file.getFullPath(), monitor);
-				ITextFileBuffer pBuffer = pManager.getTextFileBuffer(file.getFullPath());
-				IDocument pDoc = pBuffer.getDocument();
-				int headerOffset = header.getOffset() + header.getName().length();
-				String headerString = pDoc.get(headerOffset, header.getLength() - header.getName().length());
-				int internalOffset = headerString.indexOf(value, initOff);
-				if (internalOffset != -1) {
-					offset = headerOffset + internalOffset;
-				} else {
-					offset = headerOffset + header.getName().length() + header.getValue().indexOf(value);
-				}
-				length = value.length();
-			} catch (MalformedTreeException e) {
-			} catch (BadLocationException e) {
-			} finally {
-				pManager.disconnect(file.getFullPath(), monitor);
-			}
-		}
-		return new int[]{offset, length};
-	}
-	
-	private String getProperValue(String value) {
-		return fSearchFor == S_FOR_TYPES ? extractType(value) : extractPackage(value);
-	}
-	private String extractType(String value) {
-		int index = value.lastIndexOf("."); //$NON-NLS-1$
-		if (index == -1 || index == value.length() - 1) return value;
-		return value.substring(index + 1);
-	}
-	private String extractPackage(String value) {
-		int index = value.lastIndexOf("."); //$NON-NLS-1$
-		if (index == -1 || index == value.length() - 1) return value;
-		char afterPeriod = value.charAt(index + 1);
-		if (afterPeriod >= 'A' && afterPeriod <= 'Z')
-			return value.substring(0, index);
-		return value;
-	}
-	
-	public int estimateTicks(QuerySpecification specification) {
-		return 100;
-	}
-
-	public IMatchPresentation getUIParticipant() {
-		return null;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/AbstractOverlayIcon.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/AbstractOverlayIcon.java
deleted file mode 100644
index e3d09c9..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/AbstractOverlayIcon.java
+++ /dev/null

@@ -1,118 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.util;
-
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.Point;
-
-import org.eclipse.jface.resource.CompositeImageDescriptor;
-import org.eclipse.jface.resource.ImageDescriptor;
-
-/**
- * An OverlayIcon consists of a main icon and several adornments.
- */
-public abstract class AbstractOverlayIcon extends CompositeImageDescriptor {
-
-	static final int DEFAULT_WIDTH = 16;
-	static final int DEFAULT_HEIGHT = 16;
-
-	private Point fSize = null;
-
-	private ImageDescriptor fOverlays[][];
-
-	public AbstractOverlayIcon(ImageDescriptor[][] overlays) {
-		this(overlays, null);
-	}
-
-	public AbstractOverlayIcon(ImageDescriptor[][] overlays, Point size) {
-		fOverlays = overlays;
-		if (size != null)
-			fSize = size;
-		else
-			fSize = new Point(DEFAULT_WIDTH, DEFAULT_HEIGHT);
-	}
-	protected void drawBottomLeft(ImageDescriptor[] overlays) {
-		if (overlays == null)
-			return;
-		int length = overlays.length;
-		int x = 0;
-		for (int i = 0; i < 3; i++) {
-			if (i < length && overlays[i] != null) {
-				ImageData id = overlays[i].getImageData();
-				drawImage(id, x, getSize().y - id.height);
-				x += id.width;
-			}
-		}
-	}
-	protected void drawBottomRight(ImageDescriptor[] overlays) {
-		if (overlays == null)
-			return;
-		int length = overlays.length;
-		int x = getSize().x;
-		for (int i = 2; i >= 0; i--) {
-			if (i < length && overlays[i] != null) {
-				ImageData id = overlays[i].getImageData();
-				x -= id.width;
-				drawImage(id, x, getSize().y - id.height);
-			}
-		}
-	}
-
-	protected abstract ImageData getBaseImageData();
-
-	protected void drawCompositeImage(int width, int height) {
-		ImageData base = getBaseImageData();
-		drawImage(base, 0, 0);
-		if (fOverlays != null) {
-			if (fOverlays.length > 0)
-				drawTopRight(fOverlays[0]);
-
-			if (fOverlays.length > 1)
-				drawBottomRight(fOverlays[1]);
-
-			if (fOverlays.length > 2)
-				drawBottomLeft(fOverlays[2]);
-
-			if (fOverlays.length > 3)
-				drawTopLeft(fOverlays[3]);
-		}
-	}
-	protected void drawTopLeft(ImageDescriptor[] overlays) {
-		if (overlays == null)
-			return;
-		int length = overlays.length;
-		int x = 0;
-		for (int i = 0; i < 3; i++) {
-			if (i < length && overlays[i] != null) {
-				ImageData id = overlays[i].getImageData();
-				drawImage(id, x, 0);
-				x += id.width;
-			}
-		}
-	}
-	protected void drawTopRight(ImageDescriptor[] overlays) {
-		if (overlays == null)
-			return;
-		int length = overlays.length;
-		int x = getSize().x;
-		for (int i = 2; i >= 0; i--) {
-			if (i < length && overlays[i] != null) {
-				ImageData id = overlays[i].getImageData();
-				x -= id.width;
-				drawImage(id, x, 0);
-			}
-		}
-	}
-
-	protected Point getSize() {
-		return fSize;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/ChoicePropertyDescriptor.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/ChoicePropertyDescriptor.java
deleted file mode 100644
index 7457ef5..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/ChoicePropertyDescriptor.java
+++ /dev/null

@@ -1,51 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.util;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.ui.views.properties.PropertyDescriptor;
-
-public class ChoicePropertyDescriptor extends PropertyDescriptor {
-
-	/**
-	 * The list of possible values to display in the combo box
-	 */
-	private String[] values;
-/**
- * Creates an property descriptor with the given id, display name, and list
- * of value labels to display in the combo box cell editor.
- * 
- * @param id the id of the property
- * @param displayName the name to display for the property
- * @param valuesArray the list of possible values to display in the combo box
- */
-public ChoicePropertyDescriptor(Object id, String displayName, String[] valuesArray) {
-	super(id, displayName);
-	values = valuesArray;
-}
-/**
- * The <code>ComboBoxPropertyDescriptor</code> implementation of this 
- * <code>IPropertyDescriptor</code> method creates and returns a new
- * <code>ComboBoxCellEditor</code>.
- * <p>
- * The editor is configured with the current validator if there is one.
- * </p>
- */
-public CellEditor createPropertyEditor(Composite parent) {
-	CellEditor editor = new ComboBoxCellEditor(parent, values, SWT.READ_ONLY);
-	if (getValidator() != null)
-		editor.setValidator(getValidator());
-	return editor;
-}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/FileExtensionFilter.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/FileExtensionFilter.java
deleted file mode 100644
index f305549..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/FileExtensionFilter.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.util;
-
-import java.util.Locale;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-
-public class FileExtensionFilter extends ViewerFilter {
-
-	private String fTargetExtension;
-
-	public FileExtensionFilter(String targetExtension) {
-		fTargetExtension = targetExtension;
-	}
-
-	public boolean select(Viewer viewer, Object parent, Object element) {
-		if (element instanceof IFile) {
-			return ((IFile)element).getName().toLowerCase(Locale.ENGLISH).endsWith("." + fTargetExtension); //$NON-NLS-1$
-		}
-
-		if (element instanceof IProject && !((IProject)element).isOpen())
-			return false;
-		
-		if (element instanceof IContainer){ // i.e. IProject, IFolder
-			try {
-				IResource[] resources = ((IContainer)element).members();
-				for (int i = 0; i < resources.length; i++){
-					if (select(viewer, parent, resources[i]))
-						return true;
-				}
-			} catch (CoreException e) {
-			}
-		}
-		return false;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/FileNameFilter.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/FileNameFilter.java
deleted file mode 100644
index bfaefc4..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/FileNameFilter.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.util;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-
-public class FileNameFilter extends ViewerFilter {
-
-	private String fTargetName;
-
-	public FileNameFilter(String targetName) {
-		fTargetName = targetName;
-	}
-
-	public boolean select(Viewer viewer, Object parent, Object element) {
-		if (element instanceof IFile) {
-			return fTargetName.equals(((IFile)element).getName());
-		}
-
-		if (element instanceof IProject && !((IProject)element).isOpen())
-			return false;
-		
-		if (element instanceof IContainer){ // i.e. IProject, IFolder
-			try {
-				IResource[] resources = ((IContainer)element).members();
-				for (int i = 0; i < resources.length; i++){
-					if (select(viewer, parent, resources[i]))
-						return true;
-				}
-			} catch (CoreException e) {
-			}
-		}
-		return false;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/FileValidator.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/FileValidator.java
deleted file mode 100644
index c00192c..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/FileValidator.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.util;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.ui.dialogs.*;
-
-public class FileValidator implements ISelectionStatusValidator {
-
-	public IStatus validate(Object[] selection) {
-		if (selection.length > 0 && selection[0] instanceof IFile) {
-			return new Status(
-				IStatus.OK,
-				PDEPlugin.getPluginId(),
-				IStatus.OK,
-				"", //$NON-NLS-1$
-				null);
-		}
-		return new Status(
-			IStatus.ERROR,
-			PDEPlugin.getPluginId(),
-			IStatus.ERROR,
-			"", //$NON-NLS-1$
-			null);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/ImageOverlayIcon.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/ImageOverlayIcon.java
deleted file mode 100644
index 77d5535..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/ImageOverlayIcon.java
+++ /dev/null

@@ -1,36 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.util;
-
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.jface.resource.ImageDescriptor;
-
-/**
- * An OverlayIcon consists of a main icon and several adornments.
- */
-public class ImageOverlayIcon extends AbstractOverlayIcon {
-	private Image base;
-
-	public ImageOverlayIcon(Image base, ImageDescriptor[][] overlays) {
-		this(base, overlays, null);
-	}
-	
-	public ImageOverlayIcon(Image base, ImageDescriptor[][] overlays, Point size) {
-		super(overlays, size);
-		this.base = base;
-	}
-	
-	protected ImageData getBaseImageData() {
-		return base.getImageData();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/OverlayIcon.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/OverlayIcon.java
deleted file mode 100644
index bf88508..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/OverlayIcon.java
+++ /dev/null

@@ -1,38 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.util;
-
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.Point;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-
-/**
- * An OverlayIcon consists of a main icon and several adornments.
- */
-public class OverlayIcon extends AbstractOverlayIcon {
-	private ImageDescriptor fBase;
-
-	public OverlayIcon(ImageDescriptor base, ImageDescriptor[][] overlays) {
-		this(base, overlays, null);
-	}
-	
-	public OverlayIcon(ImageDescriptor base, ImageDescriptor[][] overlays, Point size) {
-		super(overlays, size);
-		fBase= base;
-		if (fBase == null)
-			fBase= ImageDescriptor.getMissingImageDescriptor();
-	}
-	
-	protected ImageData getBaseImageData() {
-		return fBase.getImageData();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/PersistablePluginObject.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/PersistablePluginObject.java
deleted file mode 100644
index e1ea678..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/PersistablePluginObject.java
+++ /dev/null

@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.util;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.ui.IContainmentAdapter;
-import org.eclipse.ui.IElementFactory;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.IPersistableElement;
-
-
-public class PersistablePluginObject extends PlatformObject implements
-		IPersistableElement, IElementFactory {
-	
-	public static final String FACTORY_ID = "org.eclipse.pde.ui.elementFactory"; //$NON-NLS-1$	
-	public static final String KEY = "org.eclipse.pde.workingSetKey"; //$NON-NLS-1$
-	private static PluginContainmentAdapter fgContainmentAdapter;
-	
-	private String fPluginID;
-
-	public PersistablePluginObject() {
-	}
-	
-	public PersistablePluginObject(String pluginID) {
-		fPluginID = pluginID;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IPersistableElement#getFactoryId()
-	 */
-	public String getFactoryId() {
-		return FACTORY_ID;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IPersistableElement#saveState(org.eclipse.ui.IMemento)
-	 */
-	public void saveState(IMemento memento) {
-		memento.putString(KEY, fPluginID);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IElementFactory#createElement(org.eclipse.ui.IMemento)
-	 */
-	public IAdaptable createElement(IMemento memento) {
-		return new PersistablePluginObject(memento.getString(KEY));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.PlatformObject#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		if (adapter.equals(IPersistableElement.class))
-			return this;
-		if (adapter.equals(IResource.class))
-			return getResource();
-		if (adapter.equals(IContainmentAdapter.class))
-			return getPluginContainmentAdapter();
-		return super.getAdapter(adapter);
-	}
-	
-	public IResource getResource() {
-		IPluginModelBase model = PDECore.getDefault().getModelManager().findModel(fPluginID);
-		IResource resource = (model != null) ? model.getUnderlyingResource() : null;
-		return resource == null ? null : resource.getProject();
-	}
-	
-	public String getPluginID() {
-		return fPluginID;
-	}
-	
-	private static IContainmentAdapter getPluginContainmentAdapter() {
-		if (fgContainmentAdapter == null)
-			fgContainmentAdapter = new PluginContainmentAdapter();
-		return fgContainmentAdapter;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/PixelConverter.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/PixelConverter.java
deleted file mode 100644
index 047d9bc..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/PixelConverter.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.util;
-/**
- * @version 	1.0
- * @author
- */
-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 = new GC(control);
-		gc.setFont(control.getFont());
-		fFontMetrics= gc.getFontMetrics();
-		gc.dispose();
-	}
-	
-		
-	/**
-	 * @see DialogPage#convertHeightInCharsToPixels
-	 */
-	public int convertHeightInCharsToPixels(int chars) {
-		return Dialog.convertHeightInCharsToPixels(fFontMetrics, chars);
-	}
-
-	/**
-	 * @see DialogPage#convertHorizontalDLUsToPixels
-	 */
-	public int convertHorizontalDLUsToPixels(int dlus) {
-		return Dialog.convertHorizontalDLUsToPixels(fFontMetrics, dlus);
-	}
-
-	/**
-	 * @see DialogPage#convertVerticalDLUsToPixels
-	 */
-	public int convertVerticalDLUsToPixels(int dlus) {
-		return Dialog.convertVerticalDLUsToPixels(fFontMetrics, dlus);
-	}
-	
-	/**
-	 * @see DialogPage#convertWidthInCharsToPixels
-	 */
-	public int convertWidthInCharsToPixels(int chars) {
-		return Dialog.convertWidthInCharsToPixels(fFontMetrics, chars);
-	}	
-
-}
-

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/PluginContainmentAdapter.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/PluginContainmentAdapter.java
deleted file mode 100644
index 5075789..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/PluginContainmentAdapter.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.util;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.ui.IContainmentAdapter;
-
-public class PluginContainmentAdapter implements IContainmentAdapter {
-
-	public PluginContainmentAdapter() {
-		super();
-	}
-
-	public boolean contains(Object containmentContext, Object element, int flags) {
-		if (!(containmentContext instanceof PersistablePluginObject) || element == null)
-			return false;
-		
-		IResource resource = ((PersistablePluginObject)containmentContext).getResource();
-		return element.equals(resource);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/PluginWorkingSet.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/PluginWorkingSet.java
deleted file mode 100644
index 9ff5e81..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/PluginWorkingSet.java
+++ /dev/null

@@ -1,268 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.util;
-
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.elements.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.dialogs.*;
-
-
-public class PluginWorkingSet extends WizardPage implements IWorkingSetPage {
-	
-	class ContentProvider extends DefaultContentProvider implements IStructuredContentProvider {
-		public Object[] getElements(Object inputElement) {
-			return PDECore.getDefault().getModelManager().getAllPlugins();
-		}	
-	}
-	
-	class WorkingSetLabelProvider extends LabelProvider {
-		
-		Preferences pref = PDEPlugin.getDefault().getPluginPreferences();
-		
-		public WorkingSetLabelProvider() {
-			PDEPlugin.getDefault().getLabelProvider().connect(this);
-		}
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)
-		 */
-		public String getText(Object element) {
-			if (element instanceof IPluginModelBase) {
-				IPluginBase plugin = ((IPluginModelBase)element).getPluginBase();
-				String showType = pref.getString(IPreferenceConstants.PROP_SHOW_OBJECTS);
-				if (showType.equals(IPreferenceConstants.VALUE_USE_IDS))
-					return plugin.getId();
-				return plugin.getTranslatedName();
-			}
-			return super.getText(element);
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object)
-		 */
-		public Image getImage(Object element) {
-			return PDEPlugin.getDefault().getLabelProvider().getImage(element);
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.LabelProvider#dispose()
-		 */
-		public void dispose() {
-			super.dispose();
-			PDEPlugin.getDefault().getLabelProvider().disconnect(this);
-		}
-		
-	}
-
-	private IWorkingSet fWorkingSet;
-	private Text fWorkingSetName;
-	private CheckboxTableViewer fTable;
-	private boolean fFirstCheck;
-
-	public PluginWorkingSet() {
-		super("page1", PDEUIMessages.PluginWorkingSet_title, PDEPluginImages.DESC_DEFCON_WIZ); //$NON-NLS-1$ 
-		PDEPlugin.getDefault().getLabelProvider().connect(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.dialogs.IWorkingSetPage#finish()
-	 */
-	public void finish() {
-		Object[] checked = fTable.getCheckedElements();
-		ArrayList list = new ArrayList();
-		for (int i = 0; i < checked.length; i++) {
-			String id = ((IPluginModelBase)checked[i]).getPluginBase().getId();
-			if (id != null && id.length() > 0)
-				list.add(new PersistablePluginObject(id));
-		}
-		PersistablePluginObject[] objects = (PersistablePluginObject[])list.toArray(new PersistablePluginObject[list.size()]);
-		
-		String workingSetName = fWorkingSetName.getText().trim();
-		if (fWorkingSet == null) {
-			IWorkingSetManager workingSetManager = PlatformUI.getWorkbench().getWorkingSetManager();
-			fWorkingSet= workingSetManager.createWorkingSet(workingSetName, objects);
-		} else {
-			fWorkingSet.setName(workingSetName);
-			fWorkingSet.setElements(objects);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.dialogs.IWorkingSetPage#getSelection()
-	 */
-	public IWorkingSet getSelection() {
-		return fWorkingSet;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.dialogs.IWorkingSetPage#setSelection(org.eclipse.ui.IWorkingSet)
-	 */
-	public void setSelection(IWorkingSet workingSet) {
-		fWorkingSet = workingSet;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite composite= new Composite(parent, SWT.NONE);
-		composite.setLayout(new GridLayout());
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		setControl(composite);
-
-		Label label= new Label(composite, SWT.WRAP);
-		label.setText(PDEUIMessages.PluginWorkingSet_setName); 
-		label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		fWorkingSetName= new Text(composite, SWT.SINGLE | SWT.BORDER);
-		fWorkingSetName.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fWorkingSetName.addModifyListener(
-			new ModifyListener() {
-				public void modifyText(ModifyEvent e) {
-					validatePage();
-				}
-			}
-		);
-		fWorkingSetName.setFocus();
-		
-		label= new Label(composite, SWT.WRAP);
-		label.setText(PDEUIMessages.PluginWorkingSet_setContent); 
-		label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		fTable= CheckboxTableViewer.newCheckList(composite, SWT.BORDER);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.heightHint = 250;
-		fTable.getControl().setLayoutData(gd);
-		final IStructuredContentProvider fTableContentProvider = new ContentProvider(); 
-		fTable.setContentProvider(fTableContentProvider);
-		fTable.setLabelProvider(new WorkingSetLabelProvider());
-		fTable.setUseHashlookup(true);
-		fTable.setInput(PDECore.getDefault().getModelManager());
-
-		fTable.addCheckStateListener(new ICheckStateListener() {
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				validatePage();
-			}
-		});
-
-		// Add select / deselect all buttons for bug 46669
-		Composite buttonComposite = new Composite(composite, SWT.NONE);
-		buttonComposite.setLayout(new GridLayout(2, true));
-		buttonComposite.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-		
-		Button selectAllButton = new Button(buttonComposite, SWT.PUSH);
-		selectAllButton.setText(PDEUIMessages.PluginWorkingSet_selectAll_label);
-		selectAllButton.setToolTipText(PDEUIMessages.PluginWorkingSet_selectAll_toolTip);
-		selectAllButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent selectionEvent) {
-				fTable.setCheckedElements(fTableContentProvider.getElements(fTable.getInput()));
-				validatePage();
-			}
-		});
-		selectAllButton.setLayoutData(new GridData());
-		SWTUtil.setButtonDimensionHint(selectAllButton);
-
-		Button deselectAllButton = new Button(buttonComposite, SWT.PUSH);
-		deselectAllButton.setText(PDEUIMessages.PluginWorkingSet_deselectAll_label);
-		deselectAllButton.setToolTipText(PDEUIMessages.PluginWorkingSet_deselectAll_toolTip);
-		deselectAllButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent selectionEvent) {
-				fTable.setCheckedElements(new Object[0]);
-				validatePage();
-			}
-		});
-		deselectAllButton.setLayoutData(new GridData());
-		SWTUtil.setButtonDimensionHint(deselectAllButton);
-		setPageComplete(false);
-		setMessage(PDEUIMessages.PluginWorkingSet_message);
-		
-		initialize();
-		Dialog.applyDialogFont(composite);
-		
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.PLUGIN_WORKING_SET);
-	}
-	
-	/**
-	 * 
-	 */
-	private void initialize() {
-		if (fWorkingSet != null) {
-			HashSet set = new HashSet();
-			IAdaptable[] elements = fWorkingSet.getElements();
-			for (int i = 0; i < elements.length; i++) {
-				set.add(((PersistablePluginObject)elements[i]).getPluginID());
-			}
-			for (int i = 0; i < fTable.getTable().getItemCount(); i++) {
-				IPluginModelBase model = (IPluginModelBase)fTable.getElementAt(i);
-				String id = model.getPluginBase().getId();
-				if (id == null)
-					continue;
-				if (set.contains(id)) {
-					fTable.setChecked(model, true);
-					set.remove(id);
-				}
-				if (set.isEmpty())
-					break;
-			}
-			fWorkingSetName.setText(fWorkingSet.getName());
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.IDialogPage#dispose()
-	 */
-	public void dispose() {
-		PDEPlugin.getDefault().getLabelProvider().disconnect(this);
-	}
-	
-	private void validatePage() {
-		String errorMessage= null; 
-		String newText= fWorkingSetName.getText();
-
-		if (newText.trim().length() == 0) { 
-			errorMessage = PDEUIMessages.PluginWorkingSet_emptyName; 
-			if (fFirstCheck) {
-				setPageComplete(false);
-				fFirstCheck= false;
-				return;
-			}
-		}
-		if (errorMessage == null && fTable.getCheckedElements().length == 0) {
-			errorMessage = PDEUIMessages.PluginWorkingSet_noPluginsChecked; 
-		}
-		
-		if (errorMessage == null && fWorkingSet == null) {
-			IWorkingSet[] workingSets = PlatformUI.getWorkbench().getWorkingSetManager().getWorkingSets();
-			for (int i = 0; i < workingSets.length; i++) {
-				if (newText.equals(workingSets[i].getName())) {
-					errorMessage = PDEUIMessages.PluginWorkingSet_nameInUse; 
-					break;
-				}
-			}
-		}
-		setErrorMessage(errorMessage);
-		setPageComplete(errorMessage == null);		
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/SWTUtil.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/SWTUtil.java
deleted file mode 100644
index 57cd268..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/SWTUtil.java
+++ /dev/null

@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.util;
-/**
- * @version 	1.0
- * @author
- */
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.DragSource;
-import org.eclipse.swt.dnd.DropTarget;
-import org.eclipse.swt.graphics.Point;
-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.Dialog;
-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. 
- */
-public class 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) {
-		if (button.getFont().equals(JFaceResources.getDefaultFont()))
-			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);
-	}
-
-	/**
-	 * 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	the button for which to set the dimension hint
-	 */
-	public static void setButtonDimensionHint(Button button) {
-		Dialog.applyDialogFont(button);
-		Assert.isNotNull(button);
-		Object gd = button.getLayoutData();
-		if (gd instanceof GridData) {
-			((GridData) gd).widthHint = getButtonWidthHint(button);
-		}
-	}
-
-	public static void setDialogSize(Dialog dialog, int width, int height) {
-		Point computedSize =
-			dialog.getShell().computeSize(SWT.DEFAULT, SWT.DEFAULT);
-		width = Math.max(computedSize.x, width);
-		height = Math.max(computedSize.y, height);
-		dialog.getShell().setSize(width, height);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/SharedLabelProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/SharedLabelProvider.java
deleted file mode 100644
index b78056d..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/util/SharedLabelProvider.java
+++ /dev/null

@@ -1,231 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.util;
-
-import java.io.*;
-import java.util.*;
-import java.util.zip.*;
-
-import org.eclipse.jface.resource.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.ui.plugin.*;
-
-public class SharedLabelProvider
-	extends LabelProvider
-	implements ITableLabelProvider {
-	public static final int F_ERROR = 1;
-	public static final int F_WARNING = 2;
-	public static final int F_EXPORT = 4;
-	public static final int F_EDIT = 8;
-	public static final int F_BINARY = 16;
-	public static final int F_EXTERNAL = 32;
-	public static final int F_JAVA = 64;
-	public static final int F_JAR = 128;
-	public static final int F_PROJECT = 256;
-	Hashtable images = new Hashtable();
-	ArrayList consumers = new ArrayList();
-	private Image fBlankImage;
-
-	public SharedLabelProvider() {
-
-	}
-	public void connect(Object consumer) {
-		if (!consumers.contains(consumer))
-			consumers.add(consumer);
-	}
-	public void disconnect(Object consumer) {
-		consumers.remove(consumer);
-		if (consumers.size() == 0) {
-			dispose();
-		}
-	}
-	public void dispose() {
-		if (consumers.size() == 0) {
-			for (Enumeration elements = images.elements(); elements.hasMoreElements();) {
-				((Image)elements.nextElement()).dispose();
-			}
-			images.clear();
-			if (fBlankImage != null) {
-				fBlankImage.dispose();
-				fBlankImage = null;
-			}
-		}
-	}
-	
-	public Image get(ImageDescriptor desc) {
-		return get(desc, 0);
-	}
-
-	public Image get(ImageDescriptor desc, int flags) {
-		Object key = desc;
-
-		if (flags != 0) {
-			key = getKey(desc.hashCode(), flags);
-		}
-		Image image = (Image) images.get(key);
-		if (image == null) {
-			image = createImage(desc, flags);
-			images.put(key, image);
-		}
-		return image;
-	}
-	
-	public Image get(Image image, int flags) {
-		if (flags==0) return image;
-		String key = getKey(image.hashCode(), flags);
-		Image resultImage = (Image)images.get(key);
-		if (resultImage == null) {
-			resultImage = createImage(image, flags);
-			images.put(key, resultImage);
-		}
-		return resultImage;
-	}
-
-	private String getKey(long hashCode, int flags) {
-		return (""+hashCode) + ":"+flags; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	private Image createImage(ImageDescriptor baseDesc, int flags) {
-		if (flags == 0) {
-			return baseDesc.createImage();
-		}
-		ImageDescriptor[] lowerLeft = getLowerLeftOverlays(flags);
-		ImageDescriptor[] upperRight = getUpperRightOverlays(flags);
-		ImageDescriptor[] lowerRight = getLowerRightOverlays(flags);
-		ImageDescriptor[] upperLeft = getUpperLeftOverlays(flags);
-		OverlayIcon compDesc =
-			new OverlayIcon(
-				baseDesc,
-				new ImageDescriptor[][] { upperRight, lowerRight, lowerLeft, upperLeft });
-		return compDesc.createImage();
-	}
-	
-	private Image createImage(Image baseImage, int flags) {
-		if (flags == 0) {
-			return baseImage;
-		}
-		ImageDescriptor[] lowerLeft = getLowerLeftOverlays(flags);
-		ImageDescriptor[] upperRight = getUpperRightOverlays(flags);
-		ImageDescriptor[] lowerRight = getLowerRightOverlays(flags);
-		ImageDescriptor[] upperLeft = getUpperLeftOverlays(flags);
-		ImageOverlayIcon compDesc =
-			new ImageOverlayIcon(
-				baseImage,
-				new ImageDescriptor[][] { upperRight, lowerRight, lowerLeft, upperLeft });
-		return compDesc.createImage();
-	}
-
-	private ImageDescriptor[] getLowerLeftOverlays(int flags) {
-		if ((flags & F_ERROR) != 0)
-			return new ImageDescriptor[] { PDEPluginImages.DESC_ERROR_CO };
-		if ((flags & F_WARNING) != 0)
-			return new ImageDescriptor[] { PDEPluginImages.DESC_WARNING_CO };
-		return null;
-	}
-
-	private ImageDescriptor[] getUpperRightOverlays(int flags) {
-		if ((flags & F_EXPORT) != 0)
-			return new ImageDescriptor[] { PDEPluginImages.DESC_EXPORT_CO };
-		if ((flags & F_EDIT) != 0)
-			return new ImageDescriptor[] { PDEPluginImages.DESC_DOC_CO };
-		if ((flags & F_JAVA) != 0)
-			return new ImageDescriptor[] { PDEPluginImages.DESC_JAVA_CO };
-		return null;
-	}
-	
-	private ImageDescriptor[] getLowerRightOverlays(int flags) {
-		if ((flags & F_JAR) != 0)
-			return new ImageDescriptor[] { PDEPluginImages.DESC_JAR_CO };
-		if ((flags & F_PROJECT) != 0)
-			return new ImageDescriptor[] { PDEPluginImages.DESC_PROJECT_CO };
-		return null;
-	}
-	
-	private ImageDescriptor[] getUpperLeftOverlays(int flags) {
-		if ((flags & F_EXTERNAL) != 0)
-			return new ImageDescriptor[] { PDEPluginImages.DESC_EXTERNAL_CO };
-		if ((flags & F_BINARY) != 0)
-			return new ImageDescriptor[] { PDEPluginImages.DESC_BINARY_CO };
-		return null;
-	}
-
-	public String getColumnText(Object obj, int index) {
-		return getText(obj);
-	}
-	public Image getColumnImage(Object obj, int index) {
-		return getImage(obj);
-	}
-
-	public Image getImageFromPlugin(String bundleID, String path) {
-		ImageDescriptor desc = AbstractUIPlugin.imageDescriptorFromPlugin(bundleID, path);	
-		return (desc != null) ? get(desc) : getBlankImage();
-	}
-	
-
-	public Image getImageFromPlugin(IPluginModelBase model, String relativePath) {
-		String location = model.getInstallLocation();
-		if (location == null)
-			return null;
-		
-		File pluginLocation = new File(location);
-		InputStream stream = null;
-		ZipFile jarFile = null;
-		try {
-			if (pluginLocation.isDirectory()) {
-				File file = new File(pluginLocation, relativePath);
-				if (file.exists()) 
-					stream = new FileInputStream(file);
-				else if (relativePath.length() > 5
-						&& relativePath.startsWith("$nl$/")) { //$NON-NLS-1$
-					file = new File(pluginLocation, relativePath.substring(5));
-					if (file.exists())
-						stream = new FileInputStream(file);
-				}
-			} else {
-					jarFile = new ZipFile(pluginLocation, ZipFile.OPEN_READ);
-					ZipEntry manifestEntry = jarFile.getEntry(relativePath);
-					if (manifestEntry != null) {
-						stream = jarFile.getInputStream(manifestEntry);
-					} else if (relativePath.length() > 5
-						&& relativePath.startsWith("$nl$/")) { //$NON-NLS-1$
-					manifestEntry = jarFile.getEntry(relativePath.substring(5));
-					if (manifestEntry != null) {
-						stream = jarFile.getInputStream(manifestEntry);
-					}
-				}
-			}
-			if (stream != null) {
-				ImageDescriptor desc = ImageDescriptor.createFromImageData(new ImageData(stream));
-				return get(desc);
-			}
-		} catch (FileNotFoundException e) {
-		} catch (IOException e) {
-		} finally {
-			try {
-				if (stream != null) 
-					stream.close();
-				if (jarFile != null)
-					jarFile.close();
-			} catch (IOException e) {
-			}
-		}
-		return getBlankImage();
-	}
-
-	public Image getBlankImage() {
-		if (fBlankImage == null)
-			fBlankImage = ImageDescriptor.getMissingImageDescriptor().createImage();
-		return fBlankImage;			
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/CalleesContentProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/CalleesContentProvider.java
deleted file mode 100644
index 05a34a6..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/CalleesContentProvider.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.view;
-
-import org.eclipse.pde.core.plugin.IFragment;
-import org.eclipse.pde.core.plugin.IPlugin;
-import org.eclipse.pde.core.plugin.IPluginBase;
-import org.eclipse.pde.core.plugin.IPluginImport;
-import org.eclipse.pde.internal.core.PDECore;
-
-public class CalleesContentProvider extends DependenciesViewPageContentProvider {
-	public CalleesContentProvider(DependenciesView view) {
-		super(view);
-	}
-
-	/**
-	 * @param plugin
-	 * @return
-	 */
-	protected Object[] findCallees(IPluginBase plugin) {
-		if (plugin instanceof IFragment) {
-			String hostId = ((IFragment) plugin).getPluginId();
-			IPlugin hostPlugin = PDECore.getDefault().findPlugin(hostId);
-			if (hostPlugin != null) {
-				IPluginImport[] imports = plugin.getImports();
-				Object[] result = new Object[imports.length + 1];
-				System.arraycopy(imports, 0, result, 0, imports.length);
-				result[imports.length] = hostPlugin;
-				return result;
-			}
-		}
-		return plugin.getImports();
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/CalleesListContentProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/CalleesListContentProvider.java
deleted file mode 100644
index 0768d30..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/CalleesListContentProvider.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.view;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.pde.core.plugin.IPlugin;
-import org.eclipse.pde.core.plugin.IPluginBase;
-import org.eclipse.pde.core.plugin.IPluginImport;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.PDECore;
-
-public class CalleesListContentProvider extends CalleesContentProvider
-		implements IStructuredContentProvider {
-
-	public CalleesListContentProvider(DependenciesView view) {
-		super(view);
-	}
-
-	/**
-	 * @see IStructuredContentProvider#getElements(Object)
-	 */
-	public Object[] getElements(Object inputElement) {
-		// input either IPluginModelBase or ImportObject
-		if (inputElement instanceof IPluginModelBase) {
-			IPluginBase pluginBase = ((IPluginModelBase) inputElement)
-					.getPluginBase();
-			Map elements = new Hashtable();
-			Set candidates = new HashSet();
-			candidates.addAll(Arrays.asList(findCallees(pluginBase)));
-
-			while (!candidates.isEmpty()) {
-				Set newCandidates = new HashSet();
-				for (Iterator it = candidates.iterator(); it.hasNext();) {
-					Object candidate = it.next();
-					String id;
-					if(candidate instanceof IPluginImport){
-						id = ((IPluginImport)candidate).getId();
-					}else /*if (candidate instanceof IPluginBase)*/{
-						id = ((IPluginBase)candidate).getId();
-					}
-					IPlugin callee = PDECore.getDefault()
-							.findPlugin(id);
-					it.remove();
-					if (!elements.containsKey(id)) {
-						elements.put(id, candidate);
-						if (callee != null) {
-							newCandidates.addAll(Arrays
-									.asList(findCallees(callee)));
-						}
-					}
-				}
-				candidates = newCandidates;
-
-			}
-			return elements.values().toArray();
-		}
-		return new Object[0];
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/CalleesTreeContentProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/CalleesTreeContentProvider.java
deleted file mode 100644
index 5ffa871..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/CalleesTreeContentProvider.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.view;
-
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.pde.core.plugin.IPlugin;
-import org.eclipse.pde.core.plugin.IPluginBase;
-import org.eclipse.pde.core.plugin.IPluginImport;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.PDECore;
-
-public class CalleesTreeContentProvider extends CalleesContentProvider
-		implements ITreeContentProvider {
-
-	/**
-	 * Constructor.
-	 */
-	public CalleesTreeContentProvider(DependenciesView view) {
-		super(view);
-	}
-
-	/**
-	 * @see ITreeContentProvider#getChildren(Object)
-	 */
-	public Object[] getChildren(Object parentElement) {
-		if (parentElement instanceof IPluginBase) {
-			IPluginBase plugin = (IPluginBase) parentElement;
-			return findCallees(plugin);
-		} else if (parentElement instanceof IPluginImport) {
-			IPluginImport pluginImport = (IPluginImport) parentElement;
-			String id = pluginImport.getId();
-			IPlugin importedPlugin = PDECore.getDefault().findPlugin(id);
-			if (importedPlugin != null)
-				return findCallees(importedPlugin);
-
-		}
-		return new Object[0];
-	}
-
-	/**
-	 * @see IStructuredContentProvider#getElements(Object)
-	 * @return Object[] of IPluginBase
-	 */
-	public Object[] getElements(Object inputElement) {
-		if (inputElement instanceof IPluginModelBase) {
-			return new Object[] { ((IPluginModelBase) inputElement)
-					.getPluginBase() };
-		}
-		return new Object[0];
-	}
-
-	/**
-	 * @see ITreeContentProvider#getParent(Object)
-	 */
-	public Object getParent(Object element) {
-		return null;
-	}
-
-	/**
-	 * @see ITreeContentProvider#hasChildren(Object)
-	 */
-	public boolean hasChildren(Object element) {
-		return getChildren(element).length > 0;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/CallersContentProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/CallersContentProvider.java
deleted file mode 100644
index 716d39d..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/CallersContentProvider.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.view;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.pde.core.plugin.IFragment;
-import org.eclipse.pde.core.plugin.IPluginBase;
-import org.eclipse.pde.core.plugin.IPluginImport;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.ModelEntry;
-
-public class CallersContentProvider extends DependenciesViewPageContentProvider {
-	public CallersContentProvider(DependenciesView view) {
-		super(view);
-	}
-
-	/**
-	 * @param id
-	 * @return Set of IPluginBase
-	 */
-	protected Set findReferences(String id) {
-		ModelEntry[] entries = getPluginManager().getEntries();
-		Set l = new HashSet(entries.length);
-		for (int i = 0; i < entries.length; i++) {
-			IPluginModelBase candidate = entries[i].getActiveModel();
-			IPluginBase candidateBase = candidate.getPluginBase(false);
-			if (candidateBase == null) {
-				continue;
-			}
-			// refs by require
-			IPluginImport[] imports = candidateBase.getImports();
-			for (int m = 0; m < imports.length; m++) {
-				String candidateId = imports[m].getId();
-				if (id.equals(candidateId)) {
-					l.add(candidateBase);
-				}
-			}
-			// ref of plugin by fragment
-			if (candidateBase instanceof IFragment) {
-				String candidateId = ((IFragment) candidateBase).getPluginId();
-				if (id.equals(candidateId)) {
-					l.add(candidateBase);
-				}
-			}
-		}
-		return l;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/CallersListContentProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/CallersListContentProvider.java
deleted file mode 100644
index bdbcffe..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/CallersListContentProvider.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.view;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.pde.core.plugin.IPluginBase;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-
-public class CallersListContentProvider extends CallersContentProvider
-		implements IStructuredContentProvider {
-
-	public CallersListContentProvider(DependenciesView view) {
-		super(view);
-	}
-
-	/**
-	 * @see IStructuredContentProvider#getElements(Object)
-	 */
-	public Object[] getElements(Object inputElement) {
-		// input IPluginModelBase
-		if (inputElement instanceof IPluginModelBase) {
-			IPluginBase pluginBase = ((IPluginModelBase) inputElement)
-					.getPluginBase();
-
-			Set callers = new HashSet();
-			Set candidates = new HashSet();
-			candidates.addAll(findReferences(pluginBase.getId()));
-			while (!candidates.isEmpty()) {
-				Set newCandidates = new HashSet();
-				for (Iterator it = candidates.iterator(); it.hasNext();) {
-					Object o = it.next();
-					it.remove();
-					IPluginBase caller = (IPluginBase) o;
-					if (!callers.contains(caller)) {
-						callers.add(caller);
-						newCandidates.addAll(findReferences(caller.getId()));
-					}
-				}
-				candidates = newCandidates;
-
-			}
-
-			return callers.toArray();
-		}
-		return new Object[0];
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/CallersTreeContentProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/CallersTreeContentProvider.java
deleted file mode 100644
index 6e45af7..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/CallersTreeContentProvider.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.view;
-
-import java.util.Set;
-
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.pde.core.plugin.IPlugin;
-import org.eclipse.pde.core.plugin.IPluginBase;
-import org.eclipse.pde.core.plugin.IPluginImport;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-
-public class CallersTreeContentProvider extends CallersContentProvider
-		implements ITreeContentProvider {
-
-	/**
-	 * Constructor.
-	 */
-	public CallersTreeContentProvider(DependenciesView view) {
-		super(view);
-	}
-
-	/**
-	 * @see ITreeContentProvider#getChildren(Object) return Object[] of
-	 *      IPluginBase
-	 */
-	public Object[] getChildren(Object parentElement) {
-		String id = null;
-		if (parentElement instanceof IPluginModelBase) {
-			IPluginBase pluginBase = ((IPluginModelBase) parentElement)
-					.getPluginBase(false);
-			if (pluginBase != null)
-				id = pluginBase.getId();
-		} else if (parentElement instanceof IPlugin) {
-			id = ((IPlugin) parentElement).getId();
-		} else if (parentElement instanceof IPluginImport) {
-			id = ((IPluginImport) parentElement).getId();
-		}
-		if (id == null) {
-			return new Object[0];
-		}
-		Set l = findReferences(id);
-		return l.toArray();
-	}
-
-	/**
-	 * @see IStructuredContentProvider#getElements(Object)
-	 * @return Object[] with 0 or 1 IPluginBase
-	 */
-	public Object[] getElements(Object inputElement) {
-		if (inputElement instanceof IPluginModelBase) {
-			return new Object[] { ((IPluginModelBase) inputElement)
-					.getPluginBase() };
-		}
-		return new Object[0];
-	}
-
-	/**
-	 * @see ITreeContentProvider#getParent(Object)
-	 */
-	public Object getParent(Object element) {
-		return null;
-	}
-
-	/**
-	 * @see ITreeContentProvider#hasChildren(Object)
-	 */
-	public boolean hasChildren(Object element) {
-		return getChildren(element).length > 0;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/CopyToClipboardAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/CopyToClipboardAction.java
deleted file mode 100644
index 1a4fb98..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/CopyToClipboardAction.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.view;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import java.util.*;
-import org.eclipse.pde.internal.core.FileAdapter;
-import org.eclipse.swt.dnd.*;
-import java.io.*;
-
-public class CopyToClipboardAction extends Action {
-	IStructuredSelection selection;
-	private Clipboard clipboard;	
-
-	/**
-	 * Constructor for CopyToClipboardAction.
-	 */
-	protected CopyToClipboardAction(Clipboard clipboard) {
-		setEnabled(false);
-		this.clipboard = clipboard;
-	}
-
-	/**
-	 * Constructor for CopyToClipboardAction.
-	 * @param text
-	 */
-	protected CopyToClipboardAction(String text) {
-		super(text);
-	}
-	
-	public void setSelection(IStructuredSelection selection) {
-		this.selection = selection;
-		setEnabled(canCopy(selection));
-	}
-	
-	private boolean canCopy(IStructuredSelection selection) {
-		if (selection.isEmpty()) return false;
-		for (Iterator iter = selection.iterator(); iter.hasNext();) {
-			Object obj = iter.next();
-			if (!(obj instanceof FileAdapter)) return false;
-		}
-		return true;
-	}
-
-	public void run() {
-		if (selection.isEmpty()) return;
-		ArrayList files = new ArrayList();
-		for (Iterator iter = selection.iterator(); iter.hasNext();) {
-			Object obj = iter.next();
-			if (obj instanceof FileAdapter)
-				files.add(obj);
-		}
-		doCopy(files);
-	}
-	private void doCopy(ArrayList files) {
-	// Get the file names and a string representation
-	int len = files.size();
-	String[] fileNames = new String[len];
-	StringBuffer buf = new StringBuffer();
-	for (int i = 0, length = len; i < length; i++) {
-		FileAdapter adapter = (FileAdapter)files.get(i);
-		File file = adapter.getFile();
-		fileNames[i] = file.getAbsolutePath();
-		if (i > 0)
-			buf.append("\n"); //$NON-NLS-1$
-		buf.append(file.getName());
-	}
-	
-	// set the clipboard contents
-	clipboard.setContents(
-		new Object[]{
-			fileNames, 
-			buf.toString()}, 
-		new Transfer[]{
-			FileTransfer.getInstance(), 
-			TextTransfer.getInstance()});
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/DependenciesLabelProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/DependenciesLabelProvider.java
deleted file mode 100644
index 18ce3ff..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/DependenciesLabelProvider.java
+++ /dev/null

@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.view;
-
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.pde.core.plugin.IFragment;
-import org.eclipse.pde.core.plugin.IFragmentModel;
-import org.eclipse.pde.core.plugin.IPluginBase;
-import org.eclipse.pde.core.plugin.IPluginImport;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.ui.PDELabelProvider;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.util.SharedLabelProvider;
-import org.eclipse.swt.graphics.Image;
-
-public class DependenciesLabelProvider extends LabelProvider {
-	private PDELabelProvider fSharedProvider;
-
-	private boolean fShowReexport;
-
-	/**
-	 * Constructor for PluginsLabelProvider.
-	 */
-	public DependenciesLabelProvider(boolean showRexport) {
-		super();
-		fShowReexport = showRexport;
-		fSharedProvider = PDEPlugin.getDefault().getLabelProvider();
-		fSharedProvider.connect(this);
-	}
-
-	public void dispose() {
-		fSharedProvider.disconnect(this);
-		super.dispose();
-	}
-
-	public String getText(Object obj) {
-		if (obj instanceof IPluginImport) {
-			return ((IPluginImport) obj).getId();
-		} else if (obj instanceof String) {
-			return (String) obj;
-		} else if (obj instanceof IPluginModelBase) {
-			return ((IPluginModelBase) obj).getPluginBase(false).getId();
-		} else if (obj instanceof IPluginBase) {
-			return ((IPluginBase) obj).getId();
-		}
-
-		return fSharedProvider.getText(obj);
-	}
-
-	public Image getImage(Object obj) {
-		int flags = 0;
-		String id = null;
-		if (obj instanceof IPluginImport) {
-			IPluginImport iobj = (IPluginImport) obj;
-			id = iobj.getId();
-			if (fShowReexport && iobj.isReexported())
-				flags = SharedLabelProvider.F_EXPORT;
-		} else if (obj instanceof String) {
-			id = (String) obj;
-		}
-		if (id != null) {
-			IPluginModelBase model = PDECore.getDefault().getModelManager().findModel(id);
-			if (model != null) {
-				if (model.getUnderlyingResource() == null)
-					flags |= SharedLabelProvider.F_EXTERNAL;
-			}
-		
-			if (model == null)
-				flags = SharedLabelProvider.F_ERROR;
-
-			if(model != null && model instanceof IFragmentModel)
-				return fSharedProvider.get(PDEPluginImages.DESC_FRAGMENT_OBJ, flags);
-			return fSharedProvider.get(PDEPluginImages.DESC_PLUGIN_OBJ, flags);
-		}
-		if (obj instanceof IPluginModelBase) {
-			if (((IPluginModelBase) obj).getUnderlyingResource() == null)
-				flags |= SharedLabelProvider.F_EXTERNAL;
-			if(obj instanceof IFragmentModel)
-				return fSharedProvider.get(PDEPluginImages.DESC_FRAGMENT_OBJ, flags);
-			return fSharedProvider.get(PDEPluginImages.DESC_PLUGIN_OBJ, flags);
-		}
-		if (obj instanceof IPluginBase) {
-			if (((IPluginBase) obj).getPluginModel().getUnderlyingResource() == null)
-				flags |= SharedLabelProvider.F_EXTERNAL;
-			if(obj instanceof IFragment)
-				return fSharedProvider.get(PDEPluginImages.DESC_FRAGMENT_OBJ, flags);
-			return fSharedProvider.get(PDEPluginImages.DESC_PLUGIN_OBJ, flags);
-		}
-		return fSharedProvider.getImage(obj);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/DependenciesView.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/DependenciesView.java
deleted file mode 100644
index 74c4904..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/DependenciesView.java
+++ /dev/null

@@ -1,620 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.view;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.core.plugin.IPlugin;
-import org.eclipse.pde.core.plugin.IPluginModel;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.builders.DependencyLoop;
-import org.eclipse.pde.internal.builders.DependencyLoopFinder;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.IPreferenceConstants;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.plugin.LoopDialog;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.IPropertyListener;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchPartSite;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.IPage;
-import org.eclipse.ui.part.IPageBookViewPage;
-import org.eclipse.ui.part.PageBook;
-import org.eclipse.ui.part.PageBookView;
-
-public class DependenciesView extends PageBookView implements
-		IPreferenceConstants, IHelpContextIds {
-	
-	static class DummyPart implements IWorkbenchPart {
-		public void addPropertyListener(IPropertyListener listener) {/* dummy */
-		}
-
-		public void createPartControl(Composite parent) {/* dummy */
-		}
-
-		public void dispose() {/* dummy */
-		}
-
-		public Object getAdapter(Class adapter) {
-			return null;
-		}
-
-		public IWorkbenchPartSite getSite() {
-			return null;
-		}
-
-		public String getTitle() {
-			return null;
-		}
-
-		public Image getTitleImage() {
-			return null;
-		}
-
-		public String getTitleToolTip() {
-			return null;
-		}
-
-		public void removePropertyListener(IPropertyListener listener) {/* dummy */
-		}
-
-		public void setFocus() {/* dummy */
-		}
-	}
-
-	class ShowLoopsAction extends Action {
-
-		public ShowLoopsAction() {
-			super("", AS_PUSH_BUTTON); //$NON-NLS-1$
-			setText(PDEUIMessages.DependenciesView_ShowLoopsAction_label); 
-			setDescription(PDEUIMessages.DependenciesView_ShowLoopsAction_description); 
-			setToolTipText(PDEUIMessages.DependenciesView_ShowLoopsAction_tooltip); 
-			setImageDescriptor(PDEPluginImages.DESC_DEP_LOOP);
-			setDisabledImageDescriptor(PDEPluginImages.DESC_DEP_LOOP_DISABLED);
-			setEnabled(false);
-		}
-
-		/*
-		 * @see Action#actionPerformed
-		 */
-		public void run() {
-			LoopDialog dialog = new LoopDialog(PDEPlugin
-					.getActiveWorkbenchShell(), fLoops);
-			dialog.open();
-		}
-	}
-
-	class ShowCalleesAction extends Action {
-
-		public ShowCalleesAction() {
-			super("", AS_RADIO_BUTTON); //$NON-NLS-1$
-			setText(PDEUIMessages.DependenciesView_ShowCalleesAction_label); 
-			setDescription(PDEUIMessages.DependenciesView_ShowCalleesAction_description); 
-			setToolTipText(PDEUIMessages.DependenciesView_ShowCalleesAction_tooltip); 
-			setImageDescriptor(PDEPluginImages.DESC_CALLEES);
-			setDisabledImageDescriptor(PDEPluginImages.DESC_CALLEES_DISABLED);
-		}
-
-		/*
-		 * @see Action#actionPerformed
-		 */
-		public void run() {
-			if (isChecked()) {
-				fPreferences.setValue(DEPS_VIEW_SHOW_CALLERS, false);
-				setViewType(false);
-			}
-		}
-	}
-
-	class ShowCallersAction extends Action {
-		public ShowCallersAction() {
-			super("", AS_RADIO_BUTTON); //$NON-NLS-1$
-			setText(PDEUIMessages.DependenciesView_ShowCallersAction_label); 
-			setDescription(PDEUIMessages.DependenciesView_ShowCallersAction_description); 
-			setToolTipText(PDEUIMessages.DependenciesView_ShowCallersAction_tooltip); 
-			setImageDescriptor(PDEPluginImages.DESC_CALLERS);
-			setDisabledImageDescriptor(PDEPluginImages.DESC_CALLERS_DISABLED);
-		}
-
-		/*
-		 * @see Action#actionPerformed
-		 */
-		public void run() {
-			if (isChecked()) {
-				fPreferences.setValue(DEPS_VIEW_SHOW_CALLERS, true);
-				setViewType(true);
-			}
-		}
-	}
-
-	class ShowListAction extends Action {
-		public ShowListAction() {
-			super("", AS_RADIO_BUTTON); //$NON-NLS-1$
-			setText(PDEUIMessages.DependenciesView_ShowListAction_label); 
-			setDescription(PDEUIMessages.DependenciesView_ShowListAction_description); 
-			setToolTipText(PDEUIMessages.DependenciesView_ShowListAction_tooltip); 
-			setImageDescriptor(PDEPluginImages.DESC_FLAT_LAYOUT);
-			setDisabledImageDescriptor(PDEPluginImages.DESC_FLAT_LAYOUT_DISABLED);
-		}
-
-		/*
-		 * @see Action#actionPerformed
-		 */
-		public void run() {
-			if (isChecked()) {
-				fPreferences.setValue(DEPS_VIEW_SHOW_LIST, true);
-				setPresentation(true);
-			}
-		}
-	}
-
-	class ShowTreeAction extends Action {
-
-		public ShowTreeAction() {
-			super("", AS_RADIO_BUTTON); //$NON-NLS-1$
-			setText(PDEUIMessages.DependenciesView_ShowTreeAction_label); 
-			setDescription(PDEUIMessages.DependenciesView_ShowTreeAction_description); 
-			setToolTipText(PDEUIMessages.DependenciesView_ShowTreeAction_tooltip); 
-			setImageDescriptor(PDEPluginImages.DESC_HIERARCHICAL_LAYOUT);
-			setDisabledImageDescriptor(PDEPluginImages.DESC_HIERARCHICAL_LAYOUT_DISABLED);
-		}
-
-		/*
-		 * @see Action#actionPerformed
-		 */
-		public void run() {
-			if (isChecked()) {
-				fPreferences.setValue(DEPS_VIEW_SHOW_LIST, false);
-				setPresentation(false);
-			}
-		}
-	}
-
-	protected static final IWorkbenchPart PART_CALLEES_LIST = new DummyPart();
-
-	protected static final IWorkbenchPart PART_CALLEES_TREE = new DummyPart();
-
-	protected static final IWorkbenchPart PART_CALLERS_LIST = new DummyPart();
-
-	protected static final IWorkbenchPart PART_CALLERS_TREE = new DummyPart();
-
-	public static final String TREE_ACTION_GROUP = "tree"; //$NON-NLS-1$
-	
-	protected static final String MEMENTO_KEY_INPUT = "inputPluginId"; //$NON-NLS-1$
-
-	private static final DependencyLoop[] NO_LOOPS = new DependencyLoop[0];
-	
-	private Map fPagesToParts;
-
-	private Map fPartsToPages;
-
-	private Object fInput;
-
-	private Preferences fPreferences = PDEPlugin.getDefault()
-			.getPluginPreferences();
-
-	private ShowCalleesAction fShowCallees;
-
-	private ShowCallersAction fShowCallers;
-
-	private ShowListAction fShowList;
-
-	private ShowTreeAction fShowTree;
-	
-	private ShowLoopsAction fShowLoops;
-
-	// history of input elements (as Strings). No duplicates
-	private ArrayList fInputHistory;
-	
-	private DependencyLoop[] fLoops;
-	
-	private HistoryDropDownAction fHistoryDropDownAction;
-	/**
-	 * 
-	 */
-	public DependenciesView() {
-		super();
-		fPartsToPages = new HashMap(4);
-		fPagesToParts = new HashMap(4);
-		fInputHistory= new ArrayList();
-		fLoops = NO_LOOPS;
-	}
-
-	private void contributeToActionBars(IActionBars actionBars) {
-		contributeToLocalToolBar(actionBars.getToolBarManager());
-		actionBars.updateActionBars();
-	}
-
-	private void contributeToLocalToolBar(IToolBarManager manager) {
-		manager.add(new Separator(TREE_ACTION_GROUP));
-		manager.add(new Separator("type")); //$NON-NLS-1$
-		manager.appendToGroup("type", fShowCallees); //$NON-NLS-1$
-		manager.appendToGroup("type", fShowCallers); //$NON-NLS-1$
-		manager.add(new Separator("presentation")); //$NON-NLS-1$
-		manager.appendToGroup("presentation", fShowTree); //$NON-NLS-1$
-		manager.appendToGroup("presentation", fShowList); //$NON-NLS-1$
-		manager.add(new Separator("history")); //$NON-NLS-1$
-		manager.add(fShowLoops);
-		manager.add(fHistoryDropDownAction);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.part.PageBookView#createDefaultPage(org.eclipse.ui.part.PageBook)
-	 */
-	protected IPage createDefaultPage(PageBook book) {
-		if (fPreferences.getBoolean(DEPS_VIEW_SHOW_CALLERS)) {
-			if (fPreferences.getBoolean(DEPS_VIEW_SHOW_LIST)) {
-				return createPage(PART_CALLERS_LIST);
-
-			}
-			return createPage(PART_CALLERS_TREE);
-		}
-		if (fPreferences.getBoolean(DEPS_VIEW_SHOW_LIST)) {
-			return createPage(PART_CALLEES_LIST);
-
-		}
-		return createPage(PART_CALLEES_TREE);
-	}
-
-	/**
-	 * part of the part constants
-	 */
-	private DependenciesViewPage createPage(IWorkbenchPart part) {
-		DependenciesViewPage page;
-		if (part == PART_CALLEES_TREE) {
-			page = new DependenciesViewTreePage(this,
-					new CalleesTreeContentProvider(this));
-		} else if (part == PART_CALLEES_LIST) {
-			page = new DependenciesViewListPage(this,
-					new CalleesListContentProvider(this));
-		} else if (part == PART_CALLERS_TREE) {
-			page = new DependenciesViewTreePage(this,
-					new CallersTreeContentProvider(this));
-		} else {
-			page = new DependenciesViewListPage(this,
-					new CallersListContentProvider(this));
-		}
-
-		initPage(page);
-		page.createControl(getPageBook());
-		fPartsToPages.put(part, page);
-		fPagesToParts.put(page, part);
-		return page;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.part.PageBookView#createPartControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createPartControl(Composite parent) {
-		super.createPartControl(parent);
-		fShowCallees = new ShowCalleesAction();
-		fShowCallees.setChecked(!fPreferences
-				.getBoolean(DEPS_VIEW_SHOW_CALLERS));
-		fShowCallers = new ShowCallersAction();
-		fShowCallers
-				.setChecked(fPreferences.getBoolean(DEPS_VIEW_SHOW_CALLERS));
-
-		fShowTree = new ShowTreeAction();
-		fShowTree.setChecked(!fPreferences.getBoolean(DEPS_VIEW_SHOW_LIST));
-		fShowList = new ShowListAction();
-		fShowList.setChecked(fPreferences.getBoolean(DEPS_VIEW_SHOW_LIST));
-		
-		fShowLoops = new ShowLoopsAction();
-		fShowLoops.setEnabled(fLoops != NO_LOOPS);
-		
-		fHistoryDropDownAction= new HistoryDropDownAction(this);
-		fHistoryDropDownAction.setEnabled(!fInputHistory.isEmpty());
-		
-		IActionBars actionBars = getViewSite().getActionBars();
-		contributeToActionBars(actionBars);
-
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IHelpContextIds.DEPENDENCIES_VIEW);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.part.PageBookView#doCreatePage(org.eclipse.ui.IWorkbenchPart)
-	 */
-	protected PageRec doCreatePage(IWorkbenchPart part) {
-		IPageBookViewPage page = (IPageBookViewPage) fPartsToPages.get(part);
-		if (page == null && !fPartsToPages.containsKey(part)) {
-			page = createPage(part);
-		}
-		if (page != null) {
-			return new PageRec(part, page);
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.part.PageBookView#doDestroyPage(org.eclipse.ui.IWorkbenchPart,
-	 *      org.eclipse.ui.part.PageBookView.PageRec)
-	 */
-	protected void doDestroyPage(IWorkbenchPart part, PageRec pageRecord) {
-		IPage page = pageRecord.page;
-		page.dispose();
-		pageRecord.dispose();
-
-		// empty cross-reference cache
-		fPartsToPages.remove(part);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.part.PageBookView#getBootstrapPart()
-	 */
-	protected IWorkbenchPart getBootstrapPart() {
-		if (fPreferences.getBoolean(DEPS_VIEW_SHOW_CALLERS)) {
-			if (fPreferences.getBoolean(DEPS_VIEW_SHOW_LIST)) {
-				return PART_CALLERS_LIST;
-
-			}
-			return PART_CALLERS_TREE;
-		}
-		if (fPreferences.getBoolean(DEPS_VIEW_SHOW_LIST)) {
-			return PART_CALLEES_LIST;
-
-		}
-		return PART_CALLEES_TREE;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.part.ViewPart#init(org.eclipse.ui.IViewSite,
-	 *      org.eclipse.ui.IMemento)
-	 */
-	public void init(IViewSite site, IMemento memento) throws PartInitException {
-		super.init(site, memento);
-		if(memento == null)
-			return;
-		String id = memento.getString(MEMENTO_KEY_INPUT);
-		if (id != null) {
-			IPluginModelBase plugin = PDECore.getDefault().getModelManager().findModel(id);
-			if (plugin != null) {
-				fInput = plugin;
-				addHistoryEntry(id);
-				findLoops();
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.part.PageBookView#isImportant(org.eclipse.ui.IWorkbenchPart)
-	 */
-	protected boolean isImportant(IWorkbenchPart part) {
-		return part instanceof DummyPart;
-	}
-
-	public void openTo(Object object) {
-		if (object != null && !object.equals(fInput)) {
-			if(object instanceof IPluginModelBase){
-				String id =((IPluginModelBase)object).getPluginBase().getId();
-				addHistoryEntry(id);
-			}
-		}
-		updateInput(object);
-	}
-
-	private void updateInput(Object object) {
-		fInput = object;
-		findLoops();
-		((DependenciesViewPage) getCurrentPage()).setInput(object);
-	}
-
-	/**
-	 * 
-	 */
-	private void findLoops() {
-		fLoops = NO_LOOPS;
-		if (fInput != null && fInput instanceof IPluginModel) {
-			BusyIndicator.showWhile(PDEPlugin.getActiveWorkbenchShell()
-					.getDisplay(), new Runnable() {
-				/*
-				 * (non-Javadoc)
-				 * 
-				 * @see java.lang.Runnable#run()
-				 */
-				public void run() {
-					IPlugin plugin = ((IPluginModel) fInput).getPlugin();
-					DependencyLoop[] loops = DependencyLoopFinder
-							.findLoops(plugin);
-					if (loops.length > 0) {
-						fLoops = loops;
-					}
-				}
-			});
-		}
-		if(fShowLoops != null)
-			fShowLoops.setEnabled(fLoops != NO_LOOPS);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.part.ViewPart#saveState(org.eclipse.ui.IMemento)
-	 */
-	public void saveState(IMemento memento) {
-		super.saveState(memento);
-		if (fInput != null && fInput instanceof IPluginModelBase) {
-			String inputPluginId = ((IPluginModelBase) fInput).getPluginBase()
-					.getId();
-			memento.putString(MEMENTO_KEY_INPUT, inputPluginId);
-		}
-	}
-
-	void setPresentation(boolean listNotTree) {
-		IWorkbenchPart currentPart = getCurrentContributingPart();
-		if (listNotTree) {
-			if (currentPart == PART_CALLEES_TREE) {
-				partActivated(PART_CALLEES_LIST);
-			} else if (currentPart == PART_CALLERS_TREE) {
-				partActivated(PART_CALLERS_LIST);
-			}
-
-		} else {
-			if (currentPart == PART_CALLEES_LIST) {
-				partActivated(PART_CALLEES_TREE);
-			} else if (currentPart == PART_CALLERS_LIST) {
-				partActivated(PART_CALLERS_TREE);
-			}
-
-		}
-	}
-
-	void setViewType(boolean callers) {
-		IWorkbenchPart currentPart = getCurrentContributingPart();
-		if (callers) {
-			if (currentPart == PART_CALLEES_TREE) {
-				partActivated(PART_CALLERS_TREE);
-			} else if (currentPart == PART_CALLEES_LIST) {
-				partActivated(PART_CALLERS_LIST);
-			}
-
-		} else {
-			if (currentPart == PART_CALLERS_TREE) {
-				partActivated(PART_CALLEES_TREE);
-			} else if (currentPart == PART_CALLERS_LIST) {
-				partActivated(PART_CALLEES_LIST);
-			}
-
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.part.PageBookView#showPageRec(org.eclipse.ui.part.PageBookView.PageRec)
-	 */
-	protected void showPageRec(PageRec pageRec) {
-		IPage p = pageRec.page;
-		((DependenciesViewPage) p).setInput(fInput);
-		super.showPageRec(pageRec);
-		updateTitle(fInput);
-	}
-
-	void updateTitle(Object newInput) {
-		if (newInput == null) {
-			setContentDescription(""); //$NON-NLS-1$
-		} else if (!newInput.equals(PDECore.getDefault().getModelManager())) {
-			String name = PDEPlugin.getDefault().getLabelProvider().getText(
-					newInput);
-			String title;
-			if (getCurrentContributingPart() == PART_CALLEES_TREE) {
-				title = NLS.bind(PDEUIMessages.DependenciesView_callees_tree_title, name); 
-			} else if (getCurrentContributingPart() == PART_CALLEES_LIST) {
-				title = NLS.bind(PDEUIMessages.DependenciesView_callees_list_title, name); 
-			} else if (getCurrentContributingPart() == PART_CALLERS_TREE) {
-				title = NLS.bind(PDEUIMessages.DependenciesView_callers_tree_title, name); 
-			} else {
-				title = NLS.bind(PDEUIMessages.DependenciesView_callers_list_title, name); 
-			}
-			if(fLoops != NO_LOOPS){
-				title = title + " " + PDEUIMessages.DependenciesView_cycles_title; //$NON-NLS-1$
-			}
-			setContentDescription(title); 
-		}
-		setTitleToolTip(getTitle());
-	}
-	
-	/**
-	 * Adds the entry if new. Inserted at the beginning of the history entries list.
-	 * @param entry The new entry
-	 */		
-	private void addHistoryEntry(String entry) {
-		if (fInputHistory.contains(entry)) {
-			fInputHistory.remove(entry);
-		}
-		fInputHistory.add(0, entry);
-		if (fHistoryDropDownAction != null)
-			fHistoryDropDownAction.setEnabled(true);
-	}
-	
-	private void updateHistoryEntries() {
-		for (int i= fInputHistory.size() - 1; i >= 0; i--) {
-			String type= (String) fInputHistory.get(i);
-			if (PDECore.getDefault().getModelManager().findModel(type)==null) {
-				fInputHistory.remove(i);
-			}
-		}
-		if (fHistoryDropDownAction != null)
-			fHistoryDropDownAction.setEnabled(!fInputHistory.isEmpty());
-	}
-	
-	/**
-	 * Goes to the selected entry, without updating the order of history entries.
-	 * @param entry The entry to open
-	 */	
-	public void gotoHistoryEntry(String entry) {
-		if (fInputHistory.contains(entry)) {	
-			updateInput(PDECore.getDefault().getModelManager().findModel(entry));
-		}
-	}	
-	
-	/**
-	 * Gets all history entries.
-	 * @return All history entries
-	 */
-	public String[] getHistoryEntries() {
-		if (fInputHistory.size() > 0) {
-			updateHistoryEntries();
-		}
-		return (String[]) fInputHistory.toArray(new String[fInputHistory.size()]);
-	}
-	
-	/**
-	 * Sets the history entries
-	 * @param elems The history elements to set
-	 */
-	public void setHistoryEntries(String[] elems) {
-		fInputHistory.clear();
-		for (int i= 0; i < elems.length; i++) {
-			fInputHistory.add(elems[i]);
-		}
-		updateHistoryEntries();
-	}
-	/**
-	 * @return Returns the fInput.
-	 */
-	public String getInput() {
-		if(fInput!=null){
-			return ((IPluginModelBase)fInput).getPluginBase().getId();
-		}
-		return null;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/DependenciesViewListPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/DependenciesViewListPage.java
deleted file mode 100644
index 183c9bb..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/DependenciesViewListPage.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.view;
-
-import org.eclipse.jface.viewers.IContentProvider;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.pde.internal.ui.wizards.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-
-public class DependenciesViewListPage extends DependenciesViewPage {
-	private IContentProvider fContentProvider;
-
-	/**
-	 * 
-	 */
-	public DependenciesViewListPage(DependenciesView view,
-			IContentProvider contentProvider) {
-		super(view);
-		fContentProvider = contentProvider;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.view.DependenciesViewPage#createViewer(org.eclipse.swt.widgets.Composite)
-	 */
-	protected StructuredViewer createViewer(Composite parent) {
-		Table table = new Table(parent, SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL);
-
-		fViewer = new TableViewer(table);
-		fViewer.setContentProvider(fContentProvider);
-		final DependenciesLabelProvider labelProvider = new DependenciesLabelProvider(
-				false);
-		fViewer.setLabelProvider(labelProvider);
-		fViewer.getControl().addDisposeListener(new DisposeListener() {
-			public void widgetDisposed(DisposeEvent e) {
-				labelProvider.dispose();
-			}
-		});
-		fViewer.setSorter(ListUtil.PLUGIN_SORTER);
-
-		return fViewer;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/DependenciesViewPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/DependenciesViewPage.java
deleted file mode 100644
index fcc6959..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/DependenciesViewPage.java
+++ /dev/null

@@ -1,298 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.view;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.core.plugin.IPlugin;
-import org.eclipse.pde.core.plugin.IPluginBase;
-import org.eclipse.pde.core.plugin.IPluginImport;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.core.plugin.IPluginObject;
-import org.eclipse.pde.core.plugin.ISharedPluginModel;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.plugin.PluginReference;
-import org.eclipse.pde.internal.ui.IPreferenceConstants;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.plugin.ManifestEditor;
-import org.eclipse.pde.internal.ui.search.dependencies.DependencyExtentAction;
-import org.eclipse.pde.internal.ui.search.dependencies.UnusedDependenciesAction;
-import org.eclipse.pde.internal.ui.wizards.PluginSelectionDialog;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.part.Page;
-
-public abstract class DependenciesViewPage extends Page {
-	class FocusOnSelectionAction extends Action {
-		public void run() {
-			handleFocusOn(getSelectedObject());
-		}
-
-		public void update(Object object) {
-			setEnabled(object != null);
-			String name = ((LabelProvider) fViewer.getLabelProvider())
-					.getText(object);
-			setText(NLS.bind(PDEUIMessages.DependenciesViewPage_focusOnSelection, name)); 
-		}
-	}
-
-	private Action fFocusOnAction;
-
-	private FocusOnSelectionAction fFocusOnSelectionAction;
-
-	private Action fOpenAction;
-
-	private IPropertyChangeListener fPropertyListener;
-
-	private DependenciesView fView;
-
-	protected StructuredViewer fViewer;
-
-	/**
-	 * 
-	 */
-	public DependenciesViewPage(DependenciesView view) {
-		this.fView = view;
-		fPropertyListener = new IPropertyChangeListener() {
-			public void propertyChange(PropertyChangeEvent event) {
-				String property = event.getProperty();
-				if (property.equals(IPreferenceConstants.PROP_SHOW_OBJECTS)) {
-					fViewer.refresh();
-				}
-			}
-		};
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.part.IPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		fViewer = createViewer(parent);
-		PDEPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(
-				fPropertyListener);
-		getSite().setSelectionProvider(fViewer);
-	}
-
-	protected abstract StructuredViewer createViewer(Composite parent);
-
-	public void dispose() {
-		PDEPlugin.getDefault().getPreferenceStore()
-				.removePropertyChangeListener(fPropertyListener);
-		super.dispose();
-	}
-
-	private void fillContextMenu(IMenuManager manager) {
-		IStructuredSelection selection = (IStructuredSelection) fViewer
-				.getSelection();
-
-		if (selection.size() == 1) {
-			manager.add(fOpenAction);
-			manager.add(new Separator());
-		}
-		fFocusOnSelectionAction.update(getSelectedObject());
-		if (fFocusOnSelectionAction.isEnabled())
-			manager.add(fFocusOnSelectionAction);
-		manager.add(fFocusOnAction);
-		Object selectionElement = selection.getFirstElement();
-
-		manager.add(new Separator());
-		if (selection.size() == 1) {
-			// Compute dep extent
-			// manager.add(new Separator());
-			// PluginSearchActionGroup actionGroup = new
-			// PluginSearchActionGroup();
-			// actionGroup.setContext(new ActionContext(selection));
-			// actionGroup.fillContextMenu(manager);
-			Object importObj = selectionElement;
-			if (importObj instanceof IPluginImport) {
-				String id = ((IPluginImport) importObj).getId();
-				IResource resource = ((IPluginImport) importObj).getModel()
-						.getUnderlyingResource();
-				if (resource != null) {
-					manager.add(new DependencyExtentAction(resource
-							.getProject(), id));
-				}
-			}
-
-		}
-		// Unused Dependencies Action, only for worskpace plug-ins
-		ISharedPluginModel model = null;
-		if (selectionElement instanceof PluginReference) {
-			selectionElement = ((PluginReference) selectionElement).getPlugin();
-		}
-		if (selectionElement instanceof IPluginObject) {
-			model = ((IPluginObject) selectionElement).getModel();
-		}
-		if (model != null && model.getUnderlyingResource() != null) {
-			manager.add(new UnusedDependenciesAction(
-					(IPluginModelBase) model, true));
-		}
-		//
-		manager.add(new Separator());
-		manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.part.IPage#getControl()
-	 */
-	public Control getControl() {
-		return fViewer.getControl();
-	}
-
-	private Object getSelectedObject() {
-		IStructuredSelection selection = (IStructuredSelection) fViewer
-				.getSelection();
-		if (selection.isEmpty() || selection.size() != 1)
-			return null;
-		return selection.getFirstElement();
-	}
-
-	/**
-	 * @return Returns the view.
-	 */
-	public DependenciesView getView() {
-		return fView;
-	}
-
-	private void handleDoubleClick() {
-		Object obj = getSelectedObject();
-		if (obj instanceof IPluginImport) {
-			ManifestEditor.openPluginEditor(((IPluginImport) obj).getId());
-		} else if (obj instanceof IPluginBase) {
-			ManifestEditor.open((IPluginBase) obj, false);
-		}
-	}
-
-	private void handleFocusOn() {
-		PluginSelectionDialog dialog = new PluginSelectionDialog(fViewer
-				.getControl().getShell(), true, false);
-		dialog.create();
-		if (dialog.open() == Window.OK) {
-			handleFocusOn(dialog.getFirstResult());
-		}
-	}
-
-	private void handleFocusOn(Object newFocus) {
-		if (newFocus instanceof IPluginModelBase) {
-			fView.openTo(newFocus);
-		}
-		if (newFocus instanceof IPluginBase) {
-			fView.openTo(((IPluginBase) newFocus).getModel());
-		}
-		if (newFocus instanceof IPluginImport) {
-			IPluginImport pluginImport = ((IPluginImport) newFocus);
-			String id = pluginImport.getId();
-			IPlugin importedPlugin = PDECore.getDefault().findPlugin(id);
-			if (importedPlugin != null) {
-				fView.openTo(importedPlugin.getModel());
-			} else {
-				fView.openTo(null);
-			}
-		}
-	}
-
-	private void hookContextMenu() {
-		MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
-		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(new IMenuListener() {
-			public void menuAboutToShow(IMenuManager manager) {
-				DependenciesViewPage.this.fillContextMenu(manager);
-			}
-		});
-		Menu menu = menuMgr.createContextMenu(fViewer.getControl());
-		fViewer.getControl().setMenu(menu);
-
-		getSite()
-				.registerContextMenu(fView.getSite().getId(), menuMgr, fViewer);
-	}
-
-	private void hookDoubleClickAction() {
-		fViewer.addDoubleClickListener(new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent event) {
-				handleDoubleClick();
-			}
-		});
-	}
-
-	private void makeActions() {
-		fOpenAction = new Action() {
-			public void run() {
-				handleDoubleClick();
-			}
-		};
-		fOpenAction.setText(PDEUIMessages.DependenciesView_open); 
-
-		fFocusOnSelectionAction = new FocusOnSelectionAction();
-
-		fFocusOnAction = new Action() {
-			public void run() {
-				handleFocusOn();
-			}
-		};
-		fFocusOnAction.setText(PDEUIMessages.DependenciesViewPage_focusOn); 
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.part.Page#makeContributions(org.eclipse.jface.action.IMenuManager,
-	 *      org.eclipse.jface.action.IToolBarManager,
-	 *      org.eclipse.jface.action.IStatusLineManager)
-	 */
-	public void makeContributions(IMenuManager menuManager,
-			IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
-		super.makeContributions(menuManager, toolBarManager, statusLineManager);
-		makeActions();
-		hookContextMenu();
-		hookDoubleClickAction();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.part.IPage#setFocus()
-	 */
-	public void setFocus() {
-		if (fViewer != null) {
-			Control c = fViewer.getControl();
-			if (!c.isFocusControl()) {
-				c.setFocus();
-			}
-		}
-	}
-
-	public void setInput(Object object) {
-		if (object != fViewer.getInput())
-			fViewer.setInput(object);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/DependenciesViewPageContentProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/DependenciesViewPageContentProvider.java
deleted file mode 100644
index dca653a..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/DependenciesViewPageContentProvider.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.view;
-
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.IPluginModelListener;
-import org.eclipse.pde.internal.core.ModelEntry;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.PluginModelDelta;
-import org.eclipse.pde.internal.core.PluginModelManager;
-import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
-
-public class DependenciesViewPageContentProvider extends DefaultContentProvider
-		implements IPluginModelListener {
-	private PluginModelManager fPluginManager;
-
-	private DependenciesView fView;
-
-	private StructuredViewer fViewer;
-
-	/**
-	 * Constructor.
-	 */
-	public DependenciesViewPageContentProvider(DependenciesView view) {
-		this.fView = view;
-		fPluginManager = PDECore.getDefault().getModelManager();
-		fPluginManager.addPluginModelListener(this);
-	}
-
-	public void dispose() {
-		fPluginManager.removePluginModelListener(this);
-	}
-
-	private void handleRemoved(ModelEntry[] removed) {
-		for (int i = 0; i < removed.length; i++) {
-			ModelEntry entry = removed[i];
-			IPluginModelBase model = entry.getActiveModel();
-			if (model != null && model.equals(fViewer.getInput())) {
-				fViewer.setInput(null);
-				return;
-			}
-		}
-		fViewer.refresh();
-	}
-
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		fView.updateTitle(newInput);
-		this.fViewer = (StructuredViewer) viewer;
-	}
-
-	public void modelsChanged(final PluginModelDelta delta) {
-		if (fViewer == null || fViewer.getControl().isDisposed())
-			return;
-
-		fViewer.getControl().getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				int kind = delta.getKind();
-				if (fViewer.getControl().isDisposed())
-					return;
-				if ((kind & PluginModelDelta.CHANGED) != 0
-						|| (kind & PluginModelDelta.ADDED) != 0) {
-					// Don't know exactly what change -
-					// the safest way out is to refresh
-					fViewer.refresh();
-					fView.updateTitle(fView.getInput());
-					return;
-				}
-				if ((kind & PluginModelDelta.REMOVED) != 0) {
-					ModelEntry[] removed = delta.getRemovedEntries();
-					handleRemoved(removed);
-				}
-				if ((kind & PluginModelDelta.ADDED) != 0) {
-					fViewer.refresh();
-				}
-			}
-		});
-	}
-
-	/**
-	 * @return Returns the fPluginManager.
-	 */
-	protected PluginModelManager getPluginManager() {
-		return fPluginManager;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/DependenciesViewTreePage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/DependenciesViewTreePage.java
deleted file mode 100644
index 7af072b..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/DependenciesViewTreePage.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.view;
-
-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.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.wizards.ListUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.widgets.Composite;
-
-public class DependenciesViewTreePage extends DependenciesViewPage {
-	class CollapseAllAction extends Action {
-		public CollapseAllAction() {
-			super();
-			setText(PDEUIMessages.DependenciesViewTreePage_CollapseAllAction_label); 
-			setDescription(PDEUIMessages.DependenciesViewTreePage_CollapseAllAction_description); 
-			setToolTipText(PDEUIMessages.DependenciesViewTreePage_CollapseAllAction_tooltip); 
-			setImageDescriptor(PDEPluginImages.DESC_COLLAPSE_ALL);
-			setDisabledImageDescriptor(PDEPluginImages.DESC_COLLAPSE_ALL);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.action.Action#run()
-		 */
-		public void run() {
-			super.run();
-			fTreeViewer.collapseAll();
-		}
-	}
-
-	ITreeContentProvider fContentProvider;
-
-	TreeViewer fTreeViewer;
-
-	public DependenciesViewTreePage(DependenciesView view,
-			ITreeContentProvider contentProvider) {
-		super(view);
-		fContentProvider = contentProvider;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.view.DependenciesViewPage#createViewer(org.eclipse.swt.widgets.Composite)
-	 */
-	protected StructuredViewer createViewer(Composite parent) {
-		fTreeViewer = new TreeViewer(parent, SWT.MULTI | SWT.V_SCROLL
-				| SWT.H_SCROLL);
-		fTreeViewer.setContentProvider(fContentProvider);
-		final DependenciesLabelProvider labelProvider = new DependenciesLabelProvider(
-				true);
-		fTreeViewer.setLabelProvider(labelProvider);
-		fTreeViewer.getControl().addDisposeListener(new DisposeListener() {
-			public void widgetDisposed(DisposeEvent e) {
-				labelProvider.dispose();
-			}
-		});
-		fTreeViewer.setSorter(ListUtil.PLUGIN_SORTER);
-		fTreeViewer.setAutoExpandLevel(2);
-
-		return fTreeViewer;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.part.Page#makeContributions(org.eclipse.jface.action.IMenuManager,
-	 *      org.eclipse.jface.action.IToolBarManager,
-	 *      org.eclipse.jface.action.IStatusLineManager)
-	 */
-	public void makeContributions(IMenuManager menuManager,
-			IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
-		super.makeContributions(menuManager, toolBarManager, statusLineManager);
-		if (toolBarManager.find(DependenciesView.TREE_ACTION_GROUP) != null)
-			toolBarManager.prependToGroup(DependenciesView.TREE_ACTION_GROUP,
-					new CollapseAllAction());
-		else
-			toolBarManager.add(new CollapseAllAction());
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/FileAdapterPropertySource.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/FileAdapterPropertySource.java
deleted file mode 100644
index f062182..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/FileAdapterPropertySource.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.view;
-
-import org.eclipse.pde.internal.core.FileAdapter;
-import org.eclipse.ui.views.properties.*;
-import java.util.*;
-import java.text.DateFormat;
-
-public class FileAdapterPropertySource implements IPropertySource {
-	private IPropertyDescriptor [] descriptors;
-	private FileAdapter adapter;
-
-	/**
-	 * Constructor for FileAdapterPropertySource.
-	 */
-	public FileAdapterPropertySource() {
-		super();
-	}
-	
-	public void setAdapter(FileAdapter adapter) {
-		this.adapter = adapter;
-	}
-
-	/**
-	 * @see IPropertySource#getEditableValue()
-	 */
-	public Object getEditableValue() {
-		return null;
-	}
-
-	/**
-	 * @see IPropertySource#getPropertyDescriptors()
-	 */
-	public IPropertyDescriptor[] getPropertyDescriptors() {
-		if (descriptors==null) {
-			descriptors = new IPropertyDescriptor[5];
-			descriptors[0] = new PropertyDescriptor("editable", "editable"); //$NON-NLS-1$ //$NON-NLS-2$
-			descriptors[1] = new PropertyDescriptor("last", "last modified"); //$NON-NLS-1$ //$NON-NLS-2$
-			descriptors[2] = new PropertyDescriptor("name", "name"); //$NON-NLS-1$ //$NON-NLS-2$
-			descriptors[3] = new PropertyDescriptor("path", "path"); //$NON-NLS-1$ //$NON-NLS-2$
-			descriptors[4] = new PropertyDescriptor("size", "size"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		return descriptors;
-	}
-
-	/**
-	 * @see IPropertySource#getPropertyValue(Object)
-	 */
-	public Object getPropertyValue(Object id) {
-		String key = id.toString();
-		if (key.equals("editable")) //$NON-NLS-1$
-			return "false"; //$NON-NLS-1$
-		if (key.equals("last")) { //$NON-NLS-1$
-			Date date = new Date(adapter.getFile().lastModified());
-			return DateFormat.getInstance().format(date);
-		}
-		if (key.equals("name")) //$NON-NLS-1$
-			return adapter.getFile().getName();
-		if (key.equals("path")) //$NON-NLS-1$
-			return adapter.getFile().getAbsolutePath();
-		if (key.equals("size")) //$NON-NLS-1$
-			return ""+adapter.getFile().length(); //$NON-NLS-1$
-		return null;
-	}
-
-	/**
-	 * @see IPropertySource#isPropertySet(Object)
-	 */
-	public boolean isPropertySet(Object id) {
-		return false;
-	}
-
-	/**
-	 * @see IPropertySource#resetPropertyValue(Object)
-	 */
-	public void resetPropertyValue(Object id) {
-	}
-
-	/**
-	 * @see IPropertySource#setPropertyValue(Object, Object)
-	 */
-	public void setPropertyValue(Object id, Object value) {
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/HistoryAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/HistoryAction.java
deleted file mode 100644
index 334c8d0..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/HistoryAction.java
+++ /dev/null

@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.view;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Action used for the open historical input again in DependenciesView
- */
-public class HistoryAction extends Action {
-	/**
-	 * Image descriptor for an image.
-	 */
-	public class ImageImageDescriptor extends ImageDescriptor {
-		private Image fImage;
-
-		/**
-		 * Constructor for ImagImageDescriptor.
-		 */
-		public ImageImageDescriptor(Image image) {
-			super();
-			fImage = image;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see Object#equals(Object)
-		 */
-		public boolean equals(Object obj) {
-			return (obj != null) && getClass().equals(obj.getClass())
-					&& fImage.equals(((ImageImageDescriptor) obj).fImage);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see ImageDescriptor#getImageData()
-		 */
-		public ImageData getImageData() {
-			return fImage.getImageData();
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see Object#hashCode()
-		 */
-		public int hashCode() {
-			return fImage.hashCode();
-		}
-	}
-
-	private String fElement;
-
-	private DependenciesView fView;
-
-	public HistoryAction(DependenciesView view, String element) {
-		super();
-		fView = view;
-		fElement = element;
-
-		String elementName = element.toString();
-		setText(elementName);
-		setImageDescriptor(getImageDescriptor(elementName));
-		setDisabledImageDescriptor(PDEPluginImages.DESC_PLUGIN_OBJ);
-
-		setDescription(NLS.bind(PDEUIMessages.HistoryAction_description, elementName)); 
-		setToolTipText(NLS.bind(PDEUIMessages.HistoryAction_tooltip, elementName)); 
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.HISTORY_ACTION);
-	}
-
-	private ImageDescriptor getImageDescriptor(String element) {
-		DependenciesLabelProvider imageProvider = new DependenciesLabelProvider(
-				false);
-		ImageDescriptor desc = new ImageImageDescriptor(imageProvider
-				.getImage(element));
-		imageProvider.dispose();
-
-		return desc;
-	}
-
-	/*
-	 * @see Action#run()
-	 */
-	public void run() {
-		fView.gotoHistoryEntry(fElement);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/HistoryDropDownAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/HistoryDropDownAction.java
deleted file mode 100644
index 67143c5..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/HistoryDropDownAction.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.view;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IMenuCreator;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-
-public class HistoryDropDownAction extends Action implements IMenuCreator {
-
-	public static final int RESULTS_IN_DROP_DOWN = 10;
-
-	private Menu fMenu;
-
-	private DependenciesView fView;
-
-	public HistoryDropDownAction(DependenciesView view) {
-		fView = view;
-		fMenu = null;
-		setToolTipText(PDEUIMessages.HistoryDropDownAction_tooltip); 
-		setImageDescriptor(PDEPluginImages.DESC_HISTORY_LIST);
-		setDisabledImageDescriptor(PDEPluginImages.DESC_HISTORY_LIST_DISABLED);
-		setMenuCreator(this);
-	}
-
-	protected void addActionToMenu(Menu parent, Action action) {
-		ActionContributionItem item = new ActionContributionItem(action);
-		item.fill(parent, -1);
-	}
-
-	private boolean addEntries(Menu menu, String[] elements) {
-		boolean checked = false;
-
-		int min = Math.min(elements.length, RESULTS_IN_DROP_DOWN);
-		for (int i = 0; i < min; i++) {
-			HistoryAction action = new HistoryAction(fView, elements[i]);
-			action.setChecked(elements[i].equals(fView.getInput()));
-			checked = checked || action.isChecked();
-			addActionToMenu(menu, action);
-		}
-		return checked;
-	}
-
-	public void dispose() {
-		// action is reused, can be called several times.
-		if (fMenu != null) {
-			fMenu.dispose();
-			fMenu = null;
-		}
-	}
-
-	public Menu getMenu(Control parent) {
-		if (fMenu != null) {
-			fMenu.dispose();
-		}
-		fMenu = new Menu(parent);
-		String[] elements = fView.getHistoryEntries();
-		boolean checked = addEntries(fMenu, elements);
-		if (elements.length > RESULTS_IN_DROP_DOWN) {
-			new MenuItem(fMenu, SWT.SEPARATOR);
-			Action others = new HistoryListAction(fView);
-			others.setChecked(checked);
-			addActionToMenu(fMenu, others);
-		}
-		return fMenu;
-	}
-
-	public Menu getMenu(Menu parent) {
-		return null;
-	}
-
-	public void run() {
-		(new HistoryListAction(fView)).run();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/HistoryListAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/HistoryListAction.java
deleted file mode 100644
index b7b2740..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/HistoryListAction.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.view;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.window.Window;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.ui.PlatformUI;
-
-public class HistoryListAction extends Action {
-
-	private DependenciesView fView;
-
-	public HistoryListAction(DependenciesView view) {
-		fView = view;
-		setText(PDEUIMessages.HistoryListAction_label); 
-		setImageDescriptor(PDEPluginImages.DESC_HISTORY_LIST);
-		setDisabledImageDescriptor(PDEPluginImages.DESC_HISTORY_LIST_DISABLED);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IHelpContextIds.HISTORY_LIST_ACTION);
-	}
-
-	/*
-	 * @see IAction#run()
-	 */
-	public void run() {
-		String[] historyEntries = fView.getHistoryEntries();
-		HistoryListDialog dialog = new HistoryListDialog(PDEPlugin
-				.getActiveWorkbenchShell(), historyEntries);
-		if (dialog.open() == Window.OK) {
-			fView.setHistoryEntries(dialog.getRemaining());
-			String id = dialog.getResult();
-			if (id == null) {
-				fView.openTo(null);
-			} else {
-				fView.openTo(PDECore.getDefault().getModelManager().findModel(
-						id));
-			}
-		}
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/HistoryListDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/HistoryListDialog.java
deleted file mode 100644
index 99c7ef3..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/HistoryListDialog.java
+++ /dev/null

@@ -1,246 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.view;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.StatusDialog;
-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.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
-import org.eclipse.pde.internal.ui.parts.StatusInfo;
-import org.eclipse.pde.internal.ui.util.SWTUtil;
-import org.eclipse.pde.internal.ui.wizards.ListUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-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.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.ui.PlatformUI;
-
-public class HistoryListDialog extends StatusDialog {
-	class ContentProvider extends DefaultContentProvider implements
-			IStructuredContentProvider {
-		public Object[] getElements(Object element) {
-			return fHistoryList.toArray();
-		}
-	}
-
-	private List fHistoryList = new ArrayList();
-
-	private IStatus fHistoryStatus;
-
-	private TableViewer fHistoryViewer;
-
-	private Button fRemoveButton;
-
-	private String fResult;
-
-	public HistoryListDialog(Shell shell, String[] elements) {
-		super(shell);
-		setTitle(PDEUIMessages.HistoryListDialog_title); 
-		fHistoryList.addAll(Arrays.asList(elements));
-	}
-
-	/*
-	 * @see org.eclipse.jface.window.Window#configureShell(Shell)
-	 */
-	protected void configureShell(Shell newShell) {
-		super.configureShell(newShell);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(newShell, IHelpContextIds.HISTORY_LIST_DIALOG);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.window.Window#create()
-	 */
-	public void create() {
-		setShellStyle(getShellStyle() | SWT.RESIZE);
-		super.create();
-	}
-
-	/*
-	 * @see Dialog#createDialogArea(Composite)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		initializeDialogUnits(parent);
-
-		Composite composite = (Composite) super.createDialogArea(parent);
-
-		Composite inner = new Composite(composite, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.marginWidth = 0;
-		layout.marginHeight = 0;
-		inner.setLayout(layout);
-		inner.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		Label label = new Label(inner, SWT.NONE);
-		label.setText(PDEUIMessages.HistoryListDialog_label); 
-
-		Composite container = createListArea(inner);
-
-		container.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		applyDialogFont(composite);
-		return composite;
-	}
-
-	/**
-	 * @param parent
-	 * @return
-	 */
-	private Composite createListArea(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		GridLayout layout1 = new GridLayout();
-		layout1.marginWidth = 0;
-		layout1.marginHeight = 0;
-		layout1.numColumns = 2;
-		container.setLayout(layout1);
-		container.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		createTableArea(container);
-		createListButtons(container);
-		return container;
-	}
-
-	/**
-	 * @param container
-	 */
-	private void createListButtons(Composite parent) {
-		fRemoveButton = new Button(parent, SWT.PUSH);
-		fRemoveButton.setText(PDEUIMessages.HistoryListDialog_remove_button); 
-		fRemoveButton.setLayoutData(new GridData(SWT.CENTER, SWT.TOP, false,
-				false));
-		SWTUtil.setButtonDimensionHint(fRemoveButton);
-		fRemoveButton.addSelectionListener(new SelectionAdapter() {
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.swt.events.SelectionAdapter#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
-			 */
-			public void widgetSelected(SelectionEvent e) {
-				ISelection selection = fHistoryViewer.getSelection();
-				if (!selection.isEmpty()
-						&& selection instanceof IStructuredSelection) {
-					Object removalCandiate = ((IStructuredSelection) selection)
-							.getFirstElement();
-					fHistoryList.remove(removalCandiate);
-					fHistoryViewer.remove(removalCandiate);
-				}
-			}
-		});
-	}
-
-	/**
-	 * @param parent
-	 * @return
-	 */
-	private Control createTableArea(Composite parent) {
-		Table table = new Table(parent, SWT.BORDER | SWT.MULTI | SWT.V_SCROLL);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.widthHint = 225;
-		gd.heightHint = 200;
-		table.setLayoutData(gd);
-
-		table.addSelectionListener(new SelectionAdapter() {
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.swt.events.SelectionAdapter#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
-			 */
-			public void widgetDefaultSelected(SelectionEvent e) {
-				if (fHistoryStatus.isOK()) {
-					okPressed();
-				}
-			}
-		});
-
-		fHistoryViewer = new TableViewer(table);
-		final DependenciesLabelProvider labelProvider = new DependenciesLabelProvider(
-				false);
-		fHistoryViewer.setLabelProvider(labelProvider);
-		fHistoryViewer.getControl().addDisposeListener(new DisposeListener() {
-			public void widgetDisposed(DisposeEvent e) {
-				labelProvider.dispose();
-			}
-		});
-		fHistoryViewer.setContentProvider(new ContentProvider());
-		fHistoryViewer.setInput(PDECore.getDefault().getExternalModelManager());
-		fHistoryViewer.setSorter(ListUtil.PLUGIN_SORTER);
-
-		ISelection sel;
-		if (fHistoryList.size() > 0) {
-			sel = new StructuredSelection(fHistoryList.get(0));
-		} else {
-			sel = new StructuredSelection();
-		}
-		fHistoryViewer.setSelection(sel);
-
-		fHistoryViewer
-				.addSelectionChangedListener(new ISelectionChangedListener() {
-					/*
-					 * (non-Javadoc)
-					 * 
-					 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
-					 */
-					public void selectionChanged(SelectionChangedEvent event) {
-						StatusInfo status = new StatusInfo();
-						ISelection selection = fHistoryViewer.getSelection();
-						if (selection instanceof IStructuredSelection) {
-							List selected = ((IStructuredSelection) selection)
-									.toList();
-							if (selected.size() != 1) {
-								status.setError(""); //$NON-NLS-1$
-								fResult = null;
-							} else {
-								fResult = (String) selected.get(0);
-							}
-							fRemoveButton
-									.setEnabled(fHistoryList.size() > selected
-											.size()
-											&& selected.size() != 0);
-							fHistoryStatus = status;
-							updateStatus(status);
-						}
-					}
-				});
-		return fHistoryViewer.getControl();
-	}
-
-	public String[] getRemaining() {
-		return (String[]) fHistoryList.toArray(new String[fHistoryList.size()]);
-	}
-
-	public String getResult() {
-		return fResult;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/ModelEntryPropertySource.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/ModelEntryPropertySource.java
deleted file mode 100644
index 2807453..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/ModelEntryPropertySource.java
+++ /dev/null

@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.view;
-
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.ui.views.properties.*;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.core.resources.IResource;
-
-public class ModelEntryPropertySource implements IPropertySource {
-	private IPropertyDescriptor [] descriptors;
-	private ModelEntry entry;
-
-	/**
-	 * Constructor for FileAdapterPropertySource.
-	 */
-	public ModelEntryPropertySource() {
-		super();
-	}
-	
-	public void setEntry(ModelEntry entry) {
-		this.entry = entry;
-	}
-
-	/**
-	 * @see IPropertySource#getEditableValue()
-	 */
-	public Object getEditableValue() {
-		return null;
-	}
-
-	/**
-	 * @see IPropertySource#getPropertyDescriptors()
-	 */
-	public IPropertyDescriptor[] getPropertyDescriptors() {
-		if (descriptors==null) {
-			descriptors = new IPropertyDescriptor[8];
-			descriptors[0] = new PropertyDescriptor("kind", "kind"); //$NON-NLS-1$ //$NON-NLS-2$
-			descriptors[1] = new PropertyDescriptor("name", "name"); //$NON-NLS-1$ //$NON-NLS-2$
-			descriptors[2] = new PropertyDescriptor("fragment", "fragment"); //$NON-NLS-1$ //$NON-NLS-2$
-			descriptors[3] = new PropertyDescriptor("path", "path"); //$NON-NLS-1$ //$NON-NLS-2$
-			descriptors[4] = new PropertyDescriptor("id", "id"); //$NON-NLS-1$ //$NON-NLS-2$
-			descriptors[5] = new PropertyDescriptor("version", "version"); //$NON-NLS-1$ //$NON-NLS-2$
-			descriptors[6] = new PropertyDescriptor("provider", "provider"); //$NON-NLS-1$ //$NON-NLS-2$
-			descriptors[7] = new PropertyDescriptor("enabled", "enabled"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		return descriptors;
-	}
-
-	/**
-	 * @see IPropertySource#getPropertyValue(Object)
-	 */
-	public Object getPropertyValue(Object id) {
-		String key = id.toString();
-		IPluginModelBase model = entry.getActiveModel();
-		IResource resource = model.getUnderlyingResource();
-		if (key.equals("enabled")) //$NON-NLS-1$
-			return model.isEnabled()?"true":"false"; //$NON-NLS-1$ //$NON-NLS-2$
-		if (key.equals("kind")) //$NON-NLS-1$
-			return resource!=null?"workspace":"external"; //$NON-NLS-1$ //$NON-NLS-2$
-		if (key.equals("fragment")) //$NON-NLS-1$
-			return model.isFragmentModel()?"yes":"no"; //$NON-NLS-1$ //$NON-NLS-2$
-		if (key.equals("name")) //$NON-NLS-1$
-			return model.getPluginBase().getTranslatedName();
-		if (key.equals("path")) { //$NON-NLS-1$
-			if (resource!=null)
-				return resource.getLocation().toOSString();
-			return model.getInstallLocation();
-		}
-		if (key.equals("id")) //$NON-NLS-1$
-			return model.getPluginBase().getId();
-		if (key.equals("version")) //$NON-NLS-1$
-			return model.getPluginBase().getVersion();
-		if (key.equals("provider")) //$NON-NLS-1$
-			return model.getPluginBase().getProviderName();
-		return null;
-	}
-
-	/**
-	 * @see IPropertySource#isPropertySet(Object)
-	 */
-	public boolean isPropertySet(Object id) {
-		return false;
-	}
-
-	/**
-	 * @see IPropertySource#resetPropertyValue(Object)
-	 */
-	public void resetPropertyValue(Object id) {
-	}
-
-	/**
-	 * @see IPropertySource#setPropertyValue(Object, Object)
-	 */
-	public void setPropertyValue(Object id, Object value) {
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/OpenDependenciesAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/OpenDependenciesAction.java
deleted file mode 100644
index bc7336f..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/OpenDependenciesAction.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.view;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.ui.*;
-
-public class OpenDependenciesAction implements IWorkbenchWindowActionDelegate {
-	private ISelection fSelection;
-	/*
-	 * @see IActionDelegate#run(IAction)
-	 */
-	public void run(IAction action) {
-		if (fSelection instanceof IStructuredSelection) {
-			IStructuredSelection ssel = (IStructuredSelection) fSelection;
-			openDependencies(ssel.getFirstElement());
-		}
-	}
-
-	private void openDependencies(Object el) {
-		if (el instanceof IFile) {
-			el = ((IFile)el).getProject();
-		}
-		if (el instanceof IJavaProject) {
-			el = ((IJavaProject)el).getProject();
-		}
-		if (el instanceof IProject) {
-			el = PDECore.getDefault().getModelManager().findModel((IProject) el);
-		}
-		if (el instanceof IPluginObject) {
-			el = ((IPluginObject)el).getModel();
-		}
-		if (el instanceof IPluginModelBase) {
-			openDependencies((IPluginModelBase)el);
-		}
-	}
-	
-	public static void openDependencies(IPluginModelBase model) {
-		IWorkbenchPage page = PDEPlugin.getActivePage();
-		try {
-			IViewPart view = page.showView(PDEPlugin.DEPENDENCIES_VIEW_ID);
-			((DependenciesView)view).openTo(model);
-		}
-		catch (PartInitException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	/*
-	 * @see IWorkbenchWindowActionDelegate#dispose()
-	 */
-	public void dispose() {
-	}
-
-	/*
-	 * @see IWorkbenchWindowActionDelegate#init(IWorkbenchWindow)
-	 */
-	public void init(IWorkbenchWindow window) {
-	}
-
-	/*
-	 * @see IActionDelegate#selectionChanged(IAction, ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		fSelection = selection;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/PluginsContentProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/PluginsContentProvider.java
deleted file mode 100644
index 3bc92df..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/PluginsContentProvider.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.view;
-
-import java.io.*;
-
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.ui.StandardJavaElementContentProvider;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
-
-public class PluginsContentProvider
-	extends DefaultContentProvider
-	implements ITreeContentProvider, IStructuredContentProvider, IPluginModelListener {
-	private PluginModelManager manager;
-	private TreeViewer viewer;
-	private PluginsView view;
-	private StandardJavaElementContentProvider javaProvider;
-
-	/**
-	 * Constructor for PluginsContentProvider.
-	 */
-	public PluginsContentProvider(PluginsView view, PluginModelManager manager) {
-		this.manager = manager;
-		manager.addPluginModelListener(this);
-		this.view = view;
-		javaProvider = new StandardJavaElementContentProvider();
-	}
-
-	public void dispose() {
-		manager.removePluginModelListener(this);
-	}
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		this.viewer = (TreeViewer) viewer;
-		if (newInput==null) return;
-		view.updateTitle(newInput);
-	}
-
-	/**
-	 * @see ITreeContentProvider#getChildren(Object)
-	 */
-	public Object[] getChildren(Object parentElement) {
-		if (parentElement instanceof PluginModelManager) {
-			return ((PluginModelManager) parentElement).getEntries();
-		}
-		if (parentElement instanceof ModelEntry) {
-			ModelEntry entry = (ModelEntry) parentElement;
-			return entry.getChildren();
-		}
-		if (parentElement instanceof FileAdapter) {
-			return ((FileAdapter) parentElement).getChildren();
-		}
-		if (parentElement instanceof IPackageFragmentRoot ||
-			parentElement instanceof IPackageFragment ||
-			parentElement instanceof ICompilationUnit) 
-			return javaProvider.getChildren(parentElement);
-		return new Object[0];
-	}
-
-	/**
-	 * @see ITreeContentProvider#getParent(Object)
-	 */
-	public Object getParent(Object element) {
-		if (element instanceof PluginModelManager) {
-			return null;
-		}
-		if (element instanceof ModelEntry) {
-			return manager;
-		}
-		if (element instanceof EntryFileAdapter) {
-			return ((EntryFileAdapter) element).getEntry();
-		}
-		if (element instanceof FileAdapter) {
-			return ((FileAdapter) element).getParent();
-		}
-		return null;
-	}
-
-	/**
-	 * @see ITreeContentProvider#hasChildren(Object)
-	 */
-	public boolean hasChildren(Object element) {
-		if (element instanceof PluginModelManager) {
-			return ((PluginModelManager) element).isEmpty() == false;
-		}
-		if (element instanceof ModelEntry) {
-			ModelEntry entry = (ModelEntry) element;
-			IPluginModelBase model = entry.getActiveModel();
-			File file = new File(model.getInstallLocation());
-			return !file.isFile() && model.getUnderlyingResource() == null;
-		}
-		if (element instanceof FileAdapter) {
-			FileAdapter fileAdapter = (FileAdapter) element;
-			return fileAdapter.hasChildren();
-		}
-		if (element instanceof IPackageFragmentRoot ||
-			element instanceof IPackageFragment ||
-			element instanceof ICompilationUnit)
-			return javaProvider.hasChildren(element);
-		return false;
-	}
-
-	/**
-	 * @see IStructuredContentProvider#getElements(Object)
-	 */
-	public Object[] getElements(Object inputElement) {
-		return getChildren(inputElement);
-	}
-
-	public void modelsChanged(final PluginModelDelta delta) {
-		if (viewer == null || viewer.getTree().isDisposed())
-			return;
-
-		viewer.getTree().getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				int kind = delta.getKind();
-				if (viewer.getTree().isDisposed())
-					return;
-				if ((kind & PluginModelDelta.CHANGED) !=0) {
-					// Don't know exactly what change - 
-					// the safest way out is to refresh
-					viewer.refresh();
-					return;
-				}
-				if ((kind & PluginModelDelta.REMOVED) != 0) {
-					ModelEntry[] removed = delta.getRemovedEntries();
-					viewer.remove(removed);
-				}
-				if ((kind & PluginModelDelta.ADDED) != 0) {
-					ModelEntry[] added = delta.getAddedEntries();
-					for (int i = 0; i < added.length; i++) {
-						if (isVisible(added[i]))
-							viewer.add(manager, added[i]);
-					}
-				}
-			}
-		});
-	}
-	private boolean isVisible(ModelEntry entry) {
-		ViewerFilter[] filters = viewer.getFilters();
-		for (int i = 0; i < filters.length; i++) {
-			ViewerFilter filter = filters[i];
-			if (!filter.select(viewer, manager, entry))
-				return false;
-		}
-		return true;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/PluginsDragAdapter.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/PluginsDragAdapter.java
deleted file mode 100644
index 44f1f81..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/PluginsDragAdapter.java
+++ /dev/null

@@ -1,82 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.view;
-
-import org.eclipse.jface.viewers.*;
-import org.eclipse.swt.dnd.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.pde.internal.core.FileAdapter;
-import java.util.*;
-
-public class PluginsDragAdapter extends DragSourceAdapter {
-	ISelectionProvider selectionProvider;
-
-	/**
-	 * NavigatorDragAction constructor comment.
-	 */
-	public PluginsDragAdapter(ISelectionProvider provider) {
-		selectionProvider = provider;
-	}
-
-	/**
-	 * Returns the data to be transferred in a drag and drop
-	 * operation.
-	 */
-	public void dragSetData(DragSourceEvent event) {
-
-		//resort to a file transfer
-		if (!FileTransfer.getInstance().isSupportedType(event.dataType))
-			return;
-
-		FileAdapter[] files = getSelectedFiles();
-
-		// Get the path of each file and set as the drag data
-		final int len = files.length;
-		String[] fileNames = new String[len];
-		for (int i = 0, length = len; i < length; i++) {
-			fileNames[i] = files[i].getFile().getAbsolutePath();
-		}
-		event.data = fileNames;
-	}
-	/**
-	 * All selection must be files or folders.
-	 */
-	public void dragStart(DragSourceEvent event) {
-
-		// Workaround for 1GEUS9V
-		DragSource dragSource = (DragSource) event.widget;
-		Control control = dragSource.getControl();
-		if (control != control.getDisplay().getFocusControl()) {
-			event.doit = false;
-			return;
-		}
-		
-		FileAdapter [] files = getSelectedFiles();
-		
-		if (files.length==0) {
-			event.doit = false;
-			return;
-		}
-		event.doit = true;
-	}
-	private FileAdapter [] getSelectedFiles() {
-		IStructuredSelection selection = (IStructuredSelection)selectionProvider.getSelection();
-		ArrayList files = new ArrayList();
-		for (Iterator iter=selection.iterator(); iter.hasNext();) {
-			Object obj = iter.next();
-			if (obj instanceof FileAdapter)
-				files.add(obj);
-			else
-				return new FileAdapter[0];
-		}
-		return (FileAdapter[])files.toArray(new FileAdapter[files.size()]);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/PluginsLabelProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/PluginsLabelProvider.java
deleted file mode 100644
index f1ebd48..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/PluginsLabelProvider.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.view;
-
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.*;
-import org.eclipse.ui.ide.*;
-
-public class PluginsLabelProvider extends LabelProvider {
-	private PDELabelProvider sharedProvider;
-	private Image projectImage;
-	private Image folderImage;
-
-	/**
-	 * Constructor for PluginsLabelProvider.
-	 */
-	public PluginsLabelProvider() {
-		super();
-		sharedProvider = PDEPlugin.getDefault().getLabelProvider();
-		folderImage =
-			PlatformUI.getWorkbench().getSharedImages().getImage(
-				ISharedImages.IMG_OBJ_FOLDER);
-		projectImage =
-			PlatformUI.getWorkbench().getSharedImages().getImage(
-				IDE.SharedImages.IMG_OBJ_PROJECT);
-		sharedProvider.connect(this);
-	}
-
-	public void dispose() {
-		sharedProvider.disconnect(this);
-		super.dispose();
-	}
-
-	public String getText(Object obj) {
-		if (obj instanceof ModelEntry) {
-			return getText((ModelEntry) obj);
-		}
-		if (obj instanceof FileAdapter) {
-			return getText((FileAdapter) obj);
-		}
-		if (obj instanceof IPackageFragmentRoot) {
-			// use the short name
-			IPath path = ((IPackageFragmentRoot) obj).getPath();
-			return path.lastSegment();
-		}
-		if (obj instanceof IJavaElement) {
-			return ((IJavaElement) obj).getElementName();
-		}
-		if (obj instanceof IStorage) {
-			return ((IStorage) obj).getName();
-		}
-		return super.getText(obj);
-	}
-
-	public Image getImage(Object obj) {
-		if (obj instanceof ModelEntry) {
-			return getImage((ModelEntry) obj);
-		}
-		if (obj instanceof FileAdapter) {
-			return getImage((FileAdapter) obj);
-		}
-		if (obj instanceof IPackageFragmentRoot) {
-			IPackageFragmentRoot root = (IPackageFragmentRoot) obj;
-			boolean hasSource = false;
-			
-			try {
-				hasSource = root.getSourceAttachmentPath() != null;
-			}
-			catch (JavaModelException e) {
-			}
-			return JavaUI.getSharedImages().getImage(
-				hasSource
-					? org
-						.eclipse
-						.jdt
-						.ui
-						.ISharedImages
-						.IMG_OBJS_EXTERNAL_ARCHIVE_WITH_SOURCE
-					: org.eclipse.jdt.ui.ISharedImages.IMG_OBJS_EXTERNAL_ARCHIVE);
-		}
-		if (obj instanceof IPackageFragment) {
-			return JavaUI.getSharedImages().getImage(
-				org.eclipse.jdt.ui.ISharedImages.IMG_OBJS_PACKAGE);
-		}
-		if (obj instanceof ICompilationUnit) {
-			return JavaUI.getSharedImages().getImage(
-				org.eclipse.jdt.ui.ISharedImages.IMG_OBJS_CUNIT);
-		}
-		if (obj instanceof IClassFile) {
-			return JavaUI.getSharedImages().getImage(
-				org.eclipse.jdt.ui.ISharedImages.IMG_OBJS_CFILE);
-		}
-		if (obj instanceof IStorage) {
-			String name = ((IStorage) obj).getName();
-			return getFileImage(name);
-		}
-		return null;
-	}
-
-	private String getText(ModelEntry entry) {
-		IPluginModelBase model = entry.getActiveModel();
-		String text = sharedProvider.getText(model);
-		if (model.isEnabled() == false)
-			text = NLS.bind(PDEUIMessages.PluginsView_disabled, text); 
-		return text;
-	}
-
-	private String getText(FileAdapter file) {
-		return file.getFile().getName();
-	}
-
-	private Image getImage(ModelEntry entry) {
-		IPluginModelBase model = entry.getActiveModel();
-		if (model.getUnderlyingResource() != null)
-			return projectImage;
-		if (model instanceof IPluginModel)
-			return sharedProvider.getObjectImage(
-				(IPlugin) model.getPluginBase(),
-				true,
-				entry.isInJavaSearch());
-		return sharedProvider.getObjectImage(
-			(IFragment) model.getPluginBase(),
-			true,
-			entry.isInJavaSearch());
-	}
-
-	private Image getImage(FileAdapter fileAdapter) {
-		if (fileAdapter.isDirectory()) {
-			return folderImage;
-		}
-		return getFileImage(fileAdapter.getFile().getName());
-	}
-
-	private Image getFileImage(String fileName) {
-		ImageDescriptor desc =
-			PlatformUI.getWorkbench().getEditorRegistry().getImageDescriptor(
-				fileName);
-		return sharedProvider.get(desc);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/PluginsView.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/PluginsView.java
deleted file mode 100644
index 0ea1247..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/PluginsView.java
+++ /dev/null

@@ -1,975 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.view;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Set;
-
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jdt.ui.actions.OpenAction;
-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.IDialogSettings;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-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.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.core.plugin.IPluginBase;
-import org.eclipse.pde.core.plugin.IPluginImport;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.EntryFileAdapter;
-import org.eclipse.pde.internal.core.FileAdapter;
-import org.eclipse.pde.internal.core.ModelEntry;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.PluginModelManager;
-import org.eclipse.pde.internal.core.plugin.WorkspacePluginModelBase;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.editor.JarEntryEditorInput;
-import org.eclipse.pde.internal.ui.editor.SystemFileEditorInput;
-import org.eclipse.pde.internal.ui.editor.plugin.ManifestEditor;
-import org.eclipse.pde.internal.ui.preferences.MainPreferencePage;
-import org.eclipse.pde.internal.ui.search.PluginSearchActionGroup;
-import org.eclipse.pde.internal.ui.wizards.ListUtil;
-import org.eclipse.pde.internal.ui.wizards.imports.PluginImportOperation;
-import org.eclipse.pde.internal.ui.wizards.imports.PluginImportWizard;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.FileTransfer;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.program.Program;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.ActionContext;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.part.DrillDownAdapter;
-import org.eclipse.ui.part.ViewPart;
-
-public class PluginsView extends ViewPart {
-	private static final String DEFAULT_EDITOR_ID = "org.eclipse.ui.DefaultTextEditor"; //$NON-NLS-1$
-	private TreeViewer treeViewer;
-	private DrillDownAdapter drillDownAdapter;
-	private IPropertyChangeListener propertyListener;
-	private Action openAction;
-	private Action importBinaryAction;
-	private Action importSourceAction;
-	private Action disabledFilterAction;
-	private Action workspaceFilterAction;
-	private Action openManifestAction;
-	private Action openSchemaAction;
-	private Action openSystemEditorAction;
-	private Action openClassFileAction;
-	private Action openDependenciesAdapter;
-	private OpenDependenciesAction openDependenciesAction;
-	private Action openTextEditorAction;
-	private Action selectDependentAction;
-	private Action selectInJavaSearchAction;
-	private Action addToJavaSearchAction;
-	private Action removeFromJavaSearchAction;
-	private Action selectAllAction;
-    private CollapseAllAction collapseAllAction;
-	private ShowInWorkspaceAction showInNavigatorAction;
-	private ShowInWorkspaceAction showInPackagesAction;
-	private DisabledFilter disabledFilter = new DisabledFilter();
-	private WorkspaceFilter workspaceFilter = new WorkspaceFilter();
-	private JavaFilter javaFilter = new JavaFilter();
-	private CopyToClipboardAction copyAction;
-	private Clipboard clipboard;
-
-	class DisabledFilter extends ViewerFilter {
-		public boolean select(Viewer v, Object parent, Object element) {
-			if (element instanceof ModelEntry) {
-				ModelEntry entry = (ModelEntry) element;
-				if (entry.getWorkspaceModel() == null) {
-					IPluginModelBase externalModel = entry.getExternalModel();
-					if (externalModel != null)
-						return externalModel.isEnabled();
-				}
-			}
-			return true;
-		}
-	}
-
-	class WorkspaceFilter extends ViewerFilter {
-		public boolean select(Viewer v, Object parent, Object element) {
-			if (element instanceof ModelEntry) {
-				ModelEntry entry = (ModelEntry) element;
-				return entry.getWorkspaceModel() == null;
-			}
-			return true;
-		}
-	}
-
-	class JavaFilter extends ViewerFilter {
-		public boolean select(Viewer v, Object parent, Object element) {
-			if (element instanceof IPackageFragment) {
-				IPackageFragment packageFragment = (IPackageFragment) element;
-				try {
-					return packageFragment.hasChildren();
-				} catch (JavaModelException e) {
-					return false;
-				}
-			}
-			return true;
-		}
-	}
-
-    class CollapseAllAction extends Action {
-        public CollapseAllAction() {
-            super();
-            setText(PDEUIMessages.PluginsView_CollapseAllAction_label); 
-            setDescription(PDEUIMessages.PluginsView_CollapseAllAction_description); 
-            setToolTipText(PDEUIMessages.PluginsView_CollapseAllAction_tooltip); 
-            setImageDescriptor(PDEPluginImages.DESC_COLLAPSE_ALL);
-        }
-
-        /*
-         * (non-Javadoc)
-         * 
-         * @see org.eclipse.jface.action.Action#run()
-         */
-        public void run() {
-            super.run();
-            treeViewer.collapseAll();
-        }
-    }
-    
-	/**
-	 * Constructor for PluginsView.
-	 */
-	public PluginsView() {
-		propertyListener = new IPropertyChangeListener() {
-			public void propertyChange(PropertyChangeEvent event) {
-				String property = event.getProperty();
-				if (property.equals(MainPreferencePage.PROP_SHOW_OBJECTS)) {
-					treeViewer.refresh();
-				}
-			}
-		};
-	}
-
-	public void dispose() {
-		PDEPlugin
-			.getDefault()
-			.getPreferenceStore()
-			.removePropertyChangeListener(
-			propertyListener);
-		openDependenciesAction.dispose();
-		if (clipboard!=null) {
-			clipboard.dispose();
-			clipboard=null;
-		}
-		super.dispose();
-	}
-
-	/**
-	 * @see IWorkbenchPart#createPartControl(Composite)
-	 */
-	public void createPartControl(Composite parent) {
-		treeViewer =
-			new TreeViewer(parent, SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL);
-		drillDownAdapter = new DrillDownAdapter(treeViewer);
-		PluginModelManager manager = PDECore.getDefault().getModelManager();
-		treeViewer.setContentProvider(
-			new PluginsContentProvider(this, manager));
-		treeViewer.setLabelProvider(new PluginsLabelProvider());
-		treeViewer.setSorter(ListUtil.PLUGIN_SORTER);
-		initDragAndDrop();
-		makeActions();
-		initFilters();
-		IActionBars actionBars = getViewSite().getActionBars();
-		contributeToActionBars(actionBars);
-		registerGlobalActions(actionBars);
-		hookContextMenu();
-		hookDoubleClickAction();
-		treeViewer
-			.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent e) {
-				handleSelectionChanged(e.getSelection());
-			}
-		});
-		treeViewer.setInput(manager);
-		PDEPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(
-			propertyListener);
-		getViewSite().setSelectionProvider(treeViewer);
-
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(
-			treeViewer.getControl(),
-			IHelpContextIds.PLUGINS_VIEW);
-	}
-
-	private void contributeToActionBars(IActionBars actionBars) {
-		contributeToLocalToolBar(actionBars.getToolBarManager());
-		contributeToDropDownMenu(actionBars.getMenuManager());
-	}
-
-	private void contributeToDropDownMenu(IMenuManager manager) {
-		manager.add(workspaceFilterAction);
-		manager.add(disabledFilterAction);
-	}
-
-	private void contributeToLocalToolBar(IToolBarManager manager) {
- 		drillDownAdapter.addNavigationActions(manager);
-        manager.add(new Separator());
-        manager.add(collapseAllAction);
-	}
-	
-	private void registerGlobalActions(IActionBars actionBars) {
-			actionBars.setGlobalActionHandler(ActionFactory.SELECT_ALL.getId(),
-                selectAllAction);
-	}
-	private void makeActions() {
-		clipboard = new Clipboard(treeViewer.getTree().getDisplay());
-		openAction = new Action() {
-			public void run() {
-				handleDoubleClick();
-			}
-		};
-		openAction.setText(PDEUIMessages.PluginsView_open); 
-
-		openDependenciesAction = new OpenDependenciesAction();
-		openDependenciesAction.init(PDEPlugin.getActiveWorkbenchWindow());
-		openDependenciesAdapter = new Action() {
-			public void run() {
-				ModelEntry entry = getEnclosingEntry();
-				IPluginModelBase model = entry.getActiveModel();
-				openDependenciesAction.selectionChanged(
-					this,
-					new StructuredSelection(model));
-				openDependenciesAction.run(this);
-			}
-		};
-		openDependenciesAdapter.setText(PDEUIMessages.PluginsView_openDependencies); 
-
-		importBinaryAction = new Action() {
-			public void run() {
-				handleImport(false);
-			}
-		};
-		importBinaryAction.setText(PDEUIMessages.PluginsView_asBinaryProject); 
-		importSourceAction = new Action() {
-			public void run() {
-				handleImport(true);
-			}
-		};
-		importSourceAction.setText(PDEUIMessages.PluginsView_asSourceProject); 
-		disabledFilterAction = new Action() {
-			public void run() {
-				boolean checked = disabledFilterAction.isChecked();
-				if (checked)
-					treeViewer.removeFilter(disabledFilter);
-				else
-					treeViewer.addFilter(disabledFilter);
-				getSettings().put("disabledFilter", !checked); //$NON-NLS-1$
-			}
-		};
-		disabledFilterAction.setText(PDEUIMessages.PluginsView_showDisabled); 
-		disabledFilterAction.setChecked(false);
-		workspaceFilterAction = new Action() {
-			public void run() {
-				boolean checked = workspaceFilterAction.isChecked();
-				if (checked)
-					treeViewer.removeFilter(workspaceFilter);
-				else
-					treeViewer.addFilter(workspaceFilter);
-				getSettings().put("workspaceFilter", !checked); //$NON-NLS-1$
-			}
-		};
-		workspaceFilterAction.setText(PDEUIMessages.PluginsView_showWorkspace); 
-		workspaceFilterAction.setChecked(true);
-
-		openTextEditorAction = new Action() {
-			public void run() {
-				handleOpenTextEditor(getSelectedFile(), null);
-			}
-		};
-		openTextEditorAction.setText(PDEUIMessages.PluginsView_textEditor); 
-		openTextEditorAction.setImageDescriptor(
-			PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(
-				ISharedImages.IMG_OBJ_FILE));
-
-		openSystemEditorAction = new Action() {
-			public void run() {
-				handleOpenSystemEditor(getSelectedFile());
-			}
-		};
-		openSystemEditorAction.setText(PDEUIMessages.PluginsView_systemEditor); 
-		openManifestAction = new Action() {
-			public void run() {
-				handleOpenManifestEditor(getSelectedFile());
-			}
-		};
-		openManifestAction.setText(PDEUIMessages.PluginsView_manifestEditor); 
-		
-		openSchemaAction = new Action() {
-			public void run() {
-				handleOpenSchemaEditor(getSelectedFile());
-			}
-		};
-		openSchemaAction.setText(PDEUIMessages.PluginsView_schemaEditor); 
-
-		copyAction = new CopyToClipboardAction(clipboard);
-		copyAction.setText(PDEUIMessages.PluginsView_copy); 
-
-		selectDependentAction = new Action() {
-			public void run() {
-				handleSelectDependent();
-			}
-		};
-		selectDependentAction.setText(PDEUIMessages.PluginsView_dependentPlugins); 
-		
-		selectInJavaSearchAction = new Action() {
-			public void run() {
-				handleSelectInJavaSearch();
-			}
-		};
-		selectInJavaSearchAction.setText(PDEUIMessages.PluginsView_pluginsInJavaSearch); 
-		
-		selectAllAction = new Action() {
-	        public void run() {
-	            super.run();
-	            treeViewer.getTree().selectAll();
-	        }
-		};
-		selectAllAction.setText(PDEUIMessages.PluginsView_SelectAllAction_label); 
-		
-		addToJavaSearchAction = new Action() {
-			public void run() {
-				handleJavaSearch(true);
-			}
-		};
-		addToJavaSearchAction.setText(PDEUIMessages.PluginsView_addToJavaSearch); 
-
-		removeFromJavaSearchAction = new Action() {
-			public void run() {
-				handleJavaSearch(false);
-			}
-		};
-		removeFromJavaSearchAction.setText(PDEUIMessages.PluginsView_removeFromJavaSearch); 
-
-		showInNavigatorAction =
-			new ShowInWorkspaceAction(IPageLayout.ID_RES_NAV, treeViewer);
-		showInNavigatorAction.setText(PDEUIMessages.PluginsView_showInNavigator); 
-		showInPackagesAction =
-			new ShowInWorkspaceAction(JavaUI.ID_PACKAGES, treeViewer);
-		showInPackagesAction.setText(PDEUIMessages.PluginsView_showInPackageExplorer); 
-        
-        collapseAllAction = new CollapseAllAction();
-
-		openClassFileAction = new OpenAction(getViewSite());
-	}
-
-	private FileAdapter getSelectedFile() {
-		Object obj = getSelectedObject();
-		if (obj instanceof FileAdapter)
-			return (FileAdapter) obj;
-		return null;
-	}
-
-	private ModelEntry getEnclosingEntry() {
-		Object obj = getSelectedObject();
-		if (obj == null)
-			return null;
-		if (obj instanceof ModelEntry)
-			return (ModelEntry) obj;
-		if (obj instanceof FileAdapter) {
-			FileAdapter file = (FileAdapter) obj;
-			if (file.isManifest()) {
-				FileAdapter parent = file.getParent();
-				if (parent instanceof EntryFileAdapter)
-					return ((EntryFileAdapter) parent).getEntry();
-			}
-		}
-		return null;
-	}
-
-	private Object getSelectedObject() {
-		IStructuredSelection selection =
-			(IStructuredSelection) treeViewer.getSelection();
-		if (selection.isEmpty() || selection.size() != 1)
-			return null;
-		return selection.getFirstElement();
-	}
-	private void fillContextMenu(IMenuManager manager) {
-		IStructuredSelection selection =
-			(IStructuredSelection) treeViewer.getSelection();
-
-		if (selection.size() == 1) {
-			Object sobj = selection.getFirstElement();
-			boolean addSeparator = false;
-            if (sobj instanceof ModelEntry) {
-                ModelEntry entry = (ModelEntry) sobj;
-                IPluginModelBase model = entry.getActiveModel();
-                File file = new File(model.getInstallLocation());
-                if (file.isFile() || model.getUnderlyingResource() != null) {
-                    manager.add(openAction);
-                }
-            }
-			if (sobj instanceof FileAdapter
-				&& ((FileAdapter) sobj).isDirectory() == false) {
-				manager.add(openAction);
-				MenuManager openWithMenu = new MenuManager(PDEUIMessages.PluginsView_openWith); 
-				fillOpenWithMenu(openWithMenu, sobj);
-				manager.add(openWithMenu);
-				addSeparator = true;
-			}
-			if (sobj instanceof IStorage) {
-				manager.add(openAction);
-				addSeparator = true;
-			}
-			if (sobj instanceof IClassFile) {
-				manager.add(openClassFileAction);
-				addSeparator = true;
-			}
-			ModelEntry entry = getEnclosingEntry();
-			if (entry != null) {
-				manager.add(openDependenciesAdapter);
-				manager.add(new Separator());
-				PluginSearchActionGroup actionGroup =
-					new PluginSearchActionGroup();
-				actionGroup.setContext(new ActionContext(selection));
-				actionGroup.fillContextMenu(manager);
-				addSeparator = true;
-			}
-			if (addSeparator)
-				manager.add(new Separator());
-		}
-		if (selection.size() > 0) {
-			boolean addSeparator = false;
-			if (showInNavigatorAction.isApplicable()) {
-				manager.add(showInNavigatorAction);
-				addSeparator = true;
-			}
-			if (showInPackagesAction.isApplicable()) {
-				manager.add(showInPackagesAction);
-				addSeparator = true;
-			}
-			if (addSeparator) {
-				manager.add(new Separator());
-			}
-			if (canImport(selection)) {
-				MenuManager importMenu = new MenuManager(PDEUIMessages.PluginsView_import); 
-				importMenu.add(importBinaryAction);
-				importMenu.add(importSourceAction);
-				manager.add(importMenu);
-				manager.add(new Separator());
-			}
-			addSeparator = false;
-			if (canDoJavaSearchOperation(selection, true)) {
-				manager.add(addToJavaSearchAction);
-				addSeparator = true;
-			}
-			if (canDoJavaSearchOperation(selection, false)) {
-				manager.add(removeFromJavaSearchAction);
-				addSeparator = true;
-			}
-			if (addSeparator) {
-				manager.add(new Separator());
-			}
-		}
-		copyAction.setSelection(selection);
-		manager.add(copyAction);
-		IMenuManager selectionMenu = new MenuManager(PDEUIMessages.PluginsView_select); 
-		manager.add(selectionMenu);
-		if (selection.size() > 0)
-			selectionMenu.add(selectDependentAction);
-		selectionMenu.add(selectInJavaSearchAction);
-		selectionMenu.add(selectAllAction);
-		manager.add(new Separator());
-		drillDownAdapter.addNavigationActions(manager);
-		manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-	}
-	private void fillOpenWithMenu(IMenuManager manager, Object obj) {
-		FileAdapter adapter = (FileAdapter) obj;
-		String editorId = adapter.getEditorId();
-
-		String fileName = adapter.getFile().getName();
-		String lcFileName = fileName.toLowerCase(Locale.ENGLISH);
-		ImageDescriptor desc =
-			PlatformUI.getWorkbench().getEditorRegistry().getImageDescriptor(
-				fileName);
-		if (lcFileName.equals("plugin.xml") //$NON-NLS-1$
-		|| lcFileName.equals("fragment.xml") //$NON-NLS-1$
-		|| lcFileName.equals("manifest.mf")) { //$NON-NLS-1$
-			openManifestAction.setImageDescriptor(desc);
-			manager.add(openManifestAction);
-			manager.add(new Separator());
-			openManifestAction.setChecked(
-				editorId != null
-					&& editorId.equals(PDEPlugin.MANIFEST_EDITOR_ID));
-		}
-		if (lcFileName.endsWith(".mxsd") || lcFileName.endsWith(".exsd")) { //$NON-NLS-1$ //$NON-NLS-2$
-			openSchemaAction.setImageDescriptor(desc);
-			manager.add(openSchemaAction);
-			manager.add(new Separator());
-			openSchemaAction.setChecked(
-				editorId != null 
-					&& editorId.equals(PDEPlugin.SCHEMA_EDITOR_ID));
-		}
-		manager.add(openTextEditorAction);
-		openTextEditorAction.setChecked(
-			editorId == null || editorId.equals(DEFAULT_EDITOR_ID));
-		openSystemEditorAction.setImageDescriptor(desc);
-		openSystemEditorAction.setChecked(editorId != null && editorId.equals("@system")); //$NON-NLS-1$
-		manager.add(openSystemEditorAction);
-	}
-
-	private boolean canImport(IStructuredSelection selection) {
-		int nexternal = 0;
-		for (Iterator iter = selection.iterator(); iter.hasNext();) {
-			Object obj = iter.next();
-			if (obj instanceof ModelEntry) {
-				ModelEntry entry = (ModelEntry) obj;
-				if (entry.getWorkspaceModel() == null)
-					nexternal++;
-			} else
-				return false;
-		}
-		return nexternal > 0;
-	}
-
-	private boolean canDoJavaSearchOperation(
-		IStructuredSelection selection,
-		boolean add) {
-		int nhits = 0;
-		for (Iterator iter = selection.iterator(); iter.hasNext();) {
-			Object obj = iter.next();
-			if (obj instanceof ModelEntry) {
-				ModelEntry entry = (ModelEntry) obj;
-				if (entry.getWorkspaceModel() == null) {
-					if (add && entry.isInJavaSearch() == false)
-						nhits++;
-					if (!add && entry.isInJavaSearch())
-						nhits++;
-				}
-			}
-		}
-		return nhits > 0;
-	}
-
-	protected void initDragAndDrop() {
-		int ops = DND.DROP_COPY | DND.DROP_MOVE;
-		Transfer[] transfers = new Transfer[] { FileTransfer.getInstance()};
-		treeViewer.addDragSupport(
-			ops,
-			transfers,
-			new PluginsDragAdapter(treeViewer));
-	}
-
-	private IDialogSettings getSettings() {
-		IDialogSettings master = PDEPlugin.getDefault().getDialogSettings();
-		IDialogSettings section = master.getSection("pluginsView"); //$NON-NLS-1$
-		if (section == null) {
-			section = master.addNewSection("pluginsView"); //$NON-NLS-1$
-		}
-		return section;
-	}
-
-	private void initFilters() {
-		boolean workspace = false;
-		boolean disabled = true;
-		IDialogSettings settings = getSettings();
-		workspace = settings.getBoolean("workspaceFilter"); //$NON-NLS-1$
-		disabled = !settings.getBoolean("disabledFilter"); //$NON-NLS-1$
-		if (workspace)
-			treeViewer.addFilter(workspaceFilter);
-		if (disabled)
-			treeViewer.addFilter(disabledFilter);
-		treeViewer.addFilter(javaFilter);
-		workspaceFilterAction.setChecked(!workspace);
-		disabledFilterAction.setChecked(!disabled);
-	}
-
-	private void hookContextMenu() {
-		MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
-		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(new IMenuListener() {
-			public void menuAboutToShow(IMenuManager manager) {
-				PluginsView.this.fillContextMenu(manager);
-			}
-		});
-		Menu menu = menuMgr.createContextMenu(treeViewer.getControl());
-		treeViewer.getControl().setMenu(menu);
-		getSite().registerContextMenu(menuMgr, treeViewer);
-	}
-
-	private void handleDoubleClick() {
-		Object obj = getSelectedObject();
-		if (obj instanceof ModelEntry) {
-            boolean expanded = treeViewer.getExpandedState(obj);
-            treeViewer.setExpandedState(obj, !expanded);
-            if (treeViewer.getExpandedState(obj) == expanded) {
-                // not expandable, open editor
-                ModelEntry modelEntry = (ModelEntry) obj;
-                ManifestEditor.openPluginEditor(modelEntry.getId());
-            }
-		}
-		if (obj instanceof FileAdapter) {
-			FileAdapter adapter = (FileAdapter) obj;
-			if (adapter.isDirectory()) {
-				treeViewer.setExpandedState(
-					adapter,
-					!treeViewer.getExpandedState(adapter));
-				return;
-			}
-			String editorId = adapter.getEditorId();
-			if (editorId != null && editorId.equals("@system")) //$NON-NLS-1$
-				handleOpenSystemEditor(adapter);
-			else
-				handleOpenTextEditor(adapter, editorId);
-		}
-		if (obj instanceof IClassFile) {
-			openClassFileAction.run();
-		}
-		if (obj instanceof IStorage) {
-			handleOpenStorage((IStorage) obj);
-		}
-	}
-
-	private void handleOpenStorage(IStorage obj) {
-		IWorkbenchPage page = PDEPlugin.getActivePage();
-		IEditorInput input = new JarEntryEditorInput(obj);
-		try {
-			page.openEditor(input, DEFAULT_EDITOR_ID);
-		} catch (PartInitException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	private void handleImport(boolean extractSource) {
-		IStructuredSelection selection =
-			(IStructuredSelection) treeViewer.getSelection();
-		ArrayList externalModels = new ArrayList();
-		for (Iterator iter = selection.iterator(); iter.hasNext();) {
-			ModelEntry entry = (ModelEntry) iter.next();
-			if (entry.getWorkspaceModel() != null)
-				continue;
-			externalModels.add(entry.getExternalModel());
-		}
-		IPluginModelBase[] models =
-			(IPluginModelBase[]) externalModels.toArray(
-				new IPluginModelBase[externalModels.size()]);
-		try {
-			Shell shell = treeViewer.getTree().getShell();
-			int importType =
-				extractSource
-					? PluginImportOperation.IMPORT_WITH_SOURCE
-					: PluginImportOperation.IMPORT_BINARY;
-					
-			IRunnableWithProgress op =
-				PluginImportWizard.getImportOperation(
-					shell,
-					importType,
-					models,
-					false);
-			PlatformUI.getWorkbench().getProgressService().busyCursorWhile(op);
-		} catch (InterruptedException e) {
-		} catch (InvocationTargetException e) {
-			PDEPlugin.logException(e);
-		} catch (Exception e) {
-		}
-	}
-
-	private void handleJavaSearch(final boolean add) {
-		IStructuredSelection selection =
-			(IStructuredSelection) treeViewer.getSelection();
-		if (selection.size() == 0)
-			return;
-
-		ArrayList result = new ArrayList();
-
-		for (Iterator iter = selection.iterator(); iter.hasNext();) {
-			ModelEntry entry = (ModelEntry) iter.next();
-			if (entry.getWorkspaceModel() != null)
-				continue;
-			if (entry.isInJavaSearch() == !add)
-				result.add(entry);
-		}
-		if (result.size() == 0)
-			return;
-		final ModelEntry[] array =
-			(ModelEntry[]) result.toArray(new ModelEntry[result.size()]);
-
-		IRunnableWithProgress op = new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor)
-				throws InvocationTargetException {
-				PluginModelManager manager =
-					PDECore.getDefault().getModelManager();
-				try {
-					manager.setInJavaSearch(array, add, monitor);
-				} catch (CoreException e) {
-					throw new InvocationTargetException(e);
-				} finally {
-					monitor.done();
-				}
-			}
-		};
-
-		try {
-			PlatformUI.getWorkbench().getProgressService().busyCursorWhile(op);
-		} catch (InterruptedException e) {
-		} catch (InvocationTargetException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	private void handleSelectDependent() {
-		IStructuredSelection selection =
-			(IStructuredSelection) treeViewer.getSelection();
-		if (selection.size() == 0)
-			return;
-		HashSet set = new HashSet();
-		for (Iterator iter = selection.iterator(); iter.hasNext();) {
-			ModelEntry entry = (ModelEntry) iter.next();
-			set.add(entry);
-			addDependentEntries(entry, set);
-		}
-		treeViewer.setSelection(new StructuredSelection(set.toArray()));
-	}
-	private void handleSelectInJavaSearch() {
-		PluginsContentProvider provider =
-			(PluginsContentProvider) treeViewer.getContentProvider();
-		Object[] elements = provider.getElements(treeViewer.getInput());
-		ArrayList result = new ArrayList();
-		for (int i = 0; i < elements.length; i++) {
-			Object element = elements[i];
-			if (element instanceof ModelEntry) {
-				ModelEntry entry = (ModelEntry) element;
-				if (entry.isInJavaSearch())
-					result.add(entry);
-			}
-		}
-		treeViewer.setSelection(new StructuredSelection(result.toArray()));
-	}
-
-	private void addDependentEntries(ModelEntry entry, Set set) {
-		if (entry.isEmpty()
-			|| entry.getActiveModel() instanceof WorkspacePluginModelBase)
-			return;
-		IPluginModelBase model = entry.getExternalModel();
-		if (model == null)
-			return;
-		IPluginBase plugin = model.getPluginBase();
-		if (plugin == null)
-			return;
-		IPluginImport[] iimports = plugin.getImports();
-		PluginModelManager manager = PDECore.getDefault().getModelManager();
-		for (int i = 0; i < iimports.length; i++) {
-			IPluginImport iimport = iimports[i];
-			ModelEntry ientry =
-				manager.findEntry(iimport.getId());
-			if (ientry != null) {
-				set.add(ientry);
-				addDependentEntries(ientry, set);
-			}
-		}
-	}
-
-	private void handleOpenTextEditor(FileAdapter adapter, String editorId) {
-		if (adapter == null)
-			return;
-		IWorkbenchPage page = PDEPlugin.getActivePage();
-		if (editorId == null) {
-			if (adapter.isManifest())
-				editorId = PDEPlugin.MANIFEST_EDITOR_ID;
-			else if (adapter.isSchema())
-				editorId = PDEPlugin.SCHEMA_EDITOR_ID;
-		}
-		try {
-			if (editorId == null || editorId.equals("@system")) //$NON-NLS-1$
-				editorId = DEFAULT_EDITOR_ID;
-			page.openEditor(
-				new SystemFileEditorInput(adapter.getFile()),
-				editorId);
-			adapter.setEditorId(editorId);
-		} catch (PartInitException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	private void handleOpenManifestEditor(FileAdapter adapter) {
-		handleOpenTextEditor(adapter, PDEPlugin.MANIFEST_EDITOR_ID);
-	}
-	
-	private void handleOpenSchemaEditor(FileAdapter adapter) {
-		handleOpenTextEditor(adapter, PDEPlugin.SCHEMA_EDITOR_ID);
-	}
-
-	private void handleOpenSystemEditor(FileAdapter adapter) {
-		if (adapter == null)
-			return;
-		File localFile = null;
-
-		try {
-			localFile = getLocalCopy(adapter.getFile());
-		} catch (IOException e) {
-			PDEPlugin.logException(e);
-			return;
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-		// Start busy indicator.
-		final File file = localFile;
-		final boolean result[] = new boolean[1];
-		BusyIndicator
-			.showWhile(treeViewer.getTree().getDisplay(), new Runnable() {
-			public void run() {
-				// Open file using shell.
-				String path = file.getAbsolutePath();
-				result[0] = Program.launch(path);
-			}
-		});
-
-		// ShellExecute returns whether call was successful
-		if (!result[0]) {
-			PDEPlugin.logException(
-				new PartInitException(
-					NLS.bind(PDEUIMessages.PluginsView_unableToOpen, file.getName())));
-		} else {
-			adapter.setEditorId("@system"); //$NON-NLS-1$
-		}
-	}
-
-	private File getLocalCopy(File file) throws IOException, CoreException {
-		// create a tmp. copy of this file and make it
-		// read-only. This is to ensure that the original
-		// file belonging to the external plug-in directories
-		// will not be modified. 
-		String fileName = file.getName();
-		String prefix;
-		String suffix = null;
-		int dotLoc = fileName.indexOf('.');
-		if (dotLoc != -1) {
-			prefix = fileName.substring(0, dotLoc);
-			suffix = fileName.substring(dotLoc);
-		} else {
-			prefix = fileName;
-		}
-
-		File tmpFile = File.createTempFile(prefix, suffix);
-		tmpFile.deleteOnExit();
-		FileOutputStream fos = new FileOutputStream(tmpFile);
-		FileInputStream fis = new FileInputStream(file);
-		byte[] cbuffer = new byte[1024];
-		int read = 0;
-
-		while (read != -1) {
-			read = fis.read(cbuffer);
-			if (read != -1)
-				fos.write(cbuffer, 0, read);
-		}
-		fos.flush();
-		fos.close();
-		fis.close();
-		tmpFile.setReadOnly();
-		return tmpFile;
-	}
-
-	private void handleSelectionChanged(ISelection selection) {
-		String text = ""; //$NON-NLS-1$
-		Object obj = getSelectedObject();
-		if (obj instanceof ModelEntry) {
-			IPluginModelBase model = ((ModelEntry) obj).getActiveModel();
-			text = model.getInstallLocation();
-		}
-		if (obj instanceof FileAdapter) {
-			text = ((FileAdapter) obj).getFile().getAbsolutePath();
-		}
-		getViewSite().getActionBars().getStatusLineManager().setMessage(text);
-	}
-	
-	private void hookDoubleClickAction() {
-		treeViewer.addDoubleClickListener(new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent event) {
-				handleDoubleClick();
-			}
-		});
-	}
-
-	/**
-	 * @see IWorkbenchPart#setFocus()
-	 */
-	public void setFocus() {
-		treeViewer.getTree().setFocus();
-	}
-	void updateTitle(Object newInput) {
-		IConfigurationElement config = getConfigurationElement();
-		if (config == null)
-			return;
-		
-		if (newInput == null
-			|| newInput.equals(PDECore.getDefault().getModelManager())) {
-			setContentDescription(""); //$NON-NLS-1$
-			// restore old
-			setTitleToolTip(getTitle());
-		} else {
-			String viewName = config.getAttribute("name"); //$NON-NLS-1$
-			String name = ((LabelProvider) treeViewer.getLabelProvider()).getText(newInput);
-			setContentDescription(viewName + ": " + name); //$NON-NLS-1$
-			setTitleToolTip(getInputPath(newInput));
-		}
-	}
-	private String getInputPath(Object input) {
-		if (input instanceof FileAdapter) {
-			return "file: " + ((FileAdapter) input).getFile().getAbsolutePath(); //$NON-NLS-1$
-		}
-		if (input instanceof ModelEntry) {
-			IPluginModelBase model = ((ModelEntry) input).getActiveModel();
-			return "plugin: " + model.getInstallLocation(); //$NON-NLS-1$
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/PluginsViewAdapterFactory.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/PluginsViewAdapterFactory.java
deleted file mode 100644
index 7dc3513..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/PluginsViewAdapterFactory.java
+++ /dev/null

@@ -1,45 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.view;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.pde.internal.core.*;
-
-public class PluginsViewAdapterFactory implements IAdapterFactory {
-	private FileAdapterPropertySource adapterPropertySource;
-	private ModelEntryPropertySource entryPropertySource;
-
-public Object getAdapter(Object adaptableObject, Class adapterType) {
-	if (adapterType.equals(IPropertySource.class)) return getProperties(adaptableObject);
-	return null;
-}
-
-public java.lang.Class[] getAdapterList() {
-	return new Class[] { IPropertySource.class };
-}
-
-private IPropertySource getProperties(Object object) {
-	if (object instanceof FileAdapter) {
-		if (adapterPropertySource==null)
-			adapterPropertySource = new FileAdapterPropertySource();
-		adapterPropertySource.setAdapter((FileAdapter)object);
-		return adapterPropertySource;
-	}
-	if (object instanceof ModelEntry) {
-		if (entryPropertySource==null)
-			entryPropertySource = new ModelEntryPropertySource();
-		entryPropertySource.setEntry((ModelEntry)object);
-		return entryPropertySource;
-	}
-	return null;
-}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/ShowInWorkspaceAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/ShowInWorkspaceAction.java
deleted file mode 100644
index 303383d..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/view/ShowInWorkspaceAction.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.view;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.*;
-import java.util.*;
-import org.eclipse.pde.internal.core.ModelEntry;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.ui.*;
-import org.eclipse.ui.part.ISetSelectionTarget;
-import org.eclipse.core.resources.IResource;
-
-public class ShowInWorkspaceAction extends Action {
-	private String viewId;
-	private ISelectionProvider provider;
-
-	/**
-	 * Constructor for ShowInWorkspaceAction.
-	 */
-	public ShowInWorkspaceAction(String viewId, ISelectionProvider provider) {
-		this.viewId = viewId;
-		this.provider = provider;
-	}
-
-	/**
-	 * Constructor for ShowInWorkspaceAction.
-	 * @param text
-	 */
-	protected ShowInWorkspaceAction(String text) {
-		super(text);
-	}
-
-	public boolean isApplicable() {
-		IStructuredSelection selection = (IStructuredSelection) provider.getSelection();
-		if (selection.isEmpty())
-			return false;
-		for (Iterator iter = selection.iterator(); iter.hasNext();) {
-			Object obj = iter.next();
-			if (!(obj instanceof ModelEntry))
-				return false;
-			ModelEntry entry = (ModelEntry) obj;
-			IPluginModelBase model = entry.getActiveModel();
-			if (model.getUnderlyingResource() == null)
-				return false;
-		}
-		return true;
-	}
-
-	public void run() {
-		List v = collectResources();
-		IWorkbenchPage page = PDEPlugin.getActivePage();
-		try {
-			IViewPart view = page.showView(viewId);
-			if (view instanceof ISetSelectionTarget) {
-				ISelection selection = new StructuredSelection(v);
-				((ISetSelectionTarget) view).selectReveal(selection);
-			}
-		} catch (PartInitException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	private List collectResources() {
-		ArrayList list = new ArrayList();
-		IStructuredSelection selection = (IStructuredSelection)provider.getSelection();
-		if (selection.isEmpty())
-			return list;
-		for (Iterator iter = selection.iterator(); iter.hasNext();) {
-			Object obj = iter.next();
-			if (obj instanceof ModelEntry) {
-				ModelEntry entry = (ModelEntry) obj;
-				IPluginModelBase model = entry.getActiveModel();
-				IResource resource = model.getUnderlyingResource();
-				if (resource != null)
-					list.add(resource);
-			}
-
-		}
-		return list;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/BaseWizardSelectionPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/BaseWizardSelectionPage.java
deleted file mode 100644
index 9b5d86f..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/BaseWizardSelectionPage.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards;
-
-import org.eclipse.jface.wizard.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.pde.internal.ui.parts.FormBrowser;
-
-public abstract class BaseWizardSelectionPage extends WizardSelectionPage
-		implements
-			ISelectionChangedListener {
-	private String label;
-	private FormBrowser descriptionBrowser;
-
-	public BaseWizardSelectionPage(String name, String label) {
-		super(name);
-		this.label = label;
-		descriptionBrowser = new FormBrowser(SWT.BORDER | SWT.V_SCROLL);
-		descriptionBrowser.setText(""); //$NON-NLS-1$
-	}
-	public void createDescriptionIn(Composite composite) {
-		descriptionBrowser.createControl(composite);
-		Control c = descriptionBrowser.getControl();
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.widthHint = 200;
-		c.setLayoutData(gd);
-	}
-
-	protected abstract IWizardNode createWizardNode(WizardElement element);
-	public String getLabel() {
-		return label;
-	}
-	public void setDescriptionText(String text) {
-		descriptionBrowser.setText(text);
-	}
-	public void setDescriptionEnabled(boolean enabled) {
-		Control dcontrol = descriptionBrowser.getControl();
-		if (dcontrol!=null)
-			dcontrol.setEnabled(enabled);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/Category.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/Category.java
deleted file mode 100644
index 8b9cdf6..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/Category.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards;
-
-import java.util.*;
-import org.eclipse.core.runtime.*;
-
-public class Category {
-	private IConfigurationElement config;
-	private String [] parentCategoryPath;
-	public static final String ATT_ID="id"; //$NON-NLS-1$
-	public static final String ATT_CATEGORY="parentCategory"; //$NON-NLS-1$
-	public static final String ATT_NAME="name"; //$NON-NLS-1$
-
-public Category(IConfigurationElement aConfig) {
-	config = aConfig;
-}
-public String getID() {
-	return config.getAttribute(ATT_ID);
-}
-public String getLabel() {
-	return config.getAttribute(ATT_NAME);
-}
-public String[] getParentCategoryPath() {
-	if (parentCategoryPath!=null) return parentCategoryPath;
-	String category = config.getAttribute(ATT_CATEGORY);
-	if (category==null) return null;
-	StringTokenizer stok = new StringTokenizer(category, "/"); //$NON-NLS-1$
-	parentCategoryPath = new String [stok.countTokens()];
-	for (int i=0; stok.hasMoreTokens(); i++) {
-		parentCategoryPath[i]=stok.nextToken();
-	}
-	return parentCategoryPath;
-	
-
-}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/FeatureSelectionDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/FeatureSelectionDialog.java
deleted file mode 100644
index 0e58e2f..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/FeatureSelectionDialog.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.wizards;
-
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.dialogs.ElementListSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-
-public class FeatureSelectionDialog extends ElementListSelectionDialog {
-
-	/**
-	 * @param parent
-	 * @param renderer
-	 */
-	public FeatureSelectionDialog(Shell parent, IFeatureModel[] models,
-			boolean multiSelect) {
-		super(parent, PDEPlugin.getDefault().getLabelProvider());
-		setTitle(PDEUIMessages.FeatureSelectionDialog_title); 
-		setMessage(PDEUIMessages.FeatureSelectionDialog_message); 
-		setElements(models);
-		setMultipleSelection(multiSelect);
-		PDEPlugin.getDefault().getLabelProvider().connect(this);
-	}
-
-	public boolean close() {
-		PDEPlugin.getDefault().getLabelProvider().disconnect(this);
-		return super.close();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.dialogs.AbstractElementListSelectionDialog#setValidator(org.eclipse.ui.dialogs.ISelectionStatusValidator)
-	 */
-	public void setValidator(ISelectionStatusValidator validator) {
-		super.setValidator(validator);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/FolderSelectionDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/FolderSelectionDialog.java
deleted file mode 100644
index 064eac7..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/FolderSelectionDialog.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.window.Window;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.util.*;
-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.widgets.*;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.NewFolderDialog;
-import org.eclipse.ui.views.navigator.ResourceSorter;
-
-public class FolderSelectionDialog extends ElementTreeSelectionDialog implements ISelectionChangedListener {
-
-	private Button fNewFolderButton;
-	private IContainer fSelectedContainer;
-
-	public FolderSelectionDialog(Shell parent, ILabelProvider labelProvider, ITreeContentProvider contentProvider) {
-		super(parent, labelProvider, contentProvider);
-		setSorter(new ResourceSorter(ResourceSorter.NAME));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		Composite result= (Composite)super.createDialogArea(parent);
-		
-		getTreeViewer().addSelectionChangedListener(this);
-		getTreeViewer().expandToLevel(2);
-		fNewFolderButton = new Button(result, SWT.PUSH);
-		fNewFolderButton.setText(PDEUIMessages.BuildEditor_SourceFolderSelectionDialog_button); 
-		fNewFolderButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				newFolderButtonPressed();
-			}
-		});
-		fNewFolderButton.setFont(parent.getFont());
-		fNewFolderButton.setLayoutData(new GridData());
-		SWTUtil.setButtonDimensionHint(fNewFolderButton);
-		
-		applyDialogFont(result);		
-		return result;
-	}
-
-	private void updateNewFolderButtonState() {
-		IStructuredSelection selection= (IStructuredSelection) getTreeViewer().getSelection();
-		fSelectedContainer= null;
-		if (selection.size() == 1) {
-			Object first= selection.getFirstElement();
-			if (first instanceof IContainer) {
-				fSelectedContainer= (IContainer) first;
-			}
-		}
-		fNewFolderButton.setEnabled(fSelectedContainer != null);
-	}	
-	
-	protected void newFolderButtonPressed() {
-		NewFolderDialog dialog= new NewFolderDialog(getShell(), fSelectedContainer);
-		if (dialog.open() == Window.OK) {
-			TreeViewer treeViewer= getTreeViewer();
-			treeViewer.refresh(fSelectedContainer);
-			Object createdFolder;
-			if (dialog.getResult()!=null){
-				createdFolder= dialog.getResult()[0];
-				treeViewer.reveal(createdFolder);
-				treeViewer.setSelection(new StructuredSelection(createdFolder));
-			} 
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
-	 */
-	public void selectionChanged(SelectionChangedEvent event) {
-		updateNewFolderButtonState();
-	}
-	
-	
-
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/IDefaultValueConsumer.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/IDefaultValueConsumer.java
deleted file mode 100644
index 7f964bc..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/IDefaultValueConsumer.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards;
-
-import java.util.Dictionary;
-
-
-/**
- * Wizards that implement this interface
- * can be initialized with the default values so that
- * their pages come preset.
- */
-public interface IDefaultValueConsumer {
-/**
- * Initializes the consumer with the values.
- * @param values
- */
-	void init(Dictionary values);
-/**
- * Returns the default value for the given key
- * @param key
- * @return the default value or <code>null</code> if not provided.
- */
-	String getDefaultValue(String key);
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/IProjectProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/IProjectProvider.java
deleted file mode 100644
index 7548c99..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/IProjectProvider.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards;
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-/**
- * This interface is used to insulate the client's wizards from the master
- * wizard that is responsible for creating the new project. Clients use this
- * interface to ask for the new project's name (without forcing the project
- * creation) and the project handle itself. Content wizards can use the project
- * name to construct default values for other name properties before the project
- * resource is being created.
- */
-public interface IProjectProvider {
-	/**
-	 * Returns the new plug-in project handle. This method will cause project
-	 * creation if not created already.
-	 * 
-	 * @return the handle of the new plug-in project
-	 */
-	IProject getProject();
-	/**
-	 * Returns the name of the plug-in project that will be created. This method
-	 * can be called at any time without forcing the project resource creation.
-	 * 
-	 * @return new project name
-	 */
-	String getProjectName();
-	/**
-	 * Returns an absolute path of the new plug-in project that will be created.
-	 * This method can be called at any time without forcing the project
-	 * resource creation.
-	 * 
-	 * @return absolute project location path
-	 */
-	IPath getLocationPath();
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/ListUtil.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/ListUtil.java
deleted file mode 100644
index 26634c8..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/ListUtil.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards;
-
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.ModelEntry;
-import org.eclipse.pde.internal.core.ifeature.*;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.elements.ElementLabelProvider;
-import org.eclipse.swt.graphics.Image;
-
-
-public class ListUtil {
-	static class NameSorter extends ViewerSorter {
-		public boolean isSorterProperty(Object element, Object propertyId) {
-			return propertyId.equals(IBasicPropertyConstants.P_TEXT);
-		}
-	}
-	static class FeatureSorter extends NameSorter {
-		public int compare(Viewer viewer, Object e1, Object e2) {
-			if (e1 instanceof IFeatureModel && e2 instanceof IFeatureModel) {
-				IFeature feature1 = ((IFeatureModel)e1).getFeature();
-				IFeature feature2 = ((IFeatureModel)e2).getFeature();
-				int result = collator.compare(feature1.getId(),feature2.getId());
-				if (result != 0) {
-					return result;
-				}
-			}
-			return super.compare(viewer,e1,e2);
-		}
-	}
-	public static class PluginSorter extends NameSorter {
-		public int compare(Viewer viewer, Object e1, Object e2) {
-			int result = 0;
-			String name1 = getName(e1);
-			String name2 = getName(e2);
-			if (name1 != null && name2 != null)
-				result = collator.compare(name1, name2);
-			return (result != 0) ? result : super.compare(viewer, e1, e2);
-		}
-
-		private String getName(Object object) {
-			if (object instanceof IPluginBase)
-				return getPluginName((IPluginBase) object);
-			if (object instanceof IPluginModelBase)
-				return getPluginName(
-					((IPluginModelBase) object).getPluginBase());
-			if (object instanceof ModelEntry)
-				return getPluginName(
-					((ModelEntry) object).getActiveModel().getPluginBase());
-			return null;
-		}
-
-		private String getPluginName(IPluginBase pluginBase) {
-			return PDEPlugin.isFullNameModeEnabled()
-				? pluginBase.getTranslatedName()
-				: pluginBase.getId();
-		}
-	}
-	
-
-	public static final ViewerSorter NAME_SORTER = new NameSorter();
-	
-	public static final ViewerSorter PLUGIN_SORTER = new PluginSorter();
-	
-	public static final ViewerSorter FEATURE_SORTER = new FeatureSorter();
-
-	static class TableLabelProvider extends ElementLabelProvider implements ITableLabelProvider {
-		public String getColumnText(Object o, int index) {
-			return getText(o);
-		}
-		public Image getColumnImage(Object o, int index) {
-			return getImage(o);
-		}
-	}
-
-	public static final ILabelProvider TABLE_LABEL_PROVIDER = new TableLabelProvider();
-
-public ListUtil() {
-	super();
-}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/NewWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/NewWizard.java
deleted file mode 100644
index 3e874d6..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/NewWizard.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards;
-import java.util.Dictionary;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.ui.*;
-
-public class NewWizard extends Wizard implements INewWizard, IDefaultValueConsumer {
-	private org.eclipse.ui.IWorkbench workbench;
-	private org.eclipse.jface.viewers.IStructuredSelection selection;
-	private Dictionary defaultValues;
-	
-	public NewWizard() {
-		super();
-		setWindowTitle(PDEUIMessages.NewWizard_wtitle);
-	}
-	public org.eclipse.jface.viewers.IStructuredSelection getSelection() {
-		return selection;
-	}
-	public IWorkbench getWorkbench() {
-		return workbench;
-	}
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		this.workbench = workbench;
-		this.selection = selection;
-	}
-	public boolean performFinish() {
-		return true;
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.wizards.IDefaultValueConsumer#getDefaultValue(java.lang.String)
-	 */
-	public String getDefaultValue(String key) {
-		if (defaultValues==null) return null;
-		return (String)defaultValues.get(key);
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.wizards.IDefaultValueConsumer#init(java.util.Dictionary)
-	 */
-	public void init(Dictionary defaultValues) {
-		this.defaultValues = defaultValues;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/PluginSelectionDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/PluginSelectionDialog.java
deleted file mode 100644
index 034bf43..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/PluginSelectionDialog.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards;
-
-import java.util.*;
-
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.dialogs.*;
-
-public class PluginSelectionDialog extends ElementListSelectionDialog {
-
-	public PluginSelectionDialog(Shell parentShell, boolean includeFragments, boolean multipleSelection) {
-		this(parentShell, getElements(includeFragments), multipleSelection);
-	}
-	
-	public PluginSelectionDialog(Shell parentShell, IPluginModelBase[] models, boolean multipleSelection) {
-		super(parentShell, PDEPlugin.getDefault().getLabelProvider());
-		setTitle(PDEUIMessages.PluginSelectionDialog_title); 
-		setMessage(PDEUIMessages.PluginSelectionDialog_message); 
-		setElements(models);
-		setMultipleSelection(multipleSelection);
-		PDEPlugin.getDefault().getLabelProvider().connect(this);
-	}
-	
-	public boolean close() {
-		PDEPlugin.getDefault().getLabelProvider().disconnect(this);
-		return super.close();
-	}
-	
-	private static IPluginModelBase[] getElements(boolean includeFragments) {
-		PluginModelManager manager = PDECore.getDefault().getModelManager();
-		return includeFragments ? manager.getPlugins() : manager.getPluginsOnly();
-	}
-	
-	public static HashSet getExistingImports(IPluginBase model) {
-		HashSet existingImports = new HashSet();
-		if (!PDECore.getDefault().getModelManager().isOSGiRuntime()) {
-			existingImports.add("org.eclipse.core.boot"); //$NON-NLS-1$
-			existingImports.add("org.eclipse.core.runtime"); //$NON-NLS-1$
-		}
-		addSelfAndDirectImports(existingImports, model);
-		if (model instanceof IFragment) {
-			IPlugin parent = getParentPlugin((IFragment) model);
-			if (parent != null) {
-				addSelfAndDirectImports(existingImports, parent);
-			}
-		}
-		return existingImports;
-	}
-	
-	private static IPlugin getParentPlugin(IFragment fragment) {
-		String targetId = fragment.getPluginId();
-		String targetVersion = fragment.getPluginVersion();
-		int match = fragment.getRule();
-		return PDECore.getDefault().findPlugin(targetId, targetVersion, match);
-	}
-
-	private static void addSelfAndDirectImports(HashSet set, IPluginBase pluginBase) {
-		set.add(pluginBase.getId());
-		IPluginImport[] imports = pluginBase.getImports();
-		for (int i = 0; i < imports.length; i++) {
-			String id = imports[i].getId();
-			if (set.add(id)) {
-				addReexportedImport(set, id);
-			}
-		}
-	}
-	
-	private static void addReexportedImport(HashSet set, String id) {
-		PluginModelManager manager = PDECore.getDefault().getModelManager();
-		ModelEntry entry = manager.findEntry(id);
-		if (entry != null) {
-			IPluginModelBase model = entry.getActiveModel();
-			IPluginImport[] imports = model.getPluginBase().getImports();
-			for (int i = 0; i < imports.length; i++) {
-				if (imports[i].isReexported() && set.add(imports[i].getId())) {
-					addReexportedImport(set, imports[i].getId());
-				}
-			}
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/RenameDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/RenameDialog.java
deleted file mode 100644
index 872e673..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/RenameDialog.java
+++ /dev/null

@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards;
-
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.dialogs.*;
-
-public class RenameDialog extends SelectionStatusDialog {
-	private ArrayList oldNames;
-	private String oldName;
-	private String newName;
-	private Text text;
-	private IStatus status;
-	private boolean isCaseSensitive;
-	
-    /**
-     * Create a new rename dialog instance for the given window.
-     * @param shell The parent of the dialog
-     * @param oldName Current name of the item being renamed
-     */
-	public RenameDialog(Shell shell, String oldName) {
-		super(shell);
-		this.isCaseSensitive = false;
-		initialize();
-		setOldName(oldName);
-	}
-	
-    /**
-     * Create a new rename dialog instance for the given window.
-     * @param shell The parent of the dialog
-     * @param isCaseSensitive Flags whether dialog will perform case sensitive checks against old names
-     * @param names Set of names which the user should not be allowed to rename to
-     * @param oldName Current name of the item being renamed
-     */
-	public RenameDialog(Shell shell, boolean isCaseSensitive, String[] names, String oldName){
-		super(shell);
-		this.isCaseSensitive = isCaseSensitive;
-		initialize();
-		if (names!=null){
-			for (int i = 0; i<names.length; i++)
-				addOldName(names[i]);
-		}
-		setOldName(oldName);
-	}
-	
-	public void initialize(){
-		oldNames = new ArrayList();
-		setStatusLineAboveButtons(true);
-	}
-	public void addOldName(String oldName){
-		if (!oldNames.contains(oldName))
-			oldNames.add(oldName);
-		
-	}
-	public void setOldName(String oldName) {
-		this.oldName = oldName;
-		addOldName(oldName);
-		if (text!=null) 
-			text.setText(oldName);
-		this.newName = oldName;
-	}
-	
-	protected Control createDialogArea(Composite parent) {
-		Composite container = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-        layout.marginHeight = layout.marginWidth = 9;
-		container.setLayout(layout);
-		
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		container.setLayoutData(gd);
-		
-		Label label = new Label(container, SWT.NULL);
-		label.setText(PDEUIMessages.RenameDialog_label); 
-		
-		text = new Text(container, SWT.SINGLE|SWT.BORDER);
-		text.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				textChanged(text.getText());
-			}
-		});
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		text.setLayoutData(gd);
-		applyDialogFont(container);
-		return container;
-	}
-	
-	public int open() {
-		text.setText(oldName);
-		text.selectAll();
-		Button okButton = getButton(IDialogConstants.OK_ID);
-		
-		status = new Status(
-				IStatus.OK,
-				PDEPlugin.getPluginId(),
-				IStatus.OK,
-				"", //$NON-NLS-1$
-				null);
-		updateStatus(status);
-		okButton.setEnabled(false);
-		return super.open();
-	}
-	
-	private void textChanged(String text) {
-		Button okButton = getButton(IDialogConstants.OK_ID);
-		for (int i=0; i<oldNames.size(); i++){
-			if((isCaseSensitive && text.equals(oldNames.get(i))) ||
-					(!isCaseSensitive && text.equalsIgnoreCase(oldNames.get(i).toString()))){
-				status =  new Status(
-						IStatus.ERROR,
-						PDEPlugin.getPluginId(),
-						IStatus.ERROR,
-						PDEUIMessages.RenameDialog_validationError, 
-						null);
-				updateStatus(status);
-				okButton.setEnabled(false);
-				break;
-			}
-			okButton.setEnabled(true);
-			status = new Status(
-				IStatus.OK,
-				PDEPlugin.getPluginId(),
-				IStatus.OK,
-				"", //$NON-NLS-1$
-				null);
-			updateStatus(status);
-		}
-	}
-	
-	public String getNewName() {
-		return newName;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-	 */
-	protected void okPressed() {
-		newName = text.getText().trim();
-		super.okPressed();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.dialogs.SelectionStatusDialog#computeResult()
-	 */
-	protected void computeResult() {
-	}
-    
-    public void setTitle(String title) {
-        getShell().setText(title);
-    }
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/RequiredPluginsContainerPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/RequiredPluginsContainerPage.java
deleted file mode 100644
index 158dc18..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/RequiredPluginsContainerPage.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jdt.ui.wizards.IClasspathContainerPage;
-import org.eclipse.jdt.ui.wizards.IClasspathContainerPageExtension;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.pde.internal.core.ModelEntry;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.PluginModelManager;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
-import org.eclipse.pde.internal.ui.wizards.plugin.ClasspathComputer;
-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.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-
-public class RequiredPluginsContainerPage
-	extends WizardPage
-	implements IClasspathContainerPage, IClasspathContainerPageExtension {
-	private IClasspathEntry entry;
-	private TableViewer viewer;
-	private Image projectImage;
-	private Image libraryImage;
-	private Image slibraryImage;
-	private IClasspathEntry[] realEntries;
-	private IJavaProject javaProject;
-
-	class EntryContentProvider
-		extends DefaultContentProvider
-		implements IStructuredContentProvider {
-		public Object[] getElements(Object parent) {
-			if (realEntries != null)
-				return realEntries;
-			return new Object[0];
-		}
-	}
-
-	class EntrySorter extends ViewerSorter {
-		public int category(Object obj) {
-			IClasspathEntry entry = (IClasspathEntry) obj;
-			return entry.getEntryKind() == IClasspathEntry.CPE_PROJECT
-				? -10
-				: 0;
-		}
-	}
-
-	class EntryLabelProvider
-		extends LabelProvider
-		implements ITableLabelProvider {
-		public String getText(Object obj) {
-			IClasspathEntry entry = (IClasspathEntry) obj;
-			int kind = entry.getEntryKind();
-			if (kind == IClasspathEntry.CPE_PROJECT)
-				return entry.getPath().segment(0);
-			IPath path = entry.getPath();
-			String name = path.lastSegment();
-			return name
-				+ " - " //$NON-NLS-1$
-				+ path.uptoSegment(path.segmentCount() - 1).toOSString();
-		}
-
-		public Image getImage(Object obj) {
-			IClasspathEntry entry = (IClasspathEntry) obj;
-			int kind = entry.getEntryKind();
-			if (kind == IClasspathEntry.CPE_PROJECT)
-				return projectImage;
-			else if (kind == IClasspathEntry.CPE_LIBRARY) {
-				IPath sourceAtt = entry.getSourceAttachmentPath();
-				return sourceAtt!=null?slibraryImage:libraryImage;
-			}
-			return null;
-		}
-		public String getColumnText(Object obj, int col) {
-			return getText(obj);
-		}
-		public Image getColumnImage(Object obj, int col) {
-			return getImage(obj);
-		}
-	}
-	/**
-	 * The constructor.
-	 */
-	public RequiredPluginsContainerPage() {
-		super("requiredPluginsContainerPage"); //$NON-NLS-1$
-		setTitle(PDEUIMessages.RequiredPluginsContainerPage_title); 
-		setDescription(PDEUIMessages.RequiredPluginsContainerPage_desc); 
-		projectImage =
-			PlatformUI.getWorkbench().getSharedImages().getImage(
-				IDE.SharedImages.IMG_OBJ_PROJECT);
-		//libraryImage = PDEPluginImages.DESC_BUILD_VAR_OBJ.createImage();
-		libraryImage =
-			JavaUI.getSharedImages().getImage(
-				org.eclipse.jdt.ui.ISharedImages.IMG_OBJS_EXTERNAL_ARCHIVE);
-		slibraryImage =
-				JavaUI.getSharedImages().getImage(
-				org.eclipse.jdt.ui.ISharedImages.IMG_OBJS_EXTERNAL_ARCHIVE_WITH_SOURCE);
-		setImageDescriptor(PDEPluginImages.DESC_CONVJPPRJ_WIZ);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * @see WizardPage#createControl
-	 */
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NULL);
-		container.setLayout(new GridLayout());
-		Label label = new Label(container, SWT.NULL);
-		label.setText(PDEUIMessages.RequiredPluginsContainerPage_label); 
-		viewer =
-			new TableViewer(
-				container,
-				SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-		viewer.setContentProvider(new EntryContentProvider());
-		viewer.setLabelProvider(new EntryLabelProvider());
-		viewer.setSorter(new ViewerSorter());
-
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.widthHint = 400;
-		gd.heightHint = 300;
-		viewer.getTable().setLayoutData(gd);
-		
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(
-			container,
-			IHelpContextIds.PLUGINS_CONTAINER_PAGE);
-		setControl(container);
-		Dialog.applyDialogFont(container);
-		if (realEntries != null)
-			initializeView();
-		
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(container, IHelpContextIds.REQUIRED_PLUINGS_CONTAINER);
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * @see WizardPage#finish
-	 */
-	public boolean finish() {
-		return true;
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * @see WizardPage#getSelection
-	 */
-	public IClasspathEntry getSelection() {
-		return entry;
-	}
-
-	public void initialize(
-		IJavaProject project,
-		IClasspathEntry[] currentEntries) {
-		javaProject = project;
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * @see WizardPage#setSelection
-	 */
-	public void setSelection(IClasspathEntry containerEntry) {
-		this.entry = containerEntry;
-		createRealEntries();
-		if (viewer != null)
-			initializeView();
-	}
-
-	private void createRealEntries() {
-		IJavaProject javaProject = getJavaProject();
-		if (javaProject == null) {
-			realEntries = new IClasspathEntry[0];
-			return;
-		}
-
-		if (entry == null) {
-			entry = ClasspathComputer.createContainerEntry();
-			PluginModelManager mng = PDECore.getDefault().getModelManager();
-			ModelEntry entry = mng.findEntry(javaProject.getProject());
-			if (entry!=null) {
-				IClasspathContainer container = entry.getClasspathContainer(false);
-				if (container!=null)
-					realEntries = container.getClasspathEntries();
-			}
-		} else {
-			try {
-				IClasspathContainer container =
-					JavaCore.getClasspathContainer(
-						entry.getPath(),
-						javaProject);
-				if (container != null)
-					realEntries = container.getClasspathEntries();
-			} catch (JavaModelException e) {
-			}
-		}
-		if (realEntries == null)
-			realEntries = new IClasspathEntry[0];
-	}
-
-	private IJavaProject getJavaProject() {
-		return javaProject;
-	}
-
-	private void initializeView() {
-		viewer.setInput(entry);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/ResizableWizardDialog.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/ResizableWizardDialog.java
deleted file mode 100644
index a2cc1bb..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/ResizableWizardDialog.java
+++ /dev/null

@@ -1,23 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards;
-
-import org.eclipse.jface.wizard.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Shell;
-
-
-public class ResizableWizardDialog extends WizardDialog {
-   public ResizableWizardDialog(Shell shell, IWizard wizard) {
-   	super(shell, wizard);
-	setShellStyle(getShellStyle() | SWT.RESIZE);
-  }
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardCollectionElement.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardCollectionElement.java
deleted file mode 100644
index a7f6e3a..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardCollectionElement.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.pde.internal.ui.elements.ElementList;
-import org.eclipse.ui.IPluginContribution;
-
-
-
-public class WizardCollectionElement extends ElementList implements IPluginContribution {
-	private WizardCollectionElement parent;
-	private ElementList     wizards = new ElementList("wizards"); //$NON-NLS-1$
-	private String                  id;
-
-	// properties
-	public static String            P_WIZARDS = "org.eclipse.pde.ui.wizards"; //$NON-NLS-1$
-
-public WizardCollectionElement(String id, String name, WizardCollectionElement parent) {
-	super(name, null, parent);
-	this.id = id;
-}
-public WizardCollectionElement findChildCollection(IPath searchPath) {
-	String searchString = searchPath.segment(0);
-
-	Object [] children = getChildren(); 
-	for (int i=0; i<children.length; i++) {
-		WizardCollectionElement currentCategory = (WizardCollectionElement)children[i];
-		if (currentCategory.getLabel().equals(searchString)) {
-			if (searchPath.segmentCount() == 1)
-				return currentCategory;
-				
-			return currentCategory.findChildCollection(searchPath.removeFirstSegments(1));
-		}
-	}
-	
-	return null;
-}
-public WizardElement findWizard(String searchId) {
-	Object [] children = getWizards().getChildren();
-
-	for (int i=0; i<children.length; i++) {
-		WizardElement currentWizard = (WizardElement)children[i];
-		if (currentWizard.getID().equals(searchId))
-			return currentWizard;
-	}
-	return null;
-}
-public String getId() {
-	return id;
-}
-public IPath getPath() {
-	if (parent == null)
-		return new Path(""); //$NON-NLS-1$
-		
-	return parent.getPath().append(getLabel());
-}
-public ElementList getWizards() {
-	return wizards;
-}
-public void setId(java.lang.String newId) {
-	id = newId;
-}
-public void setWizards(ElementList value) {
-	wizards = value;
-}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IPluginContribution#getLocalId()
-	 */
-	public String getLocalId() {
-		return getId();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IPluginContribution#getPluginId()
-	 */
-	public String getPluginId() {
-		return null;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardCollectionSorter.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardCollectionSorter.java
deleted file mode 100644
index cb302c3..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardCollectionSorter.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards;
-
-import org.eclipse.jface.viewers.*;
-
-public class WizardCollectionSorter extends ViewerSorter {
-	private String baseCategory;
-
-public WizardCollectionSorter(String baseCategory) {
-	this.baseCategory = baseCategory;
-}
-public int compare(Viewer viewer, Object o1, Object o2) {
-	String name2 = ((WizardCollectionElement) o2).getLabel();
-	String name1 = ((WizardCollectionElement) o1).getLabel();
-	if (name2.equals(name1))
-		return 0;
-
-	if (baseCategory != null) {
-		// note that this must be checked for name2 before name1 because if they're
-		// BOTH equal to baseCategory then we want to answer false by convention
-		if (name2.equalsIgnoreCase(baseCategory))
-			return -1;
-
-		if (name1.equalsIgnoreCase(baseCategory))
-			return 1;
-	}
-
-	return name2.compareTo(name1);
-}
-public boolean isSorterProperty(Object object,Object propertyId) {
-	return true;
-}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardElement.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardElement.java
deleted file mode 100644
index 3a00850..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardElement.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards;
-
-import java.util.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.pde.internal.ui.elements.NamedElement;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IPluginContribution;
-import org.osgi.framework.*;
-
-public class WizardElement extends NamedElement implements IPluginContribution {
-	public static final String ATT_NAME = "name"; //$NON-NLS-1$
-
-	public static final String TAG_DESCRIPTION = "description"; //$NON-NLS-1$
-
-	public static final String ATT_ICON = "icon"; //$NON-NLS-1$
-
-	public static final String ATT_ID = "id"; //$NON-NLS-1$
-
-	public static final String ATT_CLASS = "class"; //$NON-NLS-1$
-
-	public static final String ATT_TEMPLATE = "template"; //$NON-NLS-1$
-
-	public static final String ATT_POINT = "point"; //$NON-NLS-1$
-
-	private String description;
-
-	private IConfigurationElement configurationElement;
-
-	private IConfigurationElement template;
-
-	public WizardElement(IConfigurationElement config) {
-		super(config.getAttribute(ATT_NAME));
-		this.configurationElement = config;
-	}
-
-	public Object createExecutableExtension() throws CoreException {
-		return configurationElement.createExecutableExtension(ATT_CLASS);
-	}
-
-	public IConfigurationElement getConfigurationElement() {
-		return configurationElement;
-	}
-
-	public String getDescription() {
-		if (description == null) {
-			IConfigurationElement[] children = configurationElement
-					.getChildren(TAG_DESCRIPTION);
-			if (children.length > 0) {
-				description = expandDescription(children[0].getValue());
-			}
-		}
-		return description;
-	}
-
-	/**
-	 * We allow replacement variables in description values as well. This is to
-	 * allow extension template descriptin reuse in project template wizards.
-	 * Tokens in form '%token%' will be evaluated against the contributing
-	 * plug-in's resource bundle. As before, to have '%' in the description, one
-	 * need to add '%%'.
-	 */
-	private String expandDescription(String source) {
-		if (source == null || source.length() == 0)
-			return source;
-		if (source.indexOf('%') == -1)
-			return source;
-
-		Bundle bundle = Platform.getBundle(configurationElement
-				.getNamespace());
-		if (bundle == null)
-			return source;
-
-		ResourceBundle resourceBundle = Platform.getResourceBundle(bundle);
-		if (resourceBundle == null)
-			return source;
-		StringBuffer buf = new StringBuffer();
-		boolean keyMode = false;
-		int keyStartIndex = -1;
-		for (int i = 0; i < source.length(); i++) {
-			char c = source.charAt(i);
-			if (c == '%') {
-				char c2 = source.charAt(i + 1);
-				if (c2 == '%') {
-					i++;
-					buf.append('%');
-					continue;
-				}
-				if (keyMode) {
-					keyMode = false;
-					String key = source.substring(keyStartIndex, i);
-					String value = key;
-					try {
-						value = resourceBundle.getString(key);
-					} catch (MissingResourceException e) {
-					}
-					buf.append(value);
-				} else {
-					keyStartIndex = i + 1;
-					keyMode = true;
-				}
-			} else if (!keyMode) {
-				buf.append(c);
-			}
-		}
-		return buf.toString();
-	}
-
-	public String getID() {
-		return configurationElement.getAttribute(ATT_ID);
-	}
-
-	public void setImage(Image image) {
-		this.image = image;
-	}
-
-	public String getTemplateId() {
-		return configurationElement.getAttribute(ATT_TEMPLATE);
-	}
-
-	public boolean isTemplate() {
-		return getTemplateId() != null;
-	}
-
-	public IConfigurationElement getTemplateElement() {
-		if (template == null)
-			template = findTemplateElement();
-		return template;
-	}
-
-	private IConfigurationElement findTemplateElement() {
-		String templateId = getTemplateId();
-		if (templateId == null)
-			return null;
-		IConfigurationElement[] templates = Platform.getExtensionRegistry()
-				.getConfigurationElementsFor("org.eclipse.pde.ui.templates"); //$NON-NLS-1$
-		for (int i = 0; i < templates.length; i++) {
-			IConfigurationElement template = templates[i];
-			String id = template.getAttribute("id"); //$NON-NLS-1$
-			if (id != null && id.equals(templateId))
-				return template;
-		}
-		return null;
-	}
-
-	public String getContributingId() {
-		IConfigurationElement tel = getTemplateElement();
-		return (tel == null) ? null : tel.getAttribute("contributingId"); //$NON-NLS-1$
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IPluginContribution#getLocalId()
-	 */
-	public String getLocalId() {
-		return getID();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IPluginContribution#getPluginId()
-	 */
-	public String getPluginId() {
-		return null;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardListSelectionPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardListSelectionPage.java
deleted file mode 100644
index 4075756..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardListSelectionPage.java
+++ /dev/null

@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards;
-
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.pde.internal.ui.elements.*;
-import org.eclipse.pde.ui.IPluginContentWizard;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-
-public abstract class WizardListSelectionPage extends BaseWizardSelectionPage
-		implements ISelectionChangedListener, IExecutableExtension {
-	protected TableViewer wizardSelectionViewer;
-	protected ElementList wizardElements;
-	private WizardSelectedAction doubleClickAction = new WizardSelectedAction();
-	
-	private class WizardSelectedAction extends Action {
-		public WizardSelectedAction() {
-			super("wizardSelection"); //$NON-NLS-1$
-		}
-		public void run() {
-			selectionChanged(new SelectionChangedEvent(wizardSelectionViewer,
-					wizardSelectionViewer.getSelection()));
-			advanceToNextPage();
-		}
-	}
-	public WizardListSelectionPage(ElementList wizardElements, String message) {
-		super("ListSelection", message); //$NON-NLS-1$
-		this.wizardElements = wizardElements;
-	}
-	public void advanceToNextPage() {
-		getContainer().showPage(getNextPage());
-	}
-	public ElementList getWizardElements() {
-		return wizardElements;
-	}
-	
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.verticalSpacing = 10;
-		container.setLayout(layout);
-		container.setLayoutData(new GridData(GridData.FILL_BOTH));
-		
-		createAbove(container, 1);
-		Label label = new Label(container, SWT.NONE);
-		label.setText(getLabel());
-		GridData gd = new GridData();
-		label.setLayoutData(gd);
-		
-		SashForm sashForm = new SashForm(container, SWT.HORIZONTAL);
-		gd = new GridData(GridData.FILL_BOTH);
-		// limit the width of the sash form to avoid the wizard
-		// opening very wide. This is just preferred size - 
-		// it can be made bigger by the wizard
-		// See bug #83356
-		gd.widthHint = 300;
-		sashForm.setLayoutData(gd);
-		
-		wizardSelectionViewer = new TableViewer(sashForm, SWT.BORDER);
-		wizardSelectionViewer.setContentProvider(new ListContentProvider());
-		wizardSelectionViewer.setLabelProvider(ListUtil.TABLE_LABEL_PROVIDER);
-		wizardSelectionViewer.setSorter(ListUtil.NAME_SORTER);
-		wizardSelectionViewer.addDoubleClickListener(new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent event) {
-				doubleClickAction.run();
-			}
-		});
-		createDescriptionIn(sashForm);
-		createBelow(container, 1);
-		initializeViewer();		
-		wizardSelectionViewer.setInput(wizardElements);
-		wizardSelectionViewer.addSelectionChangedListener(this);		
-		Dialog.applyDialogFont(container);
-		setControl(container);
-	}
-	
-	protected void createAbove(Composite container, int span) {
-	}
-	protected void createBelow(Composite container, int span) {
-	}
-	
-	protected void initializeViewer() {
-	}
-	
-	public void selectionChanged(SelectionChangedEvent event) {
-		setErrorMessage(null);
-		IStructuredSelection selection = (IStructuredSelection) event.getSelection();
-		WizardElement currentWizardSelection = null;
-		Iterator iter = selection.iterator();
-		if (iter.hasNext())
-			currentWizardSelection = (WizardElement) iter.next();
-		if (currentWizardSelection == null) {
-			setDescriptionText(""); //$NON-NLS-1$
-			setSelectedNode(null);
-			return;
-		}
-		final WizardElement finalSelection = currentWizardSelection;
-		setSelectedNode(createWizardNode(finalSelection));
-		setDescriptionText(finalSelection.getDescription());
-		getContainer().updateButtons();
-	}
-	
-	public IWizardPage getNextPage(boolean shouldCreate) {
-		if (!shouldCreate)
-			return super.getNextPage();
-		IWizardNode selectedNode = getSelectedNode();
-		selectedNode.dispose();
-		IWizard wizard = selectedNode.getWizard();
-		if (wizard == null) {
-			super.setSelectedNode(null);
-			return null;
-		}
-		if (shouldCreate)
-			// Allow the wizard to create its pages
-			wizard.addPages();
-		return wizard.getStartingPage();
-	}
-	
-	protected void focusAndSelectFirst() {
-		Table table = wizardSelectionViewer.getTable();
-		table.setFocus();
-		TableItem[] items = table.getItems();
-		if (items.length > 0) {
-			TableItem first = items[0];
-			Object obj = first.getData();
-			wizardSelectionViewer.setSelection(new StructuredSelection(obj));
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)
-	 */
-	public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {
-	}
-	
-	public IPluginContentWizard getSelectedWizard() {
-		IWizardNode node = getSelectedNode();
-		if (node != null)
-			return (IPluginContentWizard)node.getWizard();
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.WizardSelectionPage#canFlipToNextPage()
-	 */
-	public boolean canFlipToNextPage() {
-		IStructuredSelection ssel = (IStructuredSelection)wizardSelectionViewer.getSelection();
-		return ssel != null && !ssel.isEmpty();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardNode.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardNode.java
deleted file mode 100644
index 1656377..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardNode.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards;
-
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.pde.ui.*;
-import org.eclipse.jface.dialogs.*;
-
-public abstract class WizardNode implements IWizardNode {
-	private IWizard wizard;
-	private BaseWizardSelectionPage parentWizardPage;
-	protected WizardElement wizardElement;
-
-public WizardNode(BaseWizardSelectionPage parentPage, WizardElement element) {
-	parentWizardPage = parentPage;
-	wizardElement = element;
-}
-protected abstract IBasePluginWizard createWizard() throws CoreException;
-public void dispose() {
-	if (wizard != null) {
-		wizard.dispose();
-		wizard = null;
-	}
-}
-public WizardElement getElement() {
-	return wizardElement;
-}
-public Point getExtent() {
-	return new Point(-1, -1);
-}
-public IWizard getWizard() {
-	if (wizard != null)
-		return wizard; // we've already created it
-
-	IBasePluginWizard pluginWizard;
-	try {
-		pluginWizard = createWizard(); // create instance of target wizard
-	} catch (CoreException e) {
-		parentWizardPage.setDescriptionText(""); //$NON-NLS-1$
-		parentWizardPage.setErrorMessage(PDEUIMessages.Errors_CreationError_NoWizard);
-		MessageDialog.openError(
-			parentWizardPage.getWizard().getContainer().getShell(), 
-			PDEUIMessages.Errors_CreationError, 
-			PDEUIMessages.Errors_CreationError_NoWizard); 
-		return null;
-	}
-	wizard = pluginWizard;
-	//wizard.setUseContainerState(false);
-	return wizard;
-}
-public boolean isContentCreated() {
-	return wizard != null;
-}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardTreeSelectionPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardTreeSelectionPage.java
deleted file mode 100644
index 0b88e4b..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/WizardTreeSelectionPage.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards;
-
-import org.eclipse.jface.wizard.*;
-import org.eclipse.pde.internal.ui.elements.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.custom.*;
-
-
-public abstract class WizardTreeSelectionPage
-	extends BaseWizardSelectionPage
-	implements ISelectionChangedListener {
-	private TreeViewer categoryTreeViewer;
-	private String baseCategory;
-	protected TableViewer wizardSelectionViewer;
-
-	private WizardCollectionElement wizardCategories;
-
-	public WizardTreeSelectionPage(
-		WizardCollectionElement categories,
-		String baseCategory,
-		String message) {
-		super("NewExtension", message);  //$NON-NLS-1$
-		this.wizardCategories = categories;
-		this.baseCategory = baseCategory;
-	}
-	public void advanceToNextPage() {
-		getContainer().showPage(getNextPage());
-	}
-	public void createControl(Composite parent) {
-		// top level group
-		Composite container = new Composite(parent, SWT.NULL);
-		FillLayout flayout = new FillLayout();
-		flayout.marginWidth = 5;
-		flayout.marginHeight = 5;
-		container.setLayout(flayout);
-		SashForm rootSash = new SashForm(container, SWT.VERTICAL);
-		SashForm outerSash = new SashForm(rootSash, SWT.HORIZONTAL);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		//outerContainer.setLayout(layout);
-		//outerContainer.setLayoutData(
-		//	new GridData(
-		//		GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL));
-
-		// tree pane
-		Tree tree = new Tree(outerSash, SWT.BORDER);
-		categoryTreeViewer = new TreeViewer(tree);
-		categoryTreeViewer.setContentProvider(new TreeContentProvider());
-		categoryTreeViewer.setLabelProvider(ElementLabelProvider.INSTANCE);
-
-		categoryTreeViewer.setSorter(new WizardCollectionSorter(baseCategory));
-		categoryTreeViewer.addSelectionChangedListener(this);
-/*
-		GridData gd =
-			new GridData(
-				GridData.FILL_BOTH
-					| GridData.GRAB_HORIZONTAL
-					| GridData.GRAB_VERTICAL);
-		gd.heightHint = SIZING_LISTS_HEIGHT;
-		gd.widthHint = SIZING_LISTS_WIDTH;
-		tree.setLayoutData(gd);
-*/
-
-		// wizard actions pane
-
-		Table table = new Table(outerSash, SWT.BORDER);
-		new TableColumn(table, SWT.NONE);
-		TableLayout tlayout = new TableLayout();
-		tlayout.addColumnData(new ColumnWeightData(100));
-		table.setLayout(tlayout);
-
-		wizardSelectionViewer = new TableViewer(table);
-		wizardSelectionViewer.setContentProvider(new ListContentProvider());
-		wizardSelectionViewer.setLabelProvider(ListUtil.TABLE_LABEL_PROVIDER);
-		wizardSelectionViewer.setSorter(ListUtil.NAME_SORTER);
-		wizardSelectionViewer.addSelectionChangedListener(this);
-		wizardSelectionViewer
-			.addDoubleClickListener(new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent event) {
-				BusyIndicator
-					.showWhile(
-						wizardSelectionViewer.getControl().getDisplay(),
-						new Runnable() {
-					public void run() {
-						selectionChanged(
-							new SelectionChangedEvent(
-								wizardSelectionViewer,
-								wizardSelectionViewer.getSelection()));
-						advanceToNextPage();
-					}
-				});
-			}
-		});
-/*
-		gd =
-			new GridData(
-				GridData.VERTICAL_ALIGN_FILL
-					| GridData.HORIZONTAL_ALIGN_FILL
-					| GridData.GRAB_HORIZONTAL
-					| GridData.GRAB_VERTICAL);
-		gd.heightHint = SIZING_LISTS_HEIGHT;
-		gd.widthHint = SIZING_LISTS_WIDTH;
-		table.setLayoutData(gd);
-*/
-
-		// the new composite below is needed in order to make the label span the two
-		// defined columns of outerContainer
-		Composite descriptionComposite =
-			new Composite(rootSash, SWT.NONE);
-		layout = new GridLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		descriptionComposite.setLayout(layout);
-/*
-		GridData data =
-			new GridData(
-				GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-		data.horizontalSpan = 2;
-		data.heightHint = SIZING_DESC_HEIGHT;
-		descriptionComposite.setLayoutData(data);
-*/
-		createDescriptionIn(descriptionComposite);
-
-		initializeViewers();
-		rootSash.setWeights(new int[] {70, 30});		
-		setControl(container);
-	}
-	protected Object getSingleSelection(IStructuredSelection selection) {
-		Object selectedObject = selection.getFirstElement();
-		if (selection.size() > 1)
-			selectedObject = null; // ie.- a multi-selection
-		return selectedObject;
-	}
-	private void handleCategorySelection(SelectionChangedEvent selectionEvent) {
-		setErrorMessage(null);
-		setDescriptionText(""); //$NON-NLS-1$
-		setSelectedNode(null);
-
-		WizardCollectionElement selectedCategory =
-			(WizardCollectionElement) getSingleSelection(
-				(IStructuredSelection) selectionEvent
-				.getSelection());
-
-		if (selectedCategory == null)
-			wizardSelectionViewer.setInput(null);
-		else
-			wizardSelectionViewer.setInput(selectedCategory.getWizards());
-	}
-	private void handleWizardSelection(SelectionChangedEvent selectionEvent) {
-		setErrorMessage(null);
-
-		WizardElement currentSelection =
-			(WizardElement) getSingleSelection(
-				(IStructuredSelection) selectionEvent
-				.getSelection());
-
-		// If no single selection, clear and return
-		if (currentSelection == null) {
-			setDescriptionText(""); //$NON-NLS-1$
-			setSelectedNode(null);
-			return;
-		}
-		final WizardElement finalSelection = currentSelection;
-		/*
-			BusyIndicator.showWhile(categoryTreeViewer.getControl().getDisplay(), new Runnable() {
-				public void run() {
-				*/
-		setSelectedNode(createWizardNode(finalSelection));
-		setDescriptionText(finalSelection.getDescription());
-		/*
-				}
-			});
-		*/
-	}
-	protected void initializeViewers() {
-		categoryTreeViewer.setInput(wizardCategories);
-		wizardSelectionViewer.addSelectionChangedListener(this);
-		Object[] categories = wizardCategories.getChildren();
-		if (categories.length > 0)
-			categoryTreeViewer.setSelection(new StructuredSelection(
-					categories[0]));
-		categoryTreeViewer.getTree().setFocus();
-	}
-	public void selectionChanged(SelectionChangedEvent selectionEvent) {
-		if (selectionEvent.getSelectionProvider().equals(categoryTreeViewer))
-			handleCategorySelection(selectionEvent);
-		else
-			handleWizardSelection(selectionEvent);
-	}
-	public void setSelectedNode(IWizardNode node) {
-		super.setSelectedNode(node);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/AdvancedFeatureExportPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/AdvancedFeatureExportPage.java
deleted file mode 100644
index 30b77c7..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/AdvancedFeatureExportPage.java
+++ /dev/null

@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.exports;
-
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-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.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-public class AdvancedFeatureExportPage extends AdvancedPluginExportPage {
-	
-	private static final String S_JNLP = "jnlp"; //$NON-NLS-1$
-	private static final String S_URL = "siteURL"; //$NON-NLS-1$
-	private static final String S_JRE = "jre"; //$NON-NLS-1$
-	
-
-	private Label fURLLabel;
-	private Text fURLText;
-	private Label fVersionLabel;
-	private Text fVersionText;
-	private Button fButton;
-	private Group jnlpGroup;
-	
-	
-	public AdvancedFeatureExportPage() {
-		super("feature-sign"); //$NON-NLS-1$
-	}
-	
-	protected String getDescriptionText() {
-		return PDEUIMessages.AdvancedFeatureExportPage_desc; 
-	}
-	
-	protected void createJNLPSection(Composite parent) {
-		jnlpGroup = new Group(parent, SWT.NONE);
-		jnlpGroup.setText(PDEUIMessages.AdvancedFeatureExportPage_jnlp); 
-		jnlpGroup.setLayout(new GridLayout(2, false));
-		jnlpGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		fButton = createbutton(jnlpGroup, PDEUIMessages.AdvancedFeatureExportPage_createJNLP); 
-		fButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				boolean selected = fButton.getSelection();
-				updateGroup(selected);
-				validatePage();
-			}
-		});
-
-		fURLLabel = createLabel(jnlpGroup, PDEUIMessages.AdvancedFeatureExportPage_siteURL);		 
-		fURLText = createText(jnlpGroup);
-		fURLText.setText(getString(S_URL));
-		
-		fVersionLabel = createLabel(jnlpGroup, PDEUIMessages.AdvancedFeatureExportPage_jreVersion);	 
-		fVersionText = createText(jnlpGroup);
-		fVersionText.setText(getString(S_JRE));
-		
-		fButton.setSelection(getDialogSettings().getBoolean(S_JNLP));
-		updateGroup(fButton.getSelection());
-	}
-	
-	private void updateGroup(boolean enabled) {
-		fURLLabel.setEnabled(enabled);
-		fURLText.setEnabled(enabled);
-		fVersionLabel.setEnabled(enabled);
-		fVersionText.setEnabled(enabled);
-	}
-	
-	protected void validatePage() {
-		if (!isCurrentPage())
-			return;
-		forceValidatePage(false);
-	}
-	
-	protected void forceValidatePage(boolean forceSuper) {
-		if (forceSuper) super.forceValidatePage();
-		else super.validatePage();
-			
-		if (isPageComplete()) {
-			String error = null;
-			
-			if (jnlpGroup.getVisible() && fButton.getSelection()) {
-				if (fURLText.getText().trim().length() == 0) {
-					error = PDEUIMessages.AdvancedFeatureExportPage_noSite; 
-				} else if (fVersionText.getText().trim().length() == 0) {
-					error = PDEUIMessages.AdvancedFeatureExportPage_noVersion; 
-				}
-			}
-			setErrorMessage(error);
-			setPageComplete(error == null);
-			// setPageComplete does not update buttons since we are checking a different page
-			// and so we must updateButtons explicitly.
-			if (forceSuper) getContainer().updateButtons();
-		}
-	}
-	
-	public void saveSettings() {
-		IDialogSettings settings = getDialogSettings();
-		settings.put(S_JNLP, fButton.getSelection());
-		settings.put(S_URL, fURLText.getText());
-		settings.put(S_JRE, fVersionText.getText());
-		super.saveSettings();
-	}
-	
-	public String[] getJNLPInfo() {
-		if (jnlpGroup.getVisible() && fButton.getSelection()) {
-			return new String[] { fURLText.getText().trim(),
-					fVersionText.getText().trim() };
-		}
-		return null;
-	}
-
-	public void hideJNLP(boolean hide) {
-        jnlpGroup.setVisible(!hide);
-        fButton.setEnabled(!hide);
-    }
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/AdvancedPluginExportPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/AdvancedPluginExportPage.java
deleted file mode 100644
index 2c34029..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/AdvancedPluginExportPage.java
+++ /dev/null

@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.exports;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-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.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-
-public class AdvancedPluginExportPage extends ExportWizardPage {
-
-	private static final String S_SIGN_JARS = "signJAR"; //$NON-NLS-1$
-	private static final String S_KEYSTORE = "keystore"; //$NON-NLS-1$
-	private static final String S_ALIAS = "alias"; //$NON-NLS-1$
-	private static final String S_PASSWORD = "password"; //$NON-NLS-1$
-	
-	private Button fButton;
-	private Label fKeystoreLabel;
-	private Text fKeystoreText;
-	private Label fAliasLabel;
-	private Text fAliasText;
-	private Label fPasswordLabel;
-	private Text fPasswordText;
-
-	public AdvancedPluginExportPage(String pageName) {
-		super(pageName);
-		setTitle(PDEUIMessages.AdvancedPluginExportPage_title); 
-		setDescription(getDescriptionText()); 
-	}
-	
-	protected String getDescriptionText() {
-		return PDEUIMessages.AdvancedPluginExportPage_desc; 
-	}
-
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = 15;
-		layout.verticalSpacing = 15;
-		container.setLayout(layout);
-		
-		createSigningSection(container);
-		createJNLPSection(container);
-		
-		Dialog.applyDialogFont(container);
-		validatePage();
-		setControl(container);
-		
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(container, IHelpContextIds.ADVANCED_PLUGIN_EXPORT);
-	}
-	
-	private void createSigningSection(Composite parent) {
-		Group group = new Group(parent, SWT.NONE);
-		group.setText(PDEUIMessages.AdvancedPluginExportPage_signJar); 
-		group.setLayout(new GridLayout(2, false));
-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		IDialogSettings settings = getDialogSettings();
-		
-		fButton = createbutton(group, PDEUIMessages.AdvancedPluginExportPage_signButton); 
-		fButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				boolean selected = fButton.getSelection();
-				updateGroup(selected);
-				validatePage();
-			}
-		});
-		
-		fKeystoreLabel = createLabel(group, PDEUIMessages.AdvancedPluginExportPage_keystore);	 
-		fKeystoreText = createText(group);
-		fKeystoreText.setText(getString(S_KEYSTORE));
-		
-		fAliasLabel = createLabel(group, PDEUIMessages.AdvancedPluginExportPage_alias); 
-		fAliasText = createText(group);
-		fAliasText.setText(getString(S_ALIAS));
-		
-		fPasswordLabel = createLabel(group, PDEUIMessages.AdvancedPluginExportPage_password);	 
-		fPasswordText = createText(group);
-		fPasswordText.setEchoChar('*');
-		fPasswordText.setText(getString(S_PASSWORD));
-
-		fButton.setSelection(settings.getBoolean(S_SIGN_JARS));
-		updateGroup(fButton.getSelection());
-	}
-	
-	protected String getString(String key) {
-		String value = getDialogSettings().get(key);
-		return value == null ? "" : value; //$NON-NLS-1$
-	}
-	
-	protected Button createbutton(Composite group, String text) {
-		Button button = new Button(group, SWT.CHECK);
-		button.setText(text);
-		GridData gd = new GridData();
-		gd.horizontalSpan = 2;
-		button.setLayoutData(gd);
-		return button;
-	}
-	
-	protected Label createLabel(Composite group, String text) {
-		Label label = new Label(group, SWT.NONE);
-		label.setText(text);
-		GridData gd = new GridData();
-		gd.horizontalIndent = 30;
-		label.setLayoutData(gd);
-		return label;
-	}
-	
-	protected Text createText(Composite group) {
-		Text text = new Text(group, SWT.SINGLE|SWT.BORDER);
-		text.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		text.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				validatePage();
-			}
-		});
-		return text;
-	}
-	
-	protected void createJNLPSection(Composite parent) {		
-	}
-	
-	protected void validatePage() {
-		if (!isCurrentPage())
-			return;
-		forceValidatePage();
-	}
-	
-	protected void forceValidatePage() {
-		String error = null;
-		if (fButton.getSelection()) {
-			if (fKeystoreText.getText().trim().length() == 0) {
-				error = PDEUIMessages.AdvancedPluginExportPage_noKeystore; 
-			} else if (fAliasText.getText().trim().length() == 0) {
-				error = PDEUIMessages.AdvancedPluginExportPage_noAlias; 
-			} else if (fPasswordText.getText().trim().length() == 0) {
-				error = PDEUIMessages.AdvancedPluginExportPage_noPassword; 
-			}
-		}
-		setErrorMessage(error);
-		setPageComplete(error == null);
-	}
-	
-	private void updateGroup(boolean enabled) {
-		fKeystoreLabel.setEnabled(enabled);
-		fKeystoreText.setEnabled(enabled);
-		fAliasLabel.setEnabled(enabled);
-		fAliasText.setEnabled(enabled);
-		fPasswordLabel.setEnabled(enabled);
-		fPasswordText.setEnabled(enabled);
-	}
-	
-	public void saveSettings() {
-		IDialogSettings settings = getDialogSettings();
-		settings.put(S_SIGN_JARS, fButton.getSelection());
-		settings.put(S_KEYSTORE, fKeystoreText.getText().trim());
-		settings.put(S_ALIAS, fAliasText.getText().trim());
-		settings.put(S_PASSWORD, fPasswordText.getText().trim());
-	}
-	
-	public String[] getSigningInfo() {
-		if (fButton.getSelection()) {
-			return new String[] { fAliasText.getText().trim(),
-					fKeystoreText.getText().trim(),
-					fPasswordText.getText().trim() };
-		}
-		return null;
-	}
-	
-	public String[] getJNLPInfo() {
-		return null;
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/BaseExportWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/BaseExportWizard.java
deleted file mode 100644
index 2b9365c..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/BaseExportWizard.java
+++ /dev/null

@@ -1,206 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.exports;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
-import org.eclipse.ant.internal.ui.IAntUIConstants;
-import org.eclipse.ant.internal.ui.launchConfigurations.AntLaunchShortcut;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.internal.core.XMLPrintHandler;
-import org.eclipse.pde.internal.ui.IPreferenceConstants;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.ui.IExportWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-import org.w3c.dom.Document;
-
-public abstract class BaseExportWizard
-	extends Wizard
-	implements IExportWizard, IPreferenceConstants {
-
-	protected IStructuredSelection fSelection;
-	protected BaseExportWizardPage fPage1;
-
-	/**
-	 * The constructor.
-	 */
-	public BaseExportWizard() {
-		PDEPlugin.getDefault().getLabelProvider().connect(this);
-		IDialogSettings masterSettings =
-			PDEPlugin.getDefault().getDialogSettings();
-		setNeedsProgressMonitor(true);
-		setDialogSettings(getSettingsSection(masterSettings));
-		setWindowTitle(PDEUIMessages.BaseExportWizard_wtitle); 
-	}
-
-	public void addPages() {
-		fPage1 = createPage1();
-		addPage(fPage1);
- 	}
-
-	protected abstract BaseExportWizardPage createPage1();
-	
-	public void dispose() {
-		PDEPlugin.getDefault().getLabelProvider().disconnect(this);
-		super.dispose();
-	}
-
-	public IStructuredSelection getSelection() {
-		return fSelection;
-	}
-
-	public IDialogSettings getSettingsSection(IDialogSettings master) {
-		String name = getSettingsSectionName();
-		IDialogSettings settings = master.getSection(name);
-		if (settings == null) {
-			settings = master.addNewSection(name);
-		}
-		return settings;
-	}
-	
-	protected abstract String getSettingsSectionName();
-
-	/**
-	 * @see Wizard#init
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		fSelection = selection;
-	}
-	
-	public boolean canFinish() {
-		IWizardPage nextPage = fPage1.getNextPage();
-		return fPage1.isPageComplete() && (nextPage == null || nextPage.isPageComplete());
-	}
-
-	/**
-	 * @see Wizard#performFinish
-	 */
-	public boolean performFinish() {
-		saveSettings();
-		if (!PlatformUI.getWorkbench().saveAllEditors(true))
-			return false;
-		
-		if (fPage1.doGenerateAntFile())
-			generateAntBuildFile(fPage1.getAntBuildFileName());
-		
-		if (!performPreliminaryChecks())
-			return false;
-		
-		if (!fPage1.doExportToDirectory()) {
-			File zipFile = new File(fPage1.getDestination(), fPage1.getFileName());
-			if (zipFile.exists()) {
-				if (!MessageDialog.openQuestion(getContainer().getShell(),
-						PDEUIMessages.BaseExportWizard_confirmReplace_title,  
-						NLS.bind(PDEUIMessages.BaseExportWizard_confirmReplace_desc, zipFile.getAbsolutePath())))
-					return false;
-				zipFile.delete();
-			}
-		}
-		
-		scheduleExportJob();
-		return true;
-	}
-	
-	private void saveSettings() {
-		IWizardPage[] pages = getPages();
-		for (int i = 0; i < pages.length; i++) {
-			((IExportWizardPage)pages[i]).saveSettings();
-		}
-	}
-	
-	protected boolean performPreliminaryChecks() {
-		return true;
-	}
-	
-	private void generateAntBuildFile(String filename) {
-		String parent = new Path(filename).removeLastSegments(1).toOSString();
-		String buildFilename = new Path(filename).lastSegment();
-		if (!buildFilename.endsWith(".xml")) //$NON-NLS-1$
-			buildFilename += ".xml"; //$NON-NLS-1$
-		File dir = new File(new File(parent).getAbsolutePath());
-		if (!dir.exists())
-			dir.mkdirs();
-
-		try {
-			Document task = generateAntTask();
-			if (task != null) {
-				File buildFile = new File(dir, buildFilename);
-				XMLPrintHandler.writeFile(task, buildFile);
-				generateAntTask();
-				setDefaultValues(dir, buildFilename);
-			}
-		} catch (IOException e) {
-		}
-	}
-	
-	private void setDefaultValues(File dir, String buildFilename) {
-		try {
-			IContainer container = PDEPlugin.getWorkspace().getRoot().getContainerForLocation(new Path(dir.toString()));
-			if (container != null && container.exists()) {
-				container.getProject().refreshLocal(IResource.DEPTH_INFINITE, null);
-				IFile file = container.getFile(new Path(buildFilename));
-				List configs = AntLaunchShortcut.findExistingLaunchConfigurations(file);
-				ILaunchConfigurationWorkingCopy launchCopy;
-				if (configs.size() == 0) {
-					ILaunchConfiguration config = AntLaunchShortcut.createDefaultLaunchConfiguration(file);
-					launchCopy = config.getWorkingCopy();
-				} else {
-					launchCopy = ((ILaunchConfiguration) configs.get(0)).getWorkingCopy();
-				}
-				if (launchCopy != null) {
-					launchCopy.setAttribute(
-							IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_NAME,
-							(String) null);
-					launchCopy.setAttribute(
-							IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE,
-							(String) null);
-					launchCopy.setAttribute(
-							IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME,
-							(String) null);
-					launchCopy.setAttribute(
-							IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS,
-							(String) null);
-					launchCopy.setAttribute(
-							IAntUIConstants.ATTR_DEFAULT_VM_INSTALL,
-							(String) null);
-					launchCopy.doSave();				
-				}
-			}
-		} catch (CoreException e) {
-		}		
-	}
-		
-	protected abstract Document generateAntTask();
-	
-	protected abstract void scheduleExportJob();
-	
-	protected String getExportOperation() {
-		return fPage1.doExportToDirectory() ? "directory" : "zip";  //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/BaseExportWizardPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/BaseExportWizardPage.java
deleted file mode 100644
index 64533be..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/BaseExportWizardPage.java
+++ /dev/null

@@ -1,573 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.exports;
-
-import java.io.File;
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.pde.internal.core.FeatureModelManager;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.util.SWTUtil;
-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.DirectoryDialog;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-
-
-public abstract class BaseExportWizardPage extends ExportWizardPage  {
-	private static final String S_JAR_FORMAT = "exportUpdate"; //$NON-NLS-1$
-	private static final String S_EXPORT_DIRECTORY = "exportDirectory";	 //$NON-NLS-1$
-	private static final String S_EXPORT_SOURCE="exportSource"; //$NON-NLS-1$
-	private static final String S_MULTI_PLATFORM="multiplatform"; //$NON-NLS-1$
-	private static final String S_DESTINATION = "destination"; //$NON-NLS-1$
-	private static final String S_ZIP_FILENAME = "zipFileName"; //$NON-NLS-1$
-	private static final String S_SAVE_AS_ANT = "saveAsAnt"; //$NON-NLS-1$
-	private static final String S_ANT_FILENAME = "antFileName"; //$NON-NLS-1$
-	private static final String S_JAVAC_TARGET = "javacTarget"; //$NON-NLS-1$
-	private static final String S_JAVAC_SOURCE = "javacSource"; //$NON-NLS-1$
-	
-	private static String[] COMPILER_LEVELS = new String[] {"1.1", "1.2", "1.3", "1.4", "5.0"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-		
-	private Button fDirectoryButton;
-	private Combo fDirectoryCombo;
-	private Button fBrowseDirectory;
-	
-	private Button fArchiveFileButton;
-	private Combo fArchiveCombo;
-	private Button fBrowseFile;
-	
-	private Button fIncludeSource;
-
-	private Button fMultiPlatform;
-
-	private Combo fAntCombo;
-	private Button fBrowseAnt;
-	private Button fSaveAsAntButton;
-	private String fZipExtension = ".zip"; //$NON-NLS-1$
-	private Button fJarButton;
-	private Combo fJavacSource;
-	private Combo fJavacTarget;
-
-	
-	public BaseExportWizardPage(String name) {
-		super(name);
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NULL);
-        GridLayout layout = new GridLayout();
-        layout.verticalSpacing = getVerticalSpacing();
-		container.setLayout(layout);
-		
-		createTopSection(container);
-		createExportDestinationSection(container);
-		createCompilerOptionsSection(container);
-		createOptionsSection(container);
-		
-		Dialog.applyDialogFont(container);
-		
-		// load settings
-		IDialogSettings settings = getDialogSettings();
-		initializeTopSection();
-		initializeCompilerOptionsSection(settings);
-		initializeExportOptions(settings);
-		initializeDestinationSection(settings);
-		pageChanged();
-		hookListeners();
-		setControl(container);
-		hookHelpContext(container);
-	}
-    
-    protected int getVerticalSpacing() {
-        return 5;
-    }
-	
-	protected abstract void createTopSection(Composite parent);
-	
-	protected abstract void initializeTopSection();
-	
-	private void createCompilerOptionsSection(Composite parent) {
-		Group group = new Group(parent, SWT.NONE);
-		group.setText(PDEUIMessages.BaseExportWizardPage_compilerOptions);
-		group.setLayout(new GridLayout(5, false));
-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		Label label = new Label(group, SWT.NONE);
-		label.setText(PDEUIMessages.BaseExportWizardPage_javacSource);
-		
-		fJavacSource = new Combo(group, SWT.READ_ONLY);
-		fJavacSource.setItems(COMPILER_LEVELS);
-		
-		label = new Label(group, SWT.NONE);
-		label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		label = new Label(group, SWT.NONE);
-		label.setText(PDEUIMessages.BaseExportWizardPage_javacTarget);
-		
-		fJavacTarget = new Combo(group, SWT.READ_ONLY);
-		fJavacTarget.setItems(COMPILER_LEVELS);
-		
-	}
-	
-	private void initializeCompilerOptionsSection(IDialogSettings settings) {
-		String target = settings.get(S_JAVAC_TARGET);
-		if (target == null) {
-			target = JavaCore.getPlugin().getPluginPreferences().getString(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM);
-			if (target.equals("1.5")) //$NON-NLS-1$
-				target = "5.0"; //$NON-NLS-1$
-		}
-		fJavacTarget.setText(target);
-		
-		String source = settings.get(S_JAVAC_SOURCE);
-		if (source == null) {
-			source = JavaCore.getPlugin().getPluginPreferences().getString(JavaCore.COMPILER_SOURCE);
-			if (source.equals("1.5")) //$NON-NLS-1$
-				source = "5.0"; //$NON-NLS-1$
-		}
-		fJavacSource.setText(source);		
-	}
-	
-	private void createExportDestinationSection(Composite parent) {
-		Group group = new Group(parent, SWT.NONE);
-		group.setText(PDEUIMessages.ExportWizard_destination); 
-		group.setLayout(new GridLayout(3, false));
-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		fArchiveFileButton = new Button(group, SWT.RADIO);
-		fArchiveFileButton.setText(PDEUIMessages.ExportWizard_archive); 
-		
-		fArchiveCombo = new Combo(group, SWT.BORDER);
-		fArchiveCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		fBrowseFile = new Button(group, SWT.PUSH);
-		fBrowseFile.setText(PDEUIMessages.ExportWizard_browse); 
-		fBrowseFile.setLayoutData(new GridData());
-		SWTUtil.setButtonDimensionHint(fBrowseFile);		
-
-		fDirectoryButton = new Button(group, SWT.RADIO);
-		fDirectoryButton.setText(PDEUIMessages.ExportWizard_directory); 
-
-		fDirectoryCombo = new Combo(group, SWT.BORDER);
-		fDirectoryCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		fBrowseDirectory = new Button(group, SWT.PUSH);
-		fBrowseDirectory.setText(PDEUIMessages.ExportWizard_browse); 
-		fBrowseDirectory.setLayoutData(new GridData());
-		SWTUtil.setButtonDimensionHint(fBrowseDirectory);
-	}
-	
-	protected Composite createOptionsSection(Composite parent) {
-		Group comp = new Group(parent, SWT.NONE);
-		comp.setText(PDEUIMessages.ExportWizard_options); 
-		comp.setLayout(new GridLayout(3, false));
-		comp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-									
-		fIncludeSource = new Button(comp, SWT.CHECK);
-		fIncludeSource.setText(PDEUIMessages.ExportWizard_includeSource); 
-		GridData gd = new GridData();
-		gd.horizontalSpan = 3;
-		fIncludeSource.setLayoutData(gd);
-		
-        if (addJARFormatSection()) {
-    		fJarButton = new Button(comp, SWT.CHECK);
-    		fJarButton.setText(getJarButtonText());
-    		gd = new GridData();
-    		gd.horizontalSpan = 3;
-    		fJarButton.setLayoutData(gd);
-    		fJarButton.addSelectionListener(new SelectionAdapter() {
-    			public void widgetSelected(SelectionEvent e) {
-    				getContainer().updateButtons();
-    			}
-    		});
-        }
-        
-        if (addMultiplatformSection()) {
-			fMultiPlatform = new Button(comp, SWT.CHECK);
-			fMultiPlatform.setText(PDEUIMessages.ExportWizard_multi_platform);
-			gd = new GridData();
-			gd.horizontalSpan = 3;
-			fMultiPlatform.setLayoutData(gd);
-		}
-        
-		if (addAntSection())
-            createAntSection(comp);
-		return comp;
-	}
-	
-	protected void createAntSection(Composite comp) {
-		fSaveAsAntButton = new Button(comp, SWT.CHECK);
-		fSaveAsAntButton.setText(PDEUIMessages.ExportWizard_antCheck); 
-		
-		fAntCombo = new Combo(comp, SWT.NONE);
-		fAntCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		fBrowseAnt = new Button(comp, SWT.PUSH);
-		fBrowseAnt.setText(PDEUIMessages.ExportWizard_browse2); 
-		fBrowseAnt.setLayoutData(new GridData());
-		SWTUtil.setButtonDimensionHint(fBrowseAnt);		
-	}
-	
-	protected abstract String getJarButtonText();
-	
-	private void toggleDestinationGroup(boolean useDirectory) {
-		fArchiveCombo.setEnabled(!useDirectory);
-		fBrowseFile.setEnabled(!useDirectory);
-		fDirectoryCombo.setEnabled(useDirectory);
-		fBrowseDirectory.setEnabled(useDirectory);
-	}
-	
-	protected void hookListeners() {
-		fArchiveFileButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				boolean enabled = fArchiveFileButton.getSelection();
-				fArchiveCombo.setEnabled(enabled);
-				fBrowseFile.setEnabled(enabled);
-				fDirectoryCombo.setEnabled(!enabled);
-				fBrowseDirectory.setEnabled(!enabled);
-				pageChanged();
-				pageUpdate(enabled);
-			}}
-		);
-			
- 		fBrowseFile.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				chooseFile(fArchiveCombo, "*" + fZipExtension); //$NON-NLS-1$
-			}
-		});
-		
-		fArchiveCombo.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				pageChanged();
-			}
-		});
-		
-		fArchiveCombo.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				pageChanged();
-			}
-		});
-		
-		fDirectoryCombo.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				pageChanged();
-			}
-		});
-		
-		fDirectoryCombo.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				pageChanged();
-			}
-		});
-		
-		fBrowseDirectory.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				chooseDestination();
-			}
-		});
-		
-        if (addAntSection()) {
-            fSaveAsAntButton.addSelectionListener(new SelectionAdapter() {
-                public void widgetSelected(SelectionEvent e) {
-                    fAntCombo.setEnabled(fSaveAsAntButton.getSelection());
-                    fBrowseAnt.setEnabled(fSaveAsAntButton.getSelection());
-                    pageChanged();
-                }}
-            );
-            
-     		fBrowseAnt.addSelectionListener(new SelectionAdapter() {
-    			public void widgetSelected(SelectionEvent e) {
-    				chooseFile(fAntCombo, "*.xml"); //$NON-NLS-1$
-    			}
-    		});
-    		
-    		fAntCombo.addSelectionListener(new SelectionAdapter() {
-    			public void widgetSelected(SelectionEvent e) {
-    				pageChanged();
-    			}
-    		});
-    		
-    		fAntCombo.addModifyListener(new ModifyListener() {
-    			public void modifyText(ModifyEvent e) {
-    				pageChanged();
-    			}
-    		});	
-        }
-
-        if (addMultiplatformSection()) {
-			fMultiPlatform.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					pageChanged();
-				}
-			});
-		}
-	}
-
-
-
-	private void chooseFile(Combo combo, String filter) {
-		FileDialog dialog = new FileDialog(getShell(), SWT.SAVE);
-		String path = fArchiveCombo.getText();
-		if (path.trim().length() == 0)
-			path = PDEPlugin.getWorkspace().getRoot().getLocation().toString();
-		dialog.setFileName(path);
-		dialog.setFilterExtensions(new String[] {filter});
-		String res = dialog.open();
-		if (res != null) {
-			if (combo.indexOf(res) == -1)
-				combo.add(res, 0);
-			combo.setText(res);
-		}
-	}
-	
-	private void chooseDestination() {
-		DirectoryDialog dialog = new DirectoryDialog(getShell(), SWT.SAVE);
-		String path = fDirectoryCombo.getText();
-		if (path.trim().length() == 0)
-			path = PDEPlugin.getWorkspace().getRoot().getLocation().toString();
-		dialog.setFilterPath(path);
-		dialog.setText(PDEUIMessages.ExportWizard_dialog_title); 
-		dialog.setMessage(PDEUIMessages.ExportWizard_dialog_message); 
-		String res = dialog.open();
-		if (res != null) {
-			if (fDirectoryCombo.indexOf(res) == -1)
-				fDirectoryCombo.add(res, 0);
-			fDirectoryCombo.setText(res);
-		}
-	}
-
-	protected void pageUpdate(boolean archive) {
-	}
-	protected void pageChanged() {
-		if (fJarButton != null) {
-			fJarButton.setEnabled(isEnableJarButton());
-		}
-	}
-	
-	protected String validateBottomSections() {
-		String message = null;
-		if (isButtonSelected(fArchiveFileButton) && fArchiveCombo.getText().trim().length() == 0) {
-			message = PDEUIMessages.ExportWizard_status_nofile; 
-		}
-		if (isButtonSelected(fDirectoryButton) && fDirectoryCombo.getText().trim().length() == 0) {
-			message = PDEUIMessages.ExportWizard_status_nodirectory; 
-		}
-		if (isButtonSelected(fSaveAsAntButton) && fAntCombo.getText().trim().length() == 0) {
-			message = PDEUIMessages.ExportWizard_status_noantfile; 
-		}
-		return message;
-	}
-	
-	protected boolean isEnableJarButton(){
-		return true;
-	}
-
-	private boolean isButtonSelected(Button button) {
-		return button != null && !button.isDisposed() && button.getSelection();
-	}
-
-	protected void initializeExportOptions(IDialogSettings settings) {		
-		fIncludeSource.setSelection(settings.getBoolean(S_EXPORT_SOURCE));
-        if (fJarButton != null)
-            fJarButton.setSelection(getInitialJarButtonSelection(settings));
-        if (addAntSection()) {
-    		fSaveAsAntButton.setSelection(settings.getBoolean(S_SAVE_AS_ANT));
-    		initializeCombo(settings, S_ANT_FILENAME, fAntCombo);
-    		fAntCombo.setEnabled(fSaveAsAntButton.getSelection());
-    		fBrowseAnt.setEnabled(fSaveAsAntButton.getSelection());
-        }
-        if (addMultiplatformSection()) {
-    		fMultiPlatform.setSelection(settings.getBoolean(S_MULTI_PLATFORM));
-        }
-	}
-	
-	protected boolean getInitialJarButtonSelection(IDialogSettings settings){
-        return settings.getBoolean(S_JAR_FORMAT);
-	}
-	
-	private void initializeDestinationSection(IDialogSettings settings) {
-		boolean useDirectory = settings.getBoolean(S_EXPORT_DIRECTORY);
-		fDirectoryButton.setSelection(useDirectory);	
-		fArchiveFileButton.setSelection(!useDirectory);
-		toggleDestinationGroup(useDirectory);
-		initializeCombo(settings, S_DESTINATION, fDirectoryCombo);
-		initializeCombo(settings, S_ZIP_FILENAME, fArchiveCombo);
-	}
-	
-	protected void initializeCombo(IDialogSettings settings, String key, Combo combo) {
-		ArrayList list = new ArrayList();
-		for (int i = 0; i < 6; i++) {
-			String curr = settings.get(key + String.valueOf(i));
-			if (curr != null && !list.contains(curr)) {
-				list.add(curr);
-			}
-		}
-		String[] items = (String[])list.toArray(new String[list.size()]);
-		combo.setItems(items);
-		if (items.length > 0)
-			combo.setText(items[0]);
-		else
-			combo.setText(""); //$NON-NLS-1$
-	}
-
-	public void saveSettings() {
-		IDialogSettings settings = getDialogSettings();	
-        if (fJarButton != null)
-            settings.put(S_JAR_FORMAT, fJarButton.getSelection());
-        if (fMultiPlatform != null)
-            settings.put(S_MULTI_PLATFORM, fMultiPlatform.getSelection());
-        
-		settings.put(S_EXPORT_DIRECTORY, fDirectoryButton.getSelection());		
-		settings.put(S_EXPORT_SOURCE, fIncludeSource.getSelection());
-		
-		settings.put(S_JAVAC_SOURCE, fJavacSource.getText());
-		settings.put(S_JAVAC_TARGET, fJavacTarget.getText());
-        
-        if (fSaveAsAntButton != null)
-            settings.put(S_SAVE_AS_ANT, fSaveAsAntButton.getSelection());
-		
-		saveCombo(settings, S_DESTINATION, fDirectoryCombo);
-		saveCombo(settings, S_ZIP_FILENAME, fArchiveCombo);
-        if (fAntCombo != null)
-            saveCombo(settings, S_ANT_FILENAME, fAntCombo);
-	}
-	
-	protected void saveCombo(IDialogSettings settings, String key, Combo combo) {
-		if (combo.getText().trim().length() > 0) {
-			settings.put(key + String.valueOf(0), combo.getText().trim());
-			String[] items = combo.getItems();
-			int nEntries = Math.min(items.length, 5);
-			for (int i = 0; i < nEntries; i++) {
-				settings.put(key + String.valueOf(i + 1), items[i].trim());
-			}
-		}	
-	}
-
-	public boolean doExportSource() {
-		return fIncludeSource.getSelection();
-	}
-	
-	public boolean doExportToDirectory() {
-		return fDirectoryButton.getSelection();
-	}
-	
-	public boolean useJARFormat() {
-		return fJarButton != null && fJarButton.isEnabled() && fJarButton.getSelection();
-	}
-	
-    public boolean doMultiPlatform(){
-    	return fMultiPlatform!=null && fMultiPlatform.getSelection();
-    }
-	public String getFileName() {
-		if (fArchiveFileButton.getSelection()) {
-			String path = fArchiveCombo.getText();
-			if (path != null && path.length() > 0) {
-				String fileName = new Path(path).lastSegment();
-				if (!fileName.endsWith(fZipExtension)) { 
-					fileName += fZipExtension;
-				}
-				return fileName;
-			}
-		}
-		return null;
-	}
-	
-	public String getDestination() {
-		if (fArchiveFileButton.getSelection()) {
-			String path = fArchiveCombo.getText();
-			if (path != null && path.length() > 0) {
-				path = new Path(path).removeLastSegments(1).toOSString();
-				return new File(path).getAbsolutePath();
-			}
-			return ""; //$NON-NLS-1$
-		}
-		
-		if (fDirectoryCombo == null || fDirectoryCombo.isDisposed())
-			return ""; //$NON-NLS-1$
-		
-		File dir = new File(fDirectoryCombo.getText().trim());			
-		return dir.getAbsolutePath();
-	}
-	
-	protected abstract void hookHelpContext(Control control);
-		
-	public boolean doGenerateAntFile() {
-		return fSaveAsAntButton != null && fSaveAsAntButton.getSelection();
-	}
-	
-	public String getJavacTarget() {
-		String target = fJavacTarget.getText();
-		return target.equals("5.0") ? "1.5" : target; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public String getJavacSource() {
-		String source = fJavacSource.getText();
-		return source.equals("5.0") ? "1.5" : source; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public String getAntBuildFileName() {
-		return fAntCombo != null ? fAntCombo.getText().trim() : ""; //$NON-NLS-1$
-	}
-	
-	public IWizardPage getNextPage() {
-		IWizardPage crossPlatformPage = getWizard().getPage("environment"); //$NON-NLS-1$
-		if (crossPlatformPage != null && doMultiPlatform()) {
-			return crossPlatformPage;
-
-		}
-		IWizardPage advancedPage = getWizard().getPage("feature-sign"); //$NON-NLS-1$
-		if (advancedPage == null)
-			advancedPage = getWizard().getPage("plugin-sign"); //$NON-NLS-1$
-		if (advancedPage != null && isEnableJarButton() && useJARFormat()) {
-			return advancedPage;
-		}
-		
-		return null;
-	}
-    
-    protected boolean addAntSection() {
-        return true;
-    }
-    
-    protected boolean addJARFormatSection() {
-        return true;
-    }
-
-    protected boolean addMultiplatformSection() {
-		FeatureModelManager manager = PDECore.getDefault()
-				.getFeatureModelManager();
-		IFeatureModel model = manager
-				.findFeatureModel("org.eclipse.platform.launchers"); //$NON-NLS-1$
-		return model != null;
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/CrossPlatformExportPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/CrossPlatformExportPage.java
deleted file mode 100644
index 963a53c..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/CrossPlatformExportPage.java
+++ /dev/null

@@ -1,204 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.exports;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.StringTokenizer;
-
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
-import org.eclipse.pde.internal.ui.parts.WizardCheckboxTablePart;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.PlatformUI;
-
-public class CrossPlatformExportPage extends ExportWizardPage {
-	
-	private static String CROSS_PLATFORM = "cross-platform"; //$NON-NLS-1$
-	
-	class Configuration {
-		String os;
-		String ws;
-		String arch;
-		
-		public String toString() {
-			return os + " (" + ws + "/" + arch + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		}
-	}
-	
-	class ContentProvider extends DefaultContentProvider implements
-			IStructuredContentProvider {
-		public Object[] getElements(Object parent) {
-			return getListElements();
-		}
-	}
-	
-	class PlatformPart extends WizardCheckboxTablePart {
-		public PlatformPart(String label, String[] buttonLabels) {
-			super(label, buttonLabels);
-		}
-
-		public void updateCounter(int count) {
-			super.updateCounter(count);
-			pageChanged();
-		}
-
-		protected void buttonSelected(Button button, int index) {
-			switch (index) {
-			case 0:
-				handleSelectAll(true);
-				break;
-			case 1:
-				handleSelectAll(false);
-				break;
-			}
-		}
-	}
-		
-	private PlatformPart fPlatformPart;
-	private IFeatureModel fModel;
-	
-	public CrossPlatformExportPage(String pageName, IFeatureModel model) {
-		super(pageName);
-		fPlatformPart =
-			new PlatformPart(
-				PDEUIMessages.CrossPlatformExportPage_available,
-				new String[] {
-					PDEUIMessages.WizardCheckboxTablePart_selectAll,
-					PDEUIMessages.WizardCheckboxTablePart_deselectAll});
-		setTitle(PDEUIMessages.CrossPlatformExportPage_title);
-		setDescription(PDEUIMessages.CrossPlatformExportPage_desc);
-		fModel = model;
-	}
-
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NULL);
-		container.setLayout(new GridLayout(2, false));
-		
-		fPlatformPart.createControl(container);
-		TableViewer viewer = fPlatformPart.getTableViewer();
-		viewer.setContentProvider(new ContentProvider());
-		viewer.setLabelProvider(new LabelProvider());
-		fPlatformPart.getTableViewer().setInput(PDECore.getDefault().getFeatureModelManager());
-		
-		initialize();
-		setControl(container);
-		
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(container, IHelpContextIds.CROSS_PLATFORM_EXPORT);
-	}
-	
-	private void initialize() {
-		String value = getDialogSettings().get(CROSS_PLATFORM);
-		if (value != null) {
-			HashSet set = new HashSet();
-			StringTokenizer tok = new StringTokenizer(value, ","); //$NON-NLS-1$
-			while (tok.hasMoreTokens()) {
-				set.add(tok.nextToken());
-			}
-			ArrayList selected = new ArrayList();
-			TableItem[] items = fPlatformPart.getTableViewer().getTable().getItems();
-			for (int i = 0; i < items.length; i++) {
-				Configuration config = (Configuration)items[i].getData();
-				if (set.contains(config.toString())) {
-					selected.add(config);
-				}
-			}
-			fPlatformPart.setSelection(selected.toArray());
-		}
-		pageChanged();		
-	}
-	
-	public void saveSettings() {
-		Object[] objects = fPlatformPart.getSelection();
-		StringBuffer buffer = new StringBuffer();
-		for (int i = 0; i < objects.length; i++) {
-			if (buffer.length() > 0)
-				buffer.append(","); //$NON-NLS-1$
-			buffer.append(objects[i].toString());
-		}
-		getDialogSettings().put(CROSS_PLATFORM, buffer.toString());
-	}
-	
-	private Configuration[] getListElements() {
-		ArrayList list = new ArrayList();
-		if (fModel != null) {
-			File bin = new File(fModel.getInstallLocation(), "bin"); //$NON-NLS-1$
-			if (bin.exists() && bin.isDirectory()) {
-				File[] children = bin.listFiles();
-				for (int i = 0; i < children.length; i++) {
-					if (children[i].isDirectory())
-						getWS(list, children[i]);
-				}
-			}
-		}
-		return (Configuration[])list.toArray(new Configuration[list.size()]);
-	}
-	
-	private void getWS(ArrayList list, File file) {
-		File[] children = file.listFiles();
-		for (int i = 0; i < children.length; i++) {
-			if (children[i].isDirectory())
-				getOS(list, children[i], file.getName());
-		}
-	}
-	
-	private void getOS(ArrayList list, File file, String ws) {
-		File[] children = file.listFiles();
-		for (int i = 0; i < children.length; i++) {
-			if (children[i].isDirectory()) {
-				Configuration config = new Configuration();
-				config.ws = ws;
-				config.os = file.getName();
-				config.arch = children[i].getName();
-				list.add(config);
-			}
-		}	
-	}
-	
-	private void pageChanged() {
-		setPageComplete(fPlatformPart.getSelectionCount() > 0);
-	}
-	
-	public String[][] getTargets() {
-		Object[] objects = fPlatformPart.getSelection();
-		String[][] targets = new String[objects.length][4];
-		for (int i = 0; i < objects.length; i++) {
-			Configuration config = (Configuration)objects[i];
-			String[] combo = new String[4];
-			combo[0] = config.os;
-			combo[1] = config.ws;
-			combo[2] = config.arch;
-			combo[3] = ""; //$NON-NLS-1$
-			targets[i] = combo;
-		}
-		return targets;
-	}
-	public IWizardPage getNextPage() {
-		BaseExportWizardPage firstPage = (BaseExportWizardPage) getWizard()
-				.getPages()[0];
-		if (firstPage != null && !firstPage.useJARFormat()) {
-			return null;
-		}
-		return super.getNextPage();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ExportWizardPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ExportWizardPage.java
deleted file mode 100644
index 0e9c885..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ExportWizardPage.java
+++ /dev/null

@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.exports;
-
-import org.eclipse.jface.wizard.WizardPage;
-
-public abstract class ExportWizardPage extends WizardPage implements IExportWizardPage {
-
-	public ExportWizardPage(String pageName) {
-		super(pageName);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ExportWizardPageWithTable.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ExportWizardPageWithTable.java
deleted file mode 100644
index b7b5deb..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ExportWizardPageWithTable.java
+++ /dev/null

@@ -1,187 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.exports;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.pde.core.IModel;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
-import org.eclipse.pde.internal.ui.parts.WizardCheckboxTablePart;
-import org.eclipse.pde.internal.ui.wizards.ListUtil;
-import org.eclipse.swt.SWT;
-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.ui.IWorkingSet;
-import org.eclipse.ui.IWorkingSetManager;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.IWorkingSetSelectionDialog;
-
-public abstract class ExportWizardPageWithTable extends BaseExportWizardPage {
-	
-	protected ExportPart fExportPart;
-	private IStructuredSelection fSelection;
-
-	class ExportListProvider extends DefaultContentProvider implements
-			IStructuredContentProvider {
-		public Object[] getElements(Object parent) {
-			return getListElements();
-		}
-	}
-
-	class ExportPart extends WizardCheckboxTablePart {
-		public ExportPart(String label, String[] buttonLabels) {
-			super(label, buttonLabels);
-		}
-
-		public void updateCounter(int count) {
-			super.updateCounter(count);
-			pageChanged();
-		}
-
-		protected void buttonSelected(Button button, int index) {
-			switch (index) {
-			case 0:
-				handleSelectAll(true);
-				break;
-			case 1:
-				handleSelectAll(false);
-				break;
-			case 3:
-				handleWorkingSets();
-			}
-		}
-	}
-
-	public ExportWizardPageWithTable(IStructuredSelection selection, String name, String choiceLabel) {
-		super(name);
-		fSelection = selection;
-		fExportPart =
-			new ExportPart(
-				choiceLabel,
-				new String[] {
-					PDEUIMessages.WizardCheckboxTablePart_selectAll,
-					PDEUIMessages.WizardCheckboxTablePart_deselectAll,
-					null,
-					PDEUIMessages.ExportWizard_workingSet }); 
-		setDescription(PDEUIMessages.ExportWizard_Plugin_description); 
-	}
-	
-	protected void createTopSection(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		
-		fExportPart.createControl(composite);
-		GridData gd = (GridData) fExportPart.getControl().getLayoutData();
-		gd.heightHint = 125;
-		gd.widthHint = 150;
-		gd.horizontalSpan = 2;		
-
-		TableViewer viewer = fExportPart.getTableViewer();
-		viewer.setContentProvider(new ExportListProvider());
-		viewer.setLabelProvider(PDEPlugin.getDefault().getLabelProvider());
-		viewer.setSorter(ListUtil.PLUGIN_SORTER);
-		fExportPart.getTableViewer().setInput(PDECore.getDefault().getWorkspaceModelManager());
-	}
-	
-	protected void initializeTopSection() {
-		Object[] elems = fSelection.toArray();
-		ArrayList checked = new ArrayList(elems.length);
-
-		for (int i = 0; i < elems.length; i++) {
-			Object elem = elems[i];
-			IProject project = null;
-
-			if (elem instanceof IFile) {
-				IFile file = (IFile) elem;
-				project = file.getProject();
-			} else if (elem instanceof IProject) {
-				project = (IProject) elem;
-			} else if (elem instanceof IJavaProject) {
-				project = ((IJavaProject) elem).getProject();
-			}
-			if (project != null) {
-				IModel model = findModelFor(project);
-				if (model != null && !checked.contains(model)) {
-					checked.add(model);
-				}
-			}
-		}
-		fExportPart.setSelection(checked.toArray());
-		if (checked.size() > 0)
-			fExportPart.getTableViewer().reveal(checked.get(0));
-	}
-
-	private void handleWorkingSets() {
-		IWorkingSetManager manager = PlatformUI.getWorkbench().getWorkingSetManager();
-		IWorkingSetSelectionDialog dialog = manager.createWorkingSetSelectionDialog(getShell(), true);
-		if (dialog.open() == Window.OK) {
-			ArrayList models = new ArrayList();
-			IWorkingSet[] workingSets = dialog.getSelection();
-			for (int i = 0; i < workingSets.length; i++) {
-				IAdaptable[] elements = workingSets[i].getElements();
-				for (int j = 0; j < elements.length; j++) {
-					IModel model = findModelFor(elements[j]);
-					if (isValidModel(model)) {
-						models.add(model);						
-					}
-				}
-			}
-			fExportPart.setSelection(models.toArray());
-		}
-	}
-	
-	protected abstract boolean isValidModel(IModel model);
-	
-	protected abstract IModel findModelFor(IAdaptable object);
-	
-	public Object[] getSelectedItems() {
-		return fExportPart.getSelection();
-	}
-	
-	protected void validateTopSection() {
-		setMessage(fExportPart.getSelectionCount() > 0 
-						? null 
-						: PDEUIMessages.ExportWizard_status_noselection); 
-	}
-	
-	public abstract Object[] getListElements();
-	
-	protected void pageChanged() {
-		super.pageChanged();
-		String message = fExportPart.getSelectionCount() > 0 
-							? null 
-				            : PDEUIMessages.ExportWizard_status_noselection; 
-		if (message == null) {
-			message = validateBottomSections();
-		}
-		setMessage(message);
-		setPageComplete(message == null);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/FeatureExportWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/FeatureExportWizard.java
deleted file mode 100644
index f6e09ef..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/FeatureExportWizard.java
+++ /dev/null

@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.exports;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.pde.internal.core.FeatureModelManager;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.build.FeatureExportInfo;
-import org.eclipse.pde.internal.ui.build.FeatureExportJob;
-import org.eclipse.ui.progress.IProgressConstants;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class FeatureExportWizard extends BaseExportWizard {
-	private static final String STORE_SECTION = "FeatureExportWizard"; //$NON-NLS-1$
-	private AdvancedFeatureExportPage fPage3;
-	private CrossPlatformExportPage fPage2;
-
-	/**
-	 * The constructor.
-	 */
-	public FeatureExportWizard() {
-		setDefaultPageImageDescriptor(PDEPluginImages.DESC_FEATURE_EXPORT_WIZ);
-	}
-	
-	public void addPages() {
-		super.addPages();
-		FeatureModelManager manager = PDECore.getDefault().getFeatureModelManager();
-		IFeatureModel model = manager.findFeatureModel("org.eclipse.platform.launchers"); //$NON-NLS-1$
-		if (model != null) {
-			fPage2 = new CrossPlatformExportPage("environment", model); //$NON-NLS-1$
-			addPage(fPage2);
-		}	
-		fPage3 = new AdvancedFeatureExportPage();
-		addPage(fPage3);
-		((FeatureExportWizardPage)fPage1).setFeaturePage(fPage3);
-	}
-
-	protected BaseExportWizardPage createPage1() {
-		return new FeatureExportWizardPage(getSelection());
-	}
-	
-	protected String getSettingsSectionName() {
-		return STORE_SECTION;
-	}
-	
-	protected void scheduleExportJob() {
-		FeatureExportInfo info = new FeatureExportInfo();
-		info.toDirectory = fPage1.doExportToDirectory();
-		info.useJarFormat = fPage1.useJARFormat();
-		info.exportSource = fPage1.doExportSource();
-		info.destinationDirectory = fPage1.getDestination();
-		info.zipFileName = fPage1.getFileName();
-		info.targets = fPage2 == null ? null : 
-			fPage1.doMultiPlatform() ? fPage2.getTargets() : null;
-		info.javacSource = fPage1.getJavacSource();
-		info.javacTarget = fPage1.getJavacTarget();
-		info.items = ((ExportWizardPageWithTable)fPage1).getSelectedItems();
-		info.signingInfo = fPage1.useJARFormat() ? fPage3.getSigningInfo() : null;
-		info.jnlpInfo = fPage1.useJARFormat() ? fPage3.getJNLPInfo() : null;
-		
-		FeatureExportJob job = new FeatureExportJob(info);
-		job.setUser(true);
-		job.schedule();
-		job.setProperty(IProgressConstants.ICON_PROPERTY, PDEPluginImages.DESC_FEATURE_OBJ);
-	}
-	
-	protected Document generateAntTask() {
-		try {
-			DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-			Document doc = factory.newDocumentBuilder().newDocument();
-			Element root = doc.createElement("project"); //$NON-NLS-1$
-			root.setAttribute("name", "build"); //$NON-NLS-1$ //$NON-NLS-2$
-			root.setAttribute("default", "feature_export"); //$NON-NLS-1$ //$NON-NLS-2$
-			doc.appendChild(root);
-			
-			Element target = doc.createElement("target"); //$NON-NLS-1$
-			target.setAttribute("name", "feature_export"); //$NON-NLS-1$ //$NON-NLS-2$
-			root.appendChild(target);
-			
-			Element export = doc.createElement("pde.exportFeatures"); //$NON-NLS-1$
-			export.setAttribute("features", getFeatureIDs()); //$NON-NLS-1$
-			export.setAttribute("destination", fPage1.getDestination()); //$NON-NLS-1$
-			String filename = fPage1.getFileName();
-			if (filename != null)
-				export.setAttribute("filename", filename); //$NON-NLS-1$
-			export.setAttribute("exportType", getExportOperation());  //$NON-NLS-1$
-			export.setAttribute("useJARFormat", Boolean.toString(fPage1.useJARFormat())); //$NON-NLS-1$
-			export.setAttribute("exportSource", Boolean.toString(fPage1.doExportSource())); //$NON-NLS-1$
-			export.setAttribute("source", fPage1.getJavacSource()); //$NON-NLS-1$
-			export.setAttribute("target", fPage1.getJavacTarget()); //$NON-NLS-1$
-			return doc;
-		} catch (DOMException e) {
-		} catch (FactoryConfigurationError e) {
-		} catch (ParserConfigurationException e) {
-		}
-		return null;
-	}
-	
-	private String getFeatureIDs() {
-		StringBuffer buffer = new StringBuffer();
-		Object[] objects = ((ExportWizardPageWithTable)fPage1).getSelectedItems();
-		for (int i = 0; i < objects.length; i++) {
-			Object object = objects[i];
-			if (object instanceof IFeatureModel) {
-				buffer.append(((IFeatureModel)object).getFeature().getId());
-				if (i < objects.length - 1)
-					buffer.append(",");					 //$NON-NLS-1$
-			}
-		}
-		return buffer.toString();
-	}
-
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/FeatureExportWizardPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/FeatureExportWizardPage.java
deleted file mode 100644
index 787226b..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/FeatureExportWizardPage.java
+++ /dev/null

@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.exports;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.pde.core.IModel;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.WorkspaceModelManager;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.PlatformUI;
-
-
-public class FeatureExportWizardPage extends ExportWizardPageWithTable {
-	
-	private AdvancedFeatureExportPage featurePage;
-	
-	public FeatureExportWizardPage(IStructuredSelection selection) {
-		super(
-			selection,
-			"featureExport", //$NON-NLS-1$
-			PDEUIMessages.ExportWizard_Feature_pageBlock); 
-		setTitle(PDEUIMessages.ExportWizard_Feature_pageTitle); 
-	}
-
-	public Object[] getListElements() {
-		WorkspaceModelManager manager = PDECore.getDefault().getWorkspaceModelManager();
-		return manager.getFeatureModels();
-	}
-	
-	protected void hookHelpContext(Control control) {
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(control, IHelpContextIds.FEATURE_EXPORT_WIZARD);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.exports.BaseExportWizardPage#isValidModel(org.eclipse.pde.core.IModel)
-	 */
-	protected boolean isValidModel(IModel model) {
-		return model instanceof IFeatureModel;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.exports.BaseExportWizardPage#findModelFor(org.eclipse.core.resources.IProject)
-	 */
-	protected IModel findModelFor(IAdaptable object) {
-		if (object instanceof IJavaProject)
-			object = ((IJavaProject)object).getProject();
-		if (object instanceof IProject)
-			return PDECore.getDefault().getWorkspaceModelManager().getFeatureModel((IProject)object);
-		return null;
-	}
-	
-	protected String getJarButtonText() {
-		return PDEUIMessages.BaseExportWizardPage_fPackageJARs; 
-	}
-	
-	protected void setFeaturePage(AdvancedFeatureExportPage fPage) {
-		featurePage = fPage;
-	}
-	
-	protected void pageUpdate(boolean hideJNLP) {
-		featurePage.hideJNLP(hideJNLP);
-		if (isPageComplete() || getErrorMessage() == null) {
-			featurePage.forceValidatePage(true);
-		}
-	}
-	
-	public IWizardPage getNextPage() {
-		String exportType = ((BaseExportWizard)getWizard()).getExportOperation();
-		featurePage.hideJNLP(exportType.equals("zip")); //$NON-NLS-1$
-		return super.getNextPage();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/IExportWizardPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/IExportWizardPage.java
deleted file mode 100644
index a96fd3b..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/IExportWizardPage.java
+++ /dev/null

@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.exports;
-
-public interface IExportWizardPage {
-	
-	void saveSettings();
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/PluginExportWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/PluginExportWizard.java
deleted file mode 100644
index d94c13e..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/PluginExportWizard.java
+++ /dev/null

@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.exports;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.build.FeatureExportInfo;
-import org.eclipse.pde.internal.ui.build.PluginExportJob;
-import org.eclipse.ui.progress.IProgressConstants;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class PluginExportWizard extends BaseExportWizard {
-	private static final String STORE_SECTION = "PluginExportWizard"; //$NON-NLS-1$
-	private AdvancedPluginExportPage fPage2;
-
-	public PluginExportWizard() {
-		setDefaultPageImageDescriptor(PDEPluginImages.DESC_PLUGIN_EXPORT_WIZ);
-	}
-
-	protected BaseExportWizardPage createPage1() {
-		return new PluginExportWizardPage(getSelection());
-	}
-	
-	protected String getSettingsSectionName() {
-		return STORE_SECTION;
-	}
-	
-	public void addPages() {
-		super.addPages();
-		fPage2 = new AdvancedPluginExportPage("plugin-sign"); //$NON-NLS-1$
-		addPage(fPage2);
-	}
-	
-	protected void scheduleExportJob() {
-		FeatureExportInfo info = new FeatureExportInfo();
-		info.toDirectory = fPage1.doExportToDirectory();
-		info.useJarFormat = fPage1.useJARFormat();
-		info.exportSource = fPage1.doExportSource();
-		info.destinationDirectory = fPage1.getDestination();
-		info.zipFileName = fPage1.getFileName();
-		info.javacSource = fPage1.getJavacSource();
-		info.javacTarget = fPage1.getJavacTarget();
-		info.items = ((ExportWizardPageWithTable)fPage1).getSelectedItems();
-		info.signingInfo = fPage1.useJARFormat() ? fPage2.getSigningInfo() : null;
-		
-		PluginExportJob job = new PluginExportJob(info);
-		job.setUser(true);
-		job.schedule();
-		job.setProperty(IProgressConstants.ICON_PROPERTY, PDEPluginImages.DESC_PLUGIN_OBJ);
-	}
-
-	protected Document generateAntTask() {
-		try {
-			DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-			Document doc = factory.newDocumentBuilder().newDocument();
-			Element root = doc.createElement("project"); //$NON-NLS-1$
-			root.setAttribute("name", "build"); //$NON-NLS-1$ //$NON-NLS-2$
-			root.setAttribute("default", "plugin_export"); //$NON-NLS-1$ //$NON-NLS-2$
-			doc.appendChild(root);
-			
-			Element target = doc.createElement("target"); //$NON-NLS-1$
-			target.setAttribute("name", "plugin_export"); //$NON-NLS-1$ //$NON-NLS-2$
-			root.appendChild(target);
-			
-			Element export = doc.createElement("pde.exportPlugins"); //$NON-NLS-1$
-			export.setAttribute("plugins", getPluginIDs()); //$NON-NLS-1$
-			export.setAttribute("destination", fPage1.getDestination()); //$NON-NLS-1$
-			String filename = fPage1.getFileName();
-			if (filename != null)
-				export.setAttribute("filename", filename); //$NON-NLS-1$
-			export.setAttribute("exportType", getExportOperation());  //$NON-NLS-1$
-			export.setAttribute("useJARFormat", Boolean.toString(fPage1.useJARFormat()));  //$NON-NLS-1$
-			export.setAttribute("exportSource", Boolean.toString(fPage1.doExportSource()));  //$NON-NLS-1$
-			export.setAttribute("source", fPage1.getJavacSource()); //$NON-NLS-1$
-			export.setAttribute("target", fPage1.getJavacTarget()); //$NON-NLS-1$
-			target.appendChild(export);
-			return doc;
-		} catch (DOMException e) {
-		} catch (FactoryConfigurationError e) {
-		} catch (ParserConfigurationException e) {
-		}
-		return null;
-	}
-	
-	private String getPluginIDs() {
-		StringBuffer buffer = new StringBuffer();
-		Object[] objects = ((ExportWizardPageWithTable)fPage1).getSelectedItems();
-		for (int i = 0; i < objects.length; i++) {
-			Object object = objects[i];
-			if (object instanceof IPluginModelBase) {
-				buffer.append(((IPluginModelBase)object).getPluginBase().getId());
-				if (i < objects.length - 1)
-					buffer.append(",");					 //$NON-NLS-1$
-			}
-		}
-		return buffer.toString();
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/PluginExportWizardPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/PluginExportWizardPage.java
deleted file mode 100644
index 529c3f8..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/PluginExportWizardPage.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.exports;
-
-import java.io.File;
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osgi.service.resolver.BundleDescription;
-import org.eclipse.pde.core.IModel;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.ModelEntry;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.WorkspaceModelManager;
-import org.eclipse.pde.internal.core.util.CoreUtility;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.util.PersistablePluginObject;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.PlatformUI;
-
-
-public class PluginExportWizardPage extends ExportWizardPageWithTable {
-	
-	public PluginExportWizardPage(IStructuredSelection selection) {
-		super(
-			selection,
-			"pluginExport", //$NON-NLS-1$
-			PDEUIMessages.ExportWizard_Plugin_pageBlock); 
-		setTitle(PDEUIMessages.ExportWizard_Plugin_pageTitle); 
-	}
-
-	public Object[] getListElements() {
-		IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
-		ArrayList result = new ArrayList();
-		for (int i = 0; i < projects.length; i++) {
-			if (!WorkspaceModelManager.isBinaryPluginProject(projects[i])
-				&& WorkspaceModelManager.isPluginProject(projects[i])) {
-				IModel model = PDECore.getDefault().getModelManager().findModel(projects[i]);
-				if (model != null && isValidModel(model) && hasBuildProperties((IPluginModelBase)model)) {
-					result.add(model);
-				}
-			}
-		}
-		return (IModel[]) result.toArray(new IModel[result.size()]);
-	}
-	
-	protected void hookHelpContext(Control control) {
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(control, IHelpContextIds.PLUGIN_EXPORT_WIZARD);
-	}
-	
-	private boolean hasBuildProperties(IPluginModelBase model) {
-		File file = new File(model.getInstallLocation(),"build.properties"); //$NON-NLS-1$
-		return file.exists();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.exports.BaseExportWizardPage#isValidModel(org.eclipse.pde.core.IModel)
-	 */
-	protected boolean isValidModel(IModel model) {
-		return model != null && model instanceof IPluginModelBase;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.exports.BaseExportWizardPage#findModelFor(org.eclipse.core.runtime.IAdaptable)
-	 */
-	protected IModel findModelFor(IAdaptable object) {
-		if (object instanceof IJavaProject)
-			object = ((IJavaProject)object).getProject();
-		if (object instanceof IProject)
-			return PDECore.getDefault().getModelManager().findModel((IProject)object);
-		if (object instanceof PersistablePluginObject) {
-			ModelEntry entry = PDECore.getDefault().getModelManager().findEntry(((PersistablePluginObject)object).getPluginID());
-			if (entry != null) {
-				return entry.getWorkspaceModel();
-			}
-		}
-		return null;
-	}
-	
-	protected String getJarButtonText() {
-		return PDEUIMessages.BaseExportWizardPage_packageJARs; 
-	}
-				
-    protected boolean addMultiplatformSection() {
-		return false;
-	}
-    
-	protected boolean isEnableJarButton() {
-		return getSelectedItems().length <= 1;
-	}
-	
-	protected boolean getInitialJarButtonSelection(IDialogSettings settings) {
-		Object[] selectedPlugins = getSelectedItems();
-		if (selectedPlugins.length == 1) {
-			BundleDescription bundle = null;
-			if (selectedPlugins[0] instanceof IPluginModelBase) {
-				bundle = ((IPluginModelBase) selectedPlugins[0])
-						.getBundleDescription();
-			}
-			if (bundle == null) {
-				if (selectedPlugins[0] instanceof BundleDescription)
-					bundle = (BundleDescription) selectedPlugins[0];
-			}
-			if (bundle != null) {
-				return !CoreUtility.guessUnpack(bundle);
-			}
-		}
-		return super.getInitialJarButtonSelection(settings);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ProductExportWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ProductExportWizard.java
deleted file mode 100644
index 89d92d3..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ProductExportWizard.java
+++ /dev/null

@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.exports;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.osgi.service.resolver.BundleDescription;
-import org.eclipse.osgi.service.resolver.State;
-import org.eclipse.pde.internal.core.FeatureModelManager;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.TargetPlatform;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.core.iproduct.IProductFeature;
-import org.eclipse.pde.internal.core.iproduct.IProductPlugin;
-import org.eclipse.pde.internal.core.product.WorkspaceProductModel;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.build.FeatureExportInfo;
-import org.eclipse.pde.internal.ui.build.ProductExportJob;
-import org.eclipse.pde.internal.ui.wizards.product.SynchronizationOperation;
-import org.eclipse.ui.progress.IProgressConstants;
-import org.w3c.dom.Document;
-
-
-public class ProductExportWizard extends BaseExportWizard {
-	
-	private static final String STORE_SECTION = "ProductExportWizard"; //$NON-NLS-1$
-	private IFile fFile;
-	private WorkspaceProductModel fProductModel;
-	private CrossPlatformExportPage fPage2;
-
-	public ProductExportWizard() {
-		setDefaultPageImageDescriptor(PDEPluginImages.DESC_PRODUCT_EXPORT_WIZ);
-	}
-	
-	public ProductExportWizard(IFile file) {
-		this();
-		fFile = file;
-	}
-
-	protected BaseExportWizardPage createPage1() {
-		return new ProductExportWizardPage(fFile == null ? getSelection() : new StructuredSelection(fFile));
-	}
-
-	public void addPages() {
-		super.addPages();
-		FeatureModelManager manager = PDECore.getDefault().getFeatureModelManager();
-		IFeatureModel model = manager.findFeatureModel("org.eclipse.platform.launchers"); //$NON-NLS-1$
-		if (model != null) {
-			fPage2 = new CrossPlatformExportPage("environment", model); //$NON-NLS-1$
-			addPage(fPage2);
-		}	
-	}
-	
-	protected String getSettingsSectionName() {
-		return STORE_SECTION;
-	}
-
-	protected Document generateAntTask() {
-		return null;
-	}
-
-	protected void scheduleExportJob() {
-		ProductExportWizardPage page = (ProductExportWizardPage)fPage1;
-		
-		FeatureExportInfo info = new FeatureExportInfo();
-		info.toDirectory = page.doExportToDirectory();
-		info.exportSource = page.doExportSource();
-		info.destinationDirectory = page.getDestination();
-		info.zipFileName = page.getFileName();
-		info.targets = fPage2 == null ? null : 
-				page.doMultiPlatform() ? fPage2.getTargets() : null;
-		info.javacSource = page.getJavacSource();
-		info.javacTarget = page.getJavacTarget();
-		if (fProductModel.getProduct().useFeatures())
-			info.items = getFeatureModels();
-		else
-			info.items = getPluginModels();
-		
-		String rootDirectory = page.getRootDirectory();
-		if ("".equals(rootDirectory.trim())) //$NON-NLS-1$
-			rootDirectory = ".";  //$NON-NLS-1$
-		ProductExportJob job = new ProductExportJob(info, fProductModel, rootDirectory);
-		job.setUser(true);
-		job.schedule();
-		job.setProperty(IProgressConstants.ICON_PROPERTY, PDEPluginImages.DESC_FEATURE_OBJ);
-	}
-	
-	private IFeatureModel[] getFeatureModels() {
-		ArrayList list = new ArrayList();
-		FeatureModelManager manager = PDECore.getDefault()
-				.getFeatureModelManager();
-		IProductFeature[] features = fProductModel.getProduct().getFeatures();
-		for (int i = 0; i < features.length; i++) {
-			IFeatureModel model = manager.findFeatureModel(features[i].getId(),
-					features[i].getVersion());
-			if (model != null)
-				list.add(model);
-		}
-		return (IFeatureModel[]) list.toArray(new IFeatureModel[list.size()]);
-	}
-
-	private BundleDescription[] getPluginModels() {
-		ArrayList list = new ArrayList();
-		State state = TargetPlatform.getState();
-		IProductPlugin[] plugins = fProductModel.getProduct().getPlugins();
-		for (int i = 0; i < plugins.length; i++) {
-			BundleDescription bundle = state.getBundle(plugins[i].getId(), null);
-			if (bundle != null)
-				list.add(bundle);
-		}
-		return (BundleDescription[]) list.toArray(new BundleDescription[list.size()]);
-	}
-	
-	protected boolean performPreliminaryChecks() {
-		ProductExportWizardPage page = (ProductExportWizardPage)fPage1;
-		fProductModel = new WorkspaceProductModel(page.getProductFile(), false);
-		try {
-			fProductModel.load();
-			if (!fProductModel.isLoaded()) {
-				MessageDialog.openError(getContainer().getShell(), PDEUIMessages.ProductExportWizard_error, PDEUIMessages.ProductExportWizard_corrupt); // 
-				return false;
-			}
-		} catch (CoreException e) {
-			MessageDialog.openError(getContainer().getShell(), PDEUIMessages.ProductExportWizard_error, PDEUIMessages.ProductExportWizard_corrupt); // 
-			return false;
-		}
-
-		if (((ProductExportWizardPage)fPage1).doSync()) {
-			try {
-				getContainer().run(false, false, new SynchronizationOperation(fProductModel.getProduct(), getContainer().getShell()));
-			} catch (InvocationTargetException e) {
-				MessageDialog.openError(getContainer().getShell(), "Synchronize", e.getTargetException().getMessage()); //$NON-NLS-1$
-				return false;
-			} catch (InterruptedException e) {
-				return false;
-			}
-		}		
-		return true;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ProductExportWizardPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ProductExportWizardPage.java
deleted file mode 100644
index 0b64555..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/ProductExportWizardPage.java
+++ /dev/null

@@ -1,289 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.exports;
-
-import org.eclipse.core.internal.resources.ICoreConstants;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.util.FileExtensionFilter;
-import org.eclipse.pde.internal.ui.util.FileValidator;
-import org.eclipse.pde.internal.ui.util.SWTUtil;
-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.Text;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-public class ProductExportWizardPage extends BaseExportWizardPage {
-	
-	private static final String S_PRODUCT_CONFIG = "productConfig"; //$NON-NLS-1$
-	private static final String S_ROOT_DIR = "productRoot"; //$NON-NLS-1$
-	private static final String S_SYNC_PRODUCT = "syncProduct"; //$NON-NLS-1$
-
-	private Button fSyncButton;
-	private Text fProductRootText;
-	private Combo fProductCombo;
-	private IStructuredSelection fSelection;
-
-	public ProductExportWizardPage(IStructuredSelection selection) {
-		super("productExport"); //$NON-NLS-1$
-		fSelection = selection;
-		setTitle(PDEUIMessages.ProductExportWizardPage_title); 
-		setDescription(PDEUIMessages.ProductExportWizardPage_desc); 
-	}
-
-	protected void createTopSection(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.marginWidth = layout.marginHeight = 0;
-		container.setLayout(layout);
-		container.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		createConfigurationSection(container);
-		createSynchronizationSection(container);
-		checkForProductFile(container);
-	}
-	
-	protected void initializeTopSection() {
-		if (fSelection.size() > 0) {
-			Object object = fSelection.getFirstElement();
-			if (object instanceof IFile) {
-				IFile file = (IFile)object;
-				if ("product".equals(file.getFileExtension())) { //$NON-NLS-1$
-					String entry = file.getFullPath().toString();
-					if (fProductCombo.indexOf(entry) == -1) {
-						fProductCombo.add(entry, 0);
-					}
-					fProductCombo.setText(entry);	
-				}
-			}
-		}
-		
-		IDialogSettings settings = getDialogSettings();		
-		String value = settings.get(S_ROOT_DIR);
-		fProductRootText.setText(value == null ? "eclipse" : value); //$NON-NLS-1$
-		
-		value = settings.get(S_SYNC_PRODUCT);
-		fSyncButton.setSelection(value == null ? true : settings.getBoolean(S_SYNC_PRODUCT));	
-	}
-	
-	private void createConfigurationSection(Composite parent) {
-		Group group = new Group(parent, SWT.NONE);
-		group.setLayout(new GridLayout(3, false));
-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		group.setText(PDEUIMessages.ProductExportWizardPage_productGroup); 
-		
-		Label label = new Label(group, SWT.NONE);
-		label.setText(PDEUIMessages.ProductExportWizardPage_config); 
-		
-		fProductCombo = new Combo(group, SWT.BORDER);
-		fProductCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		Button browse = new Button(group, SWT.PUSH);
-		browse.setText(PDEUIMessages.ProductExportWizardPage_browse); 
-		browse.setLayoutData(new GridData());
-		browse.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleBrowse();
-			}
-		});
-		SWTUtil.setButtonDimensionHint(browse);
-		
-		label = new Label(group, SWT.NONE);
-		label.setText(PDEUIMessages.ProductExportWizardPage_root); 
-		
-		fProductRootText = new Text(group, SWT.SINGLE|SWT.BORDER);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		fProductRootText.setLayoutData(gd);
-	}
-	
-	private void createSynchronizationSection(Composite parent) {
-		Group group = new Group(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.verticalSpacing = 7;
-		group.setLayout(layout);
-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		group.setText(PDEUIMessages.ProductExportWizardPage_sync); 
-		
-		Label label = new Label(group, SWT.WRAP);
-		label.setText(PDEUIMessages.ProductExportWizardPage_syncText); 
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.widthHint = 400;
-		label.setLayoutData(gd);
-		
-		fSyncButton = new Button(group, SWT.CHECK);
-		fSyncButton.setText(PDEUIMessages.ProductExportWizardPage_syncButton); 
-		gd = new GridData();
-		gd.horizontalIndent = 20;
-		fSyncButton.setLayoutData(gd);
-	}
-	
-	protected String getJarButtonText() {
-		return PDEUIMessages.BaseExportWizardPage_packageJARs; 
-	}
-	
-	protected void hookListeners() {
-		super.hookListeners();
-		
-		fProductCombo.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				pageChanged();
-			}
-		});
-		
-		fProductCombo.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				pageChanged();
-			}
-		});
-	}
-
-	protected void pageChanged() {
-		super.pageChanged();
-		String errorMessage = null;
-		String message = null;
-		String configLocation = fProductCombo.getText().trim();
-		if (configLocation.length() == 0) {
-			message = PDEUIMessages.ProductExportWizardPage_noProduct; 
-		} else {
-			IPath path = new Path(configLocation);
-			IResource resource = PDEPlugin.getWorkspace().getRoot().findMember(path);
-			if (resource == null || !(resource instanceof IFile)) {
-				errorMessage = PDEUIMessages.ProductExportWizardPage_productNotExists; 
-			} else if (!path.lastSegment().endsWith(".product")) { //$NON-NLS-1$
-				errorMessage = PDEUIMessages.ProductExportWizardPage_wrongExtension; 
-			}
-		}
-		if (message == null && errorMessage == null)
-			message = validateBottomSections();
-		setErrorMessage(errorMessage);
-		setMessage(message);
-		setPageComplete(getMessage() == null && getErrorMessage() == null);
-	}
-	
-	public IWizardPage getNextPage() {
-		if (!doMultiPlatform()) {
-			return null;
-		}
-		return getWizard().getNextPage(this);
-	}
-	
-	private void handleBrowse() {
-		ElementTreeSelectionDialog dialog =
-			new ElementTreeSelectionDialog(
-				getContainer().getShell(),
-				new WorkbenchLabelProvider(),
-				new WorkbenchContentProvider());
-				
-		dialog.setValidator(new FileValidator());
-		dialog.setAllowMultiple(false);
-		dialog.setTitle(PDEUIMessages.ProductExportWizardPage_fileSelection); 
-		dialog.setMessage(PDEUIMessages.ProductExportWizardPage_productSelection); 
-		dialog.addFilter(new FileExtensionFilter("product"));  //$NON-NLS-1$
-		dialog.setInput(PDEPlugin.getWorkspace().getRoot());
-		IFile product = getProductFile();
-		if (product != null) dialog.setInitialSelection(product);
-
-		if (dialog.open() == ElementTreeSelectionDialog.OK) {
-			IFile file = (IFile)dialog.getFirstResult();
-			String value = file.getFullPath().toString();
-			if (fProductCombo.indexOf(value) == -1)
-				fProductCombo.add(value, 0);
-			fProductCombo.setText(value);
-		}
-	}
-	
-	private void checkForProductFile(Composite container) {
-		IProject[] projects = PDEPlugin.getWorkspace().getRoot().getProjects();
-		if (projects.length == 0) return;
-		
-		try {
-			IResource[] members = projects[0].members();
-			for (int i = 0; i < members.length; i++) {
-				if (members[i] instanceof IContainer)
-					continue;
-				String name = members[i].getName();
-				if (name.endsWith(".product")) { //$NON-NLS-1$
-					String path = members[i].getFullPath().toString();
-					if (fProductCombo.indexOf(path) == -1)
-						fProductCombo.add(path, 0);
-					fProductCombo.setText(path);
-					return;
-				}
-			}
-		} catch (CoreException e) {}
-	}
-	
-	
-	protected void hookHelpContext(Control control) {
-	}
-	
-	public void saveSettings() {
-		super.saveSettings();
-		IDialogSettings settings = getDialogSettings();
-		saveCombo(settings, S_PRODUCT_CONFIG, fProductCombo);
-		settings.put(S_ROOT_DIR, fProductRootText.getText().trim());
-		settings.put(S_SYNC_PRODUCT, fSyncButton.getSelection());
-	}
-	
-	public boolean doSync() {
-		return fSyncButton.getSelection();
-	}
-	
-	public String getRootDirectory() {
-		return fProductRootText.getText().trim();
-	}
-	
-	public IFile getProductFile() {
-		String product = fProductCombo.getText().trim();
-		if (product.equals("")) return null; //$NON-NLS-1$
-		IPath path = new Path(product);
-		if (path.segmentCount() < ICoreConstants.MINIMUM_FILE_SEGMENT_LENGTH)
-			return null;
-		return PDEPlugin.getWorkspace().getRoot().getFile(path);
-	}
-    
-    protected boolean addAntSection() {
-        return false;
-    }
-    
-    protected boolean addJARFormatSection() {
-        return false;
-    }
-    
-    protected int getVerticalSpacing() {
-        return super.getVerticalSpacing() * 2;
-    }
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/BaseExtensionPointMainPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/BaseExtensionPointMainPage.java
deleted file mode 100644
index 9c9f23b..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/BaseExtensionPointMainPage.java
+++ /dev/null

@@ -1,493 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.extension;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-
-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.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-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.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.ischema.IDocumentSection;
-import org.eclipse.pde.internal.core.ischema.ISchemaAttribute;
-import org.eclipse.pde.internal.core.ischema.ISchemaCompositor;
-import org.eclipse.pde.internal.core.schema.DocumentSection;
-import org.eclipse.pde.internal.core.schema.EditableSchema;
-import org.eclipse.pde.internal.core.schema.SchemaAttribute;
-import org.eclipse.pde.internal.core.schema.SchemaComplexType;
-import org.eclipse.pde.internal.core.schema.SchemaCompositor;
-import org.eclipse.pde.internal.core.schema.SchemaElement;
-import org.eclipse.pde.internal.core.schema.SchemaSimpleType;
-import org.eclipse.pde.internal.core.util.CoreUtility;
-import org.eclipse.pde.internal.core.util.IdUtil;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.IPDEUIConstants;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.util.SWTUtil;
-import org.eclipse.pde.internal.ui.wizards.PluginSelectionDialog;
-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.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.views.navigator.ResourceSorter;
-public abstract class BaseExtensionPointMainPage extends WizardPage {
-	public static final String SETTINGS_PLUGIN_ID = "BaseExtensionPoint.settings.pluginId"; //$NON-NLS-1$
-	public static final String SCHEMA_DIR = "schema"; //$NON-NLS-1$
-
-	private IContainer fContainer;
-	protected Text fIdText;
-	protected Text fPluginIdText;
-	protected Text fNameText;
-	protected Text fSchemaText;
-	protected Text fSchemaLocationText;
-	protected Button fOpenSchemaButton;
-	protected Button fSharedSchemaButton;
-	protected Button fPluginBrowseButton;
-	protected Button fFindLocationButton;
-	public BaseExtensionPointMainPage(IContainer container) {
-		super("newExtensionPoint"); //$NON-NLS-1$
-		fContainer = container;
-	}
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		layout.verticalSpacing = 9;
-		layout.makeColumnsEqualWidth = false;
-		container.setLayout(layout);
-		Label label;
-		GridData gd;
-		if (isPluginIdNeeded()) {
-			label = new Label(container, SWT.NONE);
-			label.setText(PDEUIMessages.BaseExtensionPoint_pluginId);
-			fPluginIdText = new Text(container, SWT.SINGLE | SWT.BORDER);
-			gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan=1;
-			gd.widthHint = 275;
-			fPluginIdText.setLayoutData(gd);
-			fPluginIdText.addModifyListener(new ModifyListener() {
-				public void modifyText(ModifyEvent e) {
-					validatePage();
-				}
-			});
-			fPluginBrowseButton = new Button(container, SWT.PUSH);
-			gd = new GridData(GridData.HORIZONTAL_ALIGN_END);
-			gd.horizontalSpan =1;
-			gd.widthHint = 50;
-			fPluginBrowseButton.setLayoutData(gd);
-			fPluginBrowseButton.setText(PDEUIMessages.BaseExtensionPointMainPage_pluginBrowse); 
-			fPluginBrowseButton.setToolTipText(PDEUIMessages.BaseExtensionPointMainPage_pluginId_tooltip); 
-			fPluginBrowseButton.addSelectionListener(new SelectionAdapter(){
-				public void widgetSelected(SelectionEvent e) {
-					handlePluginBrowse();
-				}
-			});
-			SWTUtil.setButtonDimensionHint(fPluginBrowseButton);
-		}
-		label = new Label(container, SWT.NONE);
-		label.setText(PDEUIMessages.BaseExtensionPoint_id);
-		fIdText = new Text(container, SWT.SINGLE | SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		fIdText.setLayoutData(gd);
-		fIdText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				fSchemaText
-						.setText(getSchemaLocation()
-								+ (getSchemaLocation().length() > 0 ? "/" : "") + fIdText.getText() + ".exsd"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				validatePage();
-			}
-		});
-		label = new Label(container, SWT.NONE);
-		label.setText(PDEUIMessages.BaseExtensionPoint_name);
-		fNameText = new Text(container, SWT.SINGLE | SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		fNameText.setLayoutData(gd);
-		fNameText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				validatePage();
-			}
-		});
-		if (isPluginIdNeeded() && !isPluginIdFinal()){
-			label = new Label(container, SWT.NONE);
-			label.setText(PDEUIMessages.BaseExtensionPoint_schemaLocation);
-			fSchemaLocationText = new Text(container, SWT.SINGLE | SWT.BORDER);
-			gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.widthHint = 150;
-			gd.grabExcessHorizontalSpace = true;
-			fSchemaLocationText.setLayoutData(gd);
-			fSchemaLocationText.addModifyListener(new ModifyListener(){
-				public void modifyText(ModifyEvent e){
-					validatePage();
-				}
-			});
-			fFindLocationButton = new Button(container, SWT.PUSH);
-			gd = new GridData(GridData.HORIZONTAL_ALIGN_END);
-			gd.widthHint = 50;
-			fFindLocationButton.setLayoutData(gd);
-			fFindLocationButton.setText(PDEUIMessages.BaseExtensionPointMainPage_findBrowse); 
-			fFindLocationButton.setToolTipText(PDEUIMessages.BaseExtensionPointMainPage_schemaLocation_tooltip); 
-			fFindLocationButton.addSelectionListener(new SelectionAdapter(){
-				public void widgetSelected(SelectionEvent e) {
-					handleSchemaLocation();
-				}
-			});
-			SWTUtil.setButtonDimensionHint(fFindLocationButton);
-		}
-		label = new Label(container, SWT.NONE);
-		label.setText(PDEUIMessages.BaseExtensionPoint_schema);
-		fSchemaText = new Text(container, SWT.SINGLE | SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		fSchemaText.setLayoutData(gd);
-		fSchemaText.addModifyListener(new ModifyListener(){
-			public void modifyText(ModifyEvent e){
-				validatePage();
-			}
-		});
-		if (isSharedSchemaSwitchNeeded()) {
-			fSharedSchemaButton = new Button(container, SWT.CHECK);
-			fSharedSchemaButton.setText(PDEUIMessages.BaseExtensionPoint_shared);
-			gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			fSharedSchemaButton.setLayoutData(gd);
-		}
-		fOpenSchemaButton = new Button(container, SWT.CHECK);
-		fOpenSchemaButton.setText(PDEUIMessages.BaseExtensionPoint_edit);
-		fOpenSchemaButton.setSelection(true);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		fOpenSchemaButton.setLayoutData(gd);
-		if (isPluginIdNeeded())
-			fPluginIdText.setFocus();
-		else
-			fIdText.setFocus();
-		setControl(container);
-		validatePage();
-		Dialog.applyDialogFont(container);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(container, IHelpContextIds.NEW_SCHEMA);
-	}
-	private InputStream createSchemaStream(String pluginId, String pointId,
-			String name, boolean shared) {
-		if (name.length() == 0)
-			name = pointId;
-		EditableSchema schema = new EditableSchema(pluginId, pointId, name, false);
-		schema.setDescription(PDEUIMessages.BaseExtensionPoint_sections_overview);
-		DocumentSection section;
-		section = new DocumentSection(schema, IDocumentSection.SINCE, PDEUIMessages.BaseExtensionPointMainPage_since); 
-		section.setDescription(PDEUIMessages.BaseExtensionPoint_sections_since);
-		schema.addDocumentSection(section);
-		SchemaElement element;
-		if (!shared) {
-			element = new SchemaElement(schema, "extension"); //$NON-NLS-1$
-			SchemaComplexType complexType = new SchemaComplexType(schema);
-			element.setType(complexType);
-			SchemaCompositor compositor = new SchemaCompositor(element,
-					ISchemaCompositor.SEQUENCE);
-			complexType.setCompositor(compositor);
-			SchemaAttribute attribute = new SchemaAttribute(element, "point"); //$NON-NLS-1$
-			attribute.setType(new SchemaSimpleType(schema, "string")); //$NON-NLS-1$
-			attribute.setUse(ISchemaAttribute.REQUIRED);
-			complexType.addAttribute(attribute);
-			attribute = new SchemaAttribute(element, "id"); //$NON-NLS-1$
-			attribute.setType(new SchemaSimpleType(schema, "string")); //$NON-NLS-1$
-			complexType.addAttribute(attribute);
-			attribute = new SchemaAttribute(element, "name"); //$NON-NLS-1$
-			attribute.setType(new SchemaSimpleType(schema, "string")); //$NON-NLS-1$
-			attribute.setTranslatableProperty(true);
-			complexType.addAttribute(attribute);
-			schema.addElement(element);
-		}
-		section = new DocumentSection(schema, IDocumentSection.EXAMPLES,
-		"Examples"); //$NON-NLS-1$
-		section.setDescription(PDEUIMessages.BaseExtensionPoint_sections_usage);
-		schema.addDocumentSection(section);
-		section = new DocumentSection(schema, IDocumentSection.API_INFO,
-		"API Information"); //$NON-NLS-1$
-		section.setDescription(PDEUIMessages.BaseExtensionPoint_sections_api);
-		schema.addDocumentSection(section);
-		section = new DocumentSection(schema, IDocumentSection.IMPLEMENTATION,
-		"Supplied Implementation"); //$NON-NLS-1$
-		section.setDescription(PDEUIMessages.BaseExtensionPoint_sections_supplied);
-		schema.addDocumentSection(section);
-		section = new DocumentSection(schema, IDocumentSection.COPYRIGHT,
-		"Copyright"); //$NON-NLS-1$
-		section.setDescription(PDEUIMessages.BaseExtensionPoint_sections_copyright);
-		schema.addDocumentSection(section);
-		StringWriter swriter = new StringWriter();
-		try {
-			PrintWriter writer = new PrintWriter(swriter, true);
-			schema.save(writer);
-			swriter.close();
-		} catch (IOException e) {
-			PDEPlugin.logException(e);
-		}
-		try {
-			return new ByteArrayInputStream(swriter.toString().getBytes("UTF8")); //$NON-NLS-1$
-		} catch (UnsupportedEncodingException e) {
-			return new ByteArrayInputStream(new byte[0]);
-		}
-	}
-	private IFile generateSchemaFile(String pluginId, String id, String name,
-			boolean shared, String schema, IProgressMonitor monitor)
-	throws CoreException {
-		IFile schemaFile = null;
-		
-		IWorkspace workspace = fContainer.getWorkspace();
-		IPath schemaPath = new Path(schema).removeLastSegments(1);
-		IPath newSchemaPath = fContainer.getProjectRelativePath().append(schemaPath);
-		monitor.subTask(PDEUIMessages.BaseExtensionPoint_generating);
-		if (newSchemaPath.isEmpty() == false) {
-			IFolder folder = fContainer.getProject().getFolder(newSchemaPath);
-			CoreUtility.createFolder(folder);
-		}
-		InputStream source = createSchemaStream(pluginId, id, name, shared);
-		IPath filePath = fContainer.getFullPath().append(schema);
-		schemaFile = workspace.getRoot().getFile(filePath);
-		if (!schemaFile.exists()) {
-			// create for the first time
-			schemaFile.create(source, true, monitor);
-		} else {
-			schemaFile.setContents(source, true, false, monitor);
-		}
-		IDE.setDefaultEditor(schemaFile, IPDEUIConstants.SCHEMA_EDITOR_ID);
-		return schemaFile;
-	}
-	public IRunnableWithProgress getOperation() {
-		final boolean openFile = fOpenSchemaButton.getSelection();
-		final String id = fIdText.getText();
-		final String name = fNameText.getText();
-		final String schema = fSchemaText.getText();
-		final boolean shared = fSharedSchemaButton != null ? fSharedSchemaButton
-				.getSelection() : false;
-				IRunnableWithProgress operation = new WorkspaceModifyOperation() {
-					public void execute(IProgressMonitor monitor) {
-						try {
-							String schemaName = schema;
-							if (!schema.endsWith(".exsd")) //$NON-NLS-1$
-								schemaName = schema + ".exsd"; //$NON-NLS-1$
-							
-							IFile file = fContainer.getFile(new Path(schema));
-							// do not overwrite if schema already exists
-							if (!file.exists())
-								file = generateSchemaFile(getPluginId(), id, name,
-									shared, schemaName, monitor);
-							
-							if (file != null && openFile){
-								fSchemaText.setText(file.getProjectRelativePath().toString());
-								openSchemaFile(file);
-							}
-							
-						} catch (CoreException e) {
-							PDEPlugin.logException(e);
-						} finally {
-							monitor.done();
-						}
-					}
-				};
-				return operation;
-	}
-	public String getSchemaLocation() {
-		if (fSchemaText!=null){
-			String schema = fSchemaText.getText();
-			if (schema.length() == 0) {
-				if (fSchemaLocationText != null
-						&& SCHEMA_DIR.equals(new Path(fSchemaLocationText
-								.getText()).lastSegment())) {
-					return ""; //$NON-NLS-1$
-				}
-				return SCHEMA_DIR;
-			}
-			
-			int loc = schema.lastIndexOf("/"); //$NON-NLS-1$
-			if (loc!=-1)
-				return schema.substring(0,loc);
-		}
-		return ""; //$NON-NLS-1$
-	}
-	public String getPluginId() {
-		if (fPluginIdText != null) {
-			return fPluginIdText.getText();
-		}
-		return ""; //$NON-NLS-1$
-	}
-	
-	protected boolean isPluginIdNeeded() {
-		return false;
-	}
-	protected boolean isPluginIdFinal(){
-		return false;
-	}
-	protected boolean isSharedSchemaSwitchNeeded() {
-		return false;
-	}
-	private void openSchemaFile(final IFile file) {
-		final IWorkbenchWindow ww = PDEPlugin.getActiveWorkbenchWindow();
-		Display d = ww.getShell().getDisplay();
-		d.asyncExec(new Runnable() {
-			public void run() {
-				try {
-					String editorId = IPDEUIConstants.SCHEMA_EDITOR_ID;
-					ww.getActivePage().openEditor(new FileEditorInput(file),
-							editorId);
-				} catch (PartInitException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		});
-	}
-	public boolean checkFieldsFilled() {	
-		boolean empty = fIdText.getText().length() == 0 || fNameText.getText().length() == 0;
-        if (!empty) {
-            empty = !IdUtil.isValidExtensionPointId(fIdText.getText());
-        }
-		if (!empty && isPluginIdNeeded()) {
-			empty = getPluginId().length() == 0 || fSchemaText.getText().length() == 0 ;
-		}
-		if (!empty && !isPluginIdFinal())
-			empty = fSchemaLocationText.getText().length() == 0;
-		return !empty;
-	}
-
-    public boolean isInvalidValidId() {
-        return fIdText.getText().length()>0 && !IdUtil.isValidExtensionPointId(fIdText.getText());
-    }
-
-	private void validatePage() {
-		if (!validateContainer())
-			return;
-		boolean isFilled = checkFieldsFilled();
-		String message = null;
-        if (isInvalidValidId())
-            message = PDEUIMessages.BaseExtensionPoint_malformedId;                
-        else if (!isFilled) {
-            if (isPluginIdNeeded())
-				message = PDEUIMessages.BaseExtensionPoint_missingId;
-			else
-				message = PDEUIMessages.BaseExtensionPoint_noPlugin_missingId;
-		}
-		setPageComplete(isFilled);
-		setMessage(message, IMessageProvider.WARNING);
-	}
-	private boolean validateContainer() {
-		if (isPluginIdNeeded() && !isPluginIdFinal()){
-			String newContainerName = fSchemaLocationText.getText().trim();
-			if (newContainerName.length() == 0){
-				handleInvalidContainer();
-				return false;
-			}
-			IWorkspaceRoot root = PDECore.getWorkspace().getRoot();
-			IResource resource = root.findMember(new Path(newContainerName));
-			if (resource instanceof IContainer) {
-				fContainer = (IContainer)resource;
-				handleValidContainer();
-				return true;
-			}
-			fContainer = null;
-			handleInvalidContainer();
-			return false;		
-		}
-		
-		boolean exists = fContainer != null && fContainer.exists();
-		if (!exists)
-			handleInvalidContainer();
-		return exists;
-	}
-	private void handleInvalidContainer(){
-		setErrorMessage(PDEUIMessages.BaseExtensionPointMainPage_noContainer); 
-		setPageComplete(false);
-	}
-	private void handleValidContainer(){
-		setErrorMessage(null);
-	}
-	private void handlePluginBrowse(){
-		PluginSelectionDialog dialog = new PluginSelectionDialog(getShell(), PDECore.getDefault().getModelManager().getWorkspaceModels(), false);
-		dialog.create();
-		if (dialog.open() == Window.OK){
-			IPluginModelBase workspaceModelBase = (IPluginModelBase)dialog.getFirstResult();
-			fPluginIdText.setText(workspaceModelBase.getPluginBase().getId());
-		}
-	}
-	private void handleSchemaLocation(){
-		ElementTreeSelectionDialog dialog =
-			new ElementTreeSelectionDialog(
-				getShell(),
-				new WorkbenchLabelProvider(),
-				new WorkbenchContentProvider());
-		dialog.setTitle(PDEUIMessages.BaseExtensionPointMainPage_schemaLocation_title); 
-		dialog.setMessage(PDEUIMessages.BaseExtensionPointMainPage_schemaLocation_desc); 
-		dialog.setDoubleClickSelects(false);
-		dialog.setAllowMultiple(false);
-		dialog.addFilter(new ViewerFilter(){
-			public boolean select(Viewer viewer, Object parentElement, Object element) {
-				if (element instanceof IFile)
-					return false;
-				return true;
-			}
-		});
-		
-		dialog.setInput(PDEPlugin.getWorkspace().getRoot());
-		dialog.setSorter(new ResourceSorter(ResourceSorter.NAME));
-		dialog.setInitialSelection(fContainer);
-		if (dialog.open() == Window.OK) {
-			Object[] elements = dialog.getResult();
-			if (elements.length >0){
-				IResource elem = (IResource) elements[0];
-				String newPath = getWorkspaceRelativePath(elem.getLocation().toString());
-				fSchemaLocationText.setText(newPath + "/"); //$NON-NLS-1$
-			}
-		}
-	}
-	private String getWorkspaceRelativePath(String path){
-		String workspacePath = PDECore.getWorkspace().getRoot().getLocation().toString();
-		if (path.startsWith(workspacePath))
-			path = path.replaceFirst(workspacePath, ""); //$NON-NLS-1$
-		return path;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/ExtensionEditorSelectionPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/ExtensionEditorSelectionPage.java
deleted file mode 100644
index b844254..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/ExtensionEditorSelectionPage.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.extension;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.wizard.IWizardNode;
-import org.eclipse.pde.core.plugin.IPluginBase;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.elements.ElementList;
-import org.eclipse.pde.internal.ui.wizards.*;
-import org.eclipse.pde.ui.*;
-
-/**
- *
- */
-public class ExtensionEditorSelectionPage extends WizardListSelectionPage {
-	private IProject fProject;
-	private IPluginBase fPluginBase;
-	private IStructuredSelection fSelection;
-	/**
-	 * @param categories
-	 * @param baseCategory
-	 * @param message
-	 */
-	public ExtensionEditorSelectionPage(ElementList wizards) {
-		super(wizards, PDEUIMessages.ExtensionEditorSelectionPage_message);  
-		setTitle(PDEUIMessages.ExtensionEditorSelectionPage_title); 
-		setDescription(PDEUIMessages.ExtensionEditorSelectionPage_desc); 
-	}
-	public void init(IProject project, IPluginBase pluginBase, IStructuredSelection selection) {
-		this.fProject = project;
-		this.fPluginBase = pluginBase;
-		this.fSelection = selection;
-	}
-	protected IWizardNode createWizardNode(WizardElement element) {
-		return new WizardNode(this, element) {
-			public IBasePluginWizard createWizard() throws CoreException {
-				IExtensionEditorWizard wizard = createWizard(wizardElement);
-				wizard.init(fProject, fPluginBase.getPluginModel(), fSelection);
-				return wizard;
-			}
-			protected IExtensionEditorWizard createWizard(WizardElement element)
-				throws CoreException {
-				return (IExtensionEditorWizard) element.createExecutableExtension();
-			}
-		};
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/ExtensionEditorWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/ExtensionEditorWizard.java
deleted file mode 100644
index d58947b..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/ExtensionEditorWizard.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.extension;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.elements.ElementList;
-
-public class ExtensionEditorWizard extends Wizard {
-	public static final String PLUGIN_POINT = "newExtension"; //$NON-NLS-1$
-	private ExtensionEditorSelectionPage pointPage;
-	private IPluginModelBase model;
-	private IProject project;
-	private IStructuredSelection selection;
-	private ElementList wizards;
-	
-	public ExtensionEditorWizard(IProject project, IPluginModelBase model, IStructuredSelection selection) {
-		setDialogSettings(PDEPlugin.getDefault().getDialogSettings());
-		setDefaultPageImageDescriptor(PDEPluginImages.DESC_NEWEX_WIZ);
-		this.model = model;
-		this.project = project;
-		this.selection = selection;
-		setForcePreviousAndNextButtons(true);
-		setWindowTitle(PDEUIMessages.ExtensionEditorWizard_wtitle);
-		PDEPlugin.getDefault().getLabelProvider().connect(this);
-		loadWizardCollection();
-	}
-	public void addPages() {
-		pointPage =
-			new ExtensionEditorSelectionPage(wizards);
-		pointPage.init(project, model.getPluginBase(), selection);
-		addPage(pointPage);
-	}
-	private void loadWizardCollection() {
-		NewExtensionRegistryReader reader = new NewExtensionRegistryReader(true);
-		wizards = reader.readRegistry(
-				PDEPlugin.getPluginId(),
-				PLUGIN_POINT,
-				true);
-	}
-
-	public boolean performFinish() {
-		return true;
-	}
-
-	public void dispose() {
-		super.dispose();
-		PDEPlugin.getDefault().getLabelProvider().disconnect(this);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/ExtensionTreeSelectionPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/ExtensionTreeSelectionPage.java
deleted file mode 100644
index 1e2b3a2..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/ExtensionTreeSelectionPage.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.extension;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.wizard.IWizardNode;
-import org.eclipse.pde.core.plugin.IPluginBase;
-import org.eclipse.pde.internal.ui.wizards.*;
-import org.eclipse.pde.ui.*;
-import org.eclipse.pde.ui.templates.ITemplateSection;
-
-/**
- *
- */
-public class ExtensionTreeSelectionPage extends WizardTreeSelectionPage {
-	private IProject fProject;
-	private IPluginBase fPluginBase;
-	/**
-	 * @param categories
-	 * @param baseCategory
-	 * @param message
-	 */
-	public ExtensionTreeSelectionPage(WizardCollectionElement categories,
-			String baseCategory, String message) {
-		super(categories, baseCategory, message);
-	}
-	public void init(IProject project, IPluginBase pluginBase) {
-		this.fProject = project;
-		this.fPluginBase = pluginBase;
-	}
-	protected IWizardNode createWizardNode(WizardElement element) {
-		return new WizardNode(this, element) {
-			public IBasePluginWizard createWizard() throws CoreException {
-				IExtensionWizard wizard = createWizard(wizardElement);
-				wizard.init(fProject, fPluginBase.getPluginModel());
-				return wizard;
-			}
-			protected IExtensionWizard createWizard(WizardElement element)
-				throws CoreException {
-				if (element.isTemplate()) {
-					IConfigurationElement template = element.getTemplateElement();
-					if (template==null) return null;
-					ITemplateSection section =
-						(ITemplateSection) template.createExecutableExtension("class"); //$NON-NLS-1$
-					return new NewExtensionTemplateWizard(section);
-				}
-				return (IExtensionWizard) element.createExecutableExtension();		
-			}
-		};
-	}
-	public ISelectionProvider getSelectionProvider() {
-		return wizardSelectionViewer;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionPointMainPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionPointMainPage.java
deleted file mode 100644
index 2088b6d..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionPointMainPage.java
+++ /dev/null

@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.extension;
-
-import java.lang.reflect.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.operation.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.swt.widgets.*;
-
-public class NewExtensionPointMainPage extends BaseExtensionPointMainPage {
-	private IPluginModelBase model;
-	private IPluginExtensionPoint point;
-	
-	public NewExtensionPointMainPage(
-			IProject project,
-			IPluginModelBase model) {
-		this(project, model, null);
-	}
-	
-	public NewExtensionPointMainPage(IProject project, IPluginModelBase model, IPluginExtensionPoint point){
-		super(project);
-		initialize();
-		this.model = model;
-		this.point = point;
-	}
-	public void initialize(){
-		setTitle(PDEUIMessages.NewExtensionPointWizard_title);
-		setDescription(PDEUIMessages.NewExtensionPointWizard_desc);
-	}
-	public void createControl(Composite parent) {
-		super.createControl(parent);
-		initializeValues();
-		setPageComplete(checkFieldsFilled());
-		setMessage(null);
-	}
-	protected boolean isPluginIdFinal(){
-		return true;
-	}
-	public boolean finish() {
-		setPageComplete(false);
-		final String id = fIdText.getText();
-		final String name = fNameText.getText();
-		final String schema = fSchemaText.getText();
-		
-		IPluginBase plugin = model.getPluginBase();
-		
-		IPluginExtensionPoint point = model.getFactory().createExtensionPoint();
-		try {
-			point.setId(id);
-			if (name.length() > 0)
-				point.setName(name);
-			if (schema.length() > 0)
-				point.setSchema(schema);
-			
-			plugin.add(point);
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-		
-		if (schema.length() > 0) {
-			IRunnableWithProgress operation = getOperation();
-			try {
-				getContainer().run(false, true, operation);
-			} catch (InvocationTargetException e) {
-				PDEPlugin.logException(e);
-				return false;
-			} catch (InterruptedException e) {
-				return false;
-			}
-		}
-		return true;
-	}
-	public String getPluginId() {
-		return model.getPluginBase().getId();
-	}
-	public void initializeValues(){
-		if (point == null)
-			return;
-		if (fIdText!=null && point.getId()!=null)
-			fIdText.setText(point.getId());
-		if (fNameText !=null && point.getName() != null)
-			fNameText.setText(point.getName());
-		if (fSchemaText!= null && point.getSchema()!=null)
-			fSchemaText.setText(point.getSchema());
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionPointWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionPointWizard.java
deleted file mode 100644
index 61b336a..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionPointWizard.java
+++ /dev/null

@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.extension;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.editor.plugin.ManifestEditor;
-import org.eclipse.pde.internal.ui.wizards.*;
-
-public class NewExtensionPointWizard extends NewWizard {
-	private NewExtensionPointMainPage mainPage;
-	private IPluginModelBase model;
-	private IProject project;
-	private IPluginExtensionPoint point;
-	private ManifestEditor editor;
-	public NewExtensionPointWizard(IProject project, IPluginModelBase model, ManifestEditor editor) {
-		this(project, model, (IPluginExtensionPoint)null);
-		this.editor = editor;
-	}
-
-	public NewExtensionPointWizard(IProject project, IPluginModelBase model, IPluginExtensionPoint point){
-		initialize();
-		this.project = project;
-		this.model = model;
-		this.point = point;
-	}
-
-	public void initialize(){
-		setDialogSettings(PDEPlugin.getDefault().getDialogSettings());
-		setDefaultPageImageDescriptor(PDEPluginImages.DESC_NEWEXP_WIZ);
-		setWindowTitle(PDEUIMessages.NewExtensionPointWizard_wtitle);
-		setNeedsProgressMonitor(true);
-	}
-	
-	public void addPages() {
-		mainPage = new NewExtensionPointMainPage(project, model, point);
-		addPage(mainPage);
-	}
-
-	public boolean performFinish() {
-		if (editor!=null)
-			editor.ensurePluginContextPresence();
-		return mainPage.finish();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionRegistryReader.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionRegistryReader.java
deleted file mode 100644
index 92a6ed8..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionRegistryReader.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.extension;
-
-import java.util.Locale;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.elements.ElementList;
-import org.eclipse.pde.internal.ui.wizards.*;
-import org.eclipse.swt.graphics.Image;
-
-public class NewExtensionRegistryReader {
-	public static final String TAG_WIZARD = "wizard"; //$NON-NLS-1$
-	public static final String TAG_EDITOR_WIZARD = "editorWizard"; //$NON-NLS-1$
-	public static final String ATT_CATEGORY = "category"; //$NON-NLS-1$
-	public static final String ATT_SHORTCUTTABLE = "availableAsShortcut"; //$NON-NLS-1$
-	public static final String CATEGORY_SEPARATOR = "/"; //$NON-NLS-1$
-	public static final String TAG_CATEGORY = "category"; //$NON-NLS-1$
-	public static final String TAG_DESCRIPTION = "description"; //$NON-NLS-1$
-
-	private final static String UNCATEGORIZED_WIZARD_CATEGORY = "org.eclipse.pde.ui.Other"; //$NON-NLS-1$
-	private final static String UNCATEGORIZED_WIZARD_CATEGORY_LABEL = "Other"; //$NON-NLS-1$
-	
-	private boolean editorWizardMode;
-	
-	public NewExtensionRegistryReader() {
-		this(false);
-	}
-	public NewExtensionRegistryReader(boolean editorWizardMode) {
-		this.editorWizardMode = editorWizardMode;
-	}
-	protected WizardCollectionElement createCollectionElement(
-			WizardCollectionElement parent, String id, String label) {
-		WizardCollectionElement newElement = new WizardCollectionElement(id,
-				label, parent);
-
-		if (parent != null)
-			parent.add(newElement);
-
-		return newElement;
-	}
-	
-	protected WizardElement createWizardElement(IConfigurationElement config) {
-		String name = config.getAttribute(WizardElement.ATT_NAME);
-		String id = config.getAttribute(WizardElement.ATT_ID);
-		String className = config.getAttribute(WizardElement.ATT_CLASS);
-		String template = config.getAttribute(WizardElement.ATT_TEMPLATE);
-		if (name == null || id == null)
-			return null;
-		if (className == null && template == null)
-			return null;
-		WizardElement element = new WizardElement(config);
-		String imageName = config.getAttribute(WizardElement.ATT_ICON);
-		if (imageName != null) {
-			String pluginID = config.getNamespace();
-			Image image = PDEPlugin.getDefault().getLabelProvider()
-					.getImageFromPlugin(pluginID, imageName);
-			element.setImage(image);
-		}
-		return element;
-	}
-	protected WizardElement createEditorWizardElement(IConfigurationElement config) {
-		String name = config.getAttribute(WizardElement.ATT_NAME);
-		String id = config.getAttribute(WizardElement.ATT_ID);
-		String className = config.getAttribute(WizardElement.ATT_CLASS);
-		String point = config.getAttribute(WizardElement.ATT_POINT);
-		if (name == null || id == null || className==null)
-			return null;
-		if (point == null)
-			return null;
-		WizardElement element = new WizardElement(config);
-		String imageName = config.getAttribute(WizardElement.ATT_ICON);
-		if (imageName != null) {
-			String pluginID = config.getNamespace();
-			Image image = PDEPlugin.getDefault().getLabelProvider()
-					.getImageFromPlugin(pluginID, imageName);
-			element.setImage(image);
-		}
-		return element;
-	}
-	protected String getCategoryStringFor(IConfigurationElement config) {
-		String result = config.getAttribute(ATT_CATEGORY);
-		if (result == null)
-			result = UNCATEGORIZED_WIZARD_CATEGORY;
-
-		return result;
-	}
-	protected WizardCollectionElement getChildWithID(
-			WizardCollectionElement parent, String id) {
-		Object[] children = parent.getChildren();
-
-		if (children != null) {
-			for (int i = 0; i < children.length; i++) {
-				WizardCollectionElement currentChild = (WizardCollectionElement) children[i];
-				if (currentChild.getId().equals(id))
-					return currentChild;
-			}
-		}
-		return null;
-	}
-	protected void insertUsingCategory(WizardElement element, ElementList result) {
-		WizardCollectionElement currentResult = (WizardCollectionElement) result;
-		StringTokenizer familyTokenizer = new StringTokenizer(
-				getCategoryStringFor(element.getConfigurationElement()),
-				CATEGORY_SEPARATOR);
-
-		// use the period-separated sections of the current Wizard's category
-		// to traverse through the NamedSolution "tree" that was previously
-		// created
-		WizardCollectionElement currentCollectionElement = currentResult; // ie.-
-																		  // root
-		boolean moveToOther = false;
-
-		while (familyTokenizer.hasMoreElements()) {
-			WizardCollectionElement tempCollectionElement = getChildWithID(
-					currentCollectionElement, familyTokenizer.nextToken());
-
-			if (tempCollectionElement == null) { // can't find the path; bump it
-												 // to uncategorized
-				moveToOther = true;
-				break;
-			} 
-			currentCollectionElement = tempCollectionElement;
-		}
-
-		if (moveToOther)
-			moveElementToUncategorizedCategory(currentResult, element);
-		else
-			currentCollectionElement.getWizards().add(element);
-	}
-	protected void moveElementToUncategorizedCategory(
-			WizardCollectionElement root, WizardElement element) {
-		WizardCollectionElement otherCategory = getChildWithID(root,
-				UNCATEGORIZED_WIZARD_CATEGORY);
-
-		if (otherCategory == null)
-			otherCategory = createCollectionElement(root,
-					UNCATEGORIZED_WIZARD_CATEGORY,
-					UNCATEGORIZED_WIZARD_CATEGORY_LABEL);
-
-		otherCategory.getWizards().add(element);
-	}
-	private void processCategory(IConfigurationElement config, ElementList list) {
-		WizardCollectionElement result = (WizardCollectionElement) list;
-		Category category = null;
-
-		category = new Category(config);
-		if (category.getID() == null || category.getLabel() == null) {
-			System.out.println(PDEUIMessages.NewExtensionRegistryReader_missingProperty); 
-			return;
-		}
-
-		String[] categoryPath = category.getParentCategoryPath();
-		WizardCollectionElement parent = result; // ie.- root
-
-		if (categoryPath != null) {
-			for (int i = 0; i < categoryPath.length; i++) {
-				WizardCollectionElement tempElement = getChildWithID(parent,
-						categoryPath[i]);
-				if (tempElement == null) {
-					parent = null;
-					break;
-				}
-				parent = tempElement;
-			}
-		}
-
-		if (parent != null)
-			createCollectionElement(parent, category.getID(), category
-					.getLabel());
-	}
-	protected void processElement(IConfigurationElement element,
-			ElementList result, boolean shortcutsOnly) {
-		String tag = element.getName();
-		if (tag.equals(TAG_WIZARD) && !editorWizardMode) {
-			WizardElement wizard = createWizardElement(element);
-			if (shortcutsOnly) {
-				String shortcut = element.getAttribute(ATT_SHORTCUTTABLE);
-				if (shortcut != null && shortcut.toLowerCase(Locale.ENGLISH).equals("true")) { //$NON-NLS-1$
-					result.add(wizard);
-				}
-			} else
-				insertUsingCategory(wizard, result);
-		} else if (tag.equals(TAG_EDITOR_WIZARD) && editorWizardMode) {
-			WizardElement wizard = createEditorWizardElement(element);
-			if (shortcutsOnly) {
-				result.add(wizard);
-			}
-			else
-				insertUsingCategory(wizard, result);
-		} 
-		else if (tag.equals(TAG_CATEGORY)) {
-			if (shortcutsOnly == false) {
-				processCategory(element, result);
-			}
-		}
-	}
-	public ElementList readRegistry(String pluginId, String pluginPointId,
-			boolean shortcutsOnly) {
-		ElementList result = (shortcutsOnly)
-				? (new ElementList("shortcuts")) //$NON-NLS-1$
-				: (new WizardCollectionElement("root", "root", null)); //$NON-NLS-1$ //$NON-NLS-2$
-		IExtensionRegistry registry = Platform.getExtensionRegistry();
-		IExtensionPoint point = registry.getExtensionPoint(pluginId,
-				pluginPointId);
-		if (point == null)
-			return null;
-
-		IExtension[] extensions = point.getExtensions();
-		for (int i = 0; i < extensions.length; i++) {
-			IConfigurationElement[] elements = extensions[i]
-					.getConfigurationElements();
-			for (int j = 0; j < elements.length; j++) {
-				IConfigurationElement config = elements[j];
-				processElement(config, result, shortcutsOnly);
-			}
-		}
-		return result;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionTemplateWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionTemplateWizard.java
deleted file mode 100644
index c488e47..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionTemplateWizard.java
+++ /dev/null

@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.extension;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.ui.IExtensionWizard;
-import org.eclipse.pde.ui.templates.*;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-/**
- * This wizard should be used as a base class for 
- * wizards that provide new plug-in templates. 
- * These wizards are loaded during new plug-in or fragment
- * creation and are used to provide initial
- * content (Java classes, directory structure and
- * extensions).
- * <p>
- * The wizard provides a common first page that will
- * initialize the plug-in itself. This plug-in will
- * be passed on to the templates to generate additional
- * content. After all templates have executed, 
- * the wizard will use the collected list of required
- * plug-ins to set up Java buildpath so that all the
- * generated Java classes can be resolved during the build.
- */
-
-public class NewExtensionTemplateWizard
-	extends Wizard
-	implements IExtensionWizard {
-	private ITemplateSection section;
-	IProject project;
-	IPluginModelBase model;
-	/**
-	 * Creates a new template wizard.
-	 */
-
-	public NewExtensionTemplateWizard(ITemplateSection section) {
-		super();
-		setDialogSettings(PDEPlugin.getDefault().getDialogSettings());
-		setDefaultPageImageDescriptor(PDEPluginImages.DESC_NEWEX_WIZ);
-		setNeedsProgressMonitor(true);
-		this.section = section;
-	}
-	
-	public void init(IProject project, IPluginModelBase model) {
-		this.project = project;
-		this.model = model;
-	}
-
-	public void setSection(ITemplateSection section) {
-		this.section = section;
-	}
-
-	public ITemplateSection getSection() {
-		return section;
-	}
-
-	public void addPages() {
-		section.addPages(this);
-		if (getSection() != null)
-			setWindowTitle(getSection().getLabel());
-		if (section instanceof BaseOptionTemplateSection) {
-			((BaseOptionTemplateSection)section).initializeFields(model);
-		}
-	}
-
-	public boolean performFinish() {
-		IRunnableWithProgress operation = new WorkspaceModifyOperation() {
-			public void execute(IProgressMonitor monitor) {
-				try {
-					doFinish(monitor);
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				} finally {
-					monitor.done();
-				}
-			}
-		};
-		try {
-			getContainer().run(false, true, operation);
-		} catch (InvocationTargetException e) {
-			PDEPlugin.logException(e);
-			return false;
-		} catch (InterruptedException e) {
-			PDEPlugin.logException(e);
-			return false;
-		}
-		return true;
-	}
-
-	protected void doFinish(IProgressMonitor monitor) throws CoreException {
-		int totalWork = section.getNumberOfWorkUnits();
-		monitor.beginTask(PDEUIMessages.NewExtensionTemplateWizard_generating, totalWork); 
-		updateDependencies();
-		section.execute(project, model, monitor); // nsteps
-	}
-
-	private void updateDependencies() throws CoreException {
-		IPluginReference[] refs = section.getDependencies(model.getPluginBase().getSchemaVersion());
-		for (int i = 0; i < refs.length; i++) {
-			IPluginReference ref = refs[i];
-			if (modelContains(ref) == false) {
-				IPluginImport iimport = model.getPluginFactory().createImport();
-				iimport.setId(ref.getId());
-				iimport.setMatch(ref.getMatch());
-				iimport.setVersion(ref.getVersion());
-				model.getPluginBase().add(iimport);
-			}
-		}
-	}
-
-	private boolean modelContains(IPluginReference ref) {
-		IPluginBase plugin = model.getPluginBase();
-		IPluginImport[] imports = plugin.getImports();
-		for (int i = 0; i < imports.length; i++) {
-			IPluginImport iimport = imports[i];
-			if (iimport.getId().equals(ref.getId())) {
-				// good enough
-				return true;
-			}
-		}
-		return false;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionWizard.java
deleted file mode 100644
index 9fc9482..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewExtensionWizard.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.extension;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.ui.editor.plugin.ManifestEditor;
-import org.eclipse.pde.internal.ui.wizards.*;
-import org.eclipse.pde.internal.ui.*;
-
-public class NewExtensionWizard extends NewWizard {
-	public static final String PLUGIN_POINT = "newExtension"; //$NON-NLS-1$
-	private PointSelectionPage fPointPage;
-	private IPluginModelBase fModel;
-	private IProject fProject;
-	private ManifestEditor fEditor;
-	private WizardCollectionElement fWizardCollection;
-	
-	public NewExtensionWizard(IProject project, IPluginModelBase model, ManifestEditor editor) {
-		setDialogSettings(PDEPlugin.getDefault().getDialogSettings());
-		setDefaultPageImageDescriptor(PDEPluginImages.DESC_NEWEX_WIZ);
-		fModel = model;
-		fProject = project;
-		fEditor = editor;
-		setForcePreviousAndNextButtons(true);
-		setWindowTitle(PDEUIMessages.NewExtensionWizard_wtitle);
-		loadWizardCollection();
-	}
-	public void addPages() {
-		fPointPage =
-			new PointSelectionPage(fProject, fModel, fWizardCollection, getTemplates(), this);
-		addPage(fPointPage);
-	}
-	private void loadWizardCollection() {
-		NewExtensionRegistryReader reader = new NewExtensionRegistryReader();
-		fWizardCollection = (WizardCollectionElement) reader.readRegistry(
-				PDEPlugin.getPluginId(),
-				PLUGIN_POINT,
-				false);
-	}
-	
-	public WizardCollectionElement getTemplates() {
-		WizardCollectionElement templateCollection = new WizardCollectionElement("", "", null); //$NON-NLS-1$ //$NON-NLS-2$
-		collectTemplates(fWizardCollection.getChildren(), templateCollection);
-		return templateCollection;
-	}
-	
-	private void collectTemplates(Object [] children, WizardCollectionElement list) {
-		for  (int i = 0; i<children.length; i++){
-			if (children[i] instanceof WizardCollectionElement) {
-				WizardCollectionElement element = (WizardCollectionElement)children[i];
-				collectTemplates(element.getChildren(), list);
-				collectTemplates(element.getWizards().getChildren(), list);
-			}
-			else if (children[i] instanceof WizardElement) {
-				WizardElement wizard = (WizardElement)children[i];
-				if (wizard.isTemplate())
-					list.getWizards().add(wizard);
-			}
-		}
-	}
-	public boolean performFinish() {
-		if (fPointPage.canFinish())
-			return fPointPage.finish();
-		return true;
-	}
-	
-	public ManifestEditor getEditor() {
-		return fEditor;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewSchemaFileMainPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewSchemaFileMainPage.java
deleted file mode 100644
index 4cdf664..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewSchemaFileMainPage.java
+++ /dev/null

@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.extension;
-
-import java.lang.reflect.*;
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.operation.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.swt.widgets.*;
-
-public class NewSchemaFileMainPage extends BaseExtensionPointMainPage {
-	private IPluginExtensionPoint point;
-	private IContainer container;
-	private boolean isPluginIdFinal;
-	
-	public NewSchemaFileMainPage(IContainer container) {
-		this(container, null, false);
-	}
-	
-	public NewSchemaFileMainPage(IContainer container, IPluginExtensionPoint point, boolean isPluginIdFinal){
-		super(container);
-		setTitle(PDEUIMessages.NewSchemaFileWizard_title);
-		setDescription(PDEUIMessages.NewSchemaFileWizard_desc);
-		this.point = point;
-		this.container = container;
-		this.isPluginIdFinal = isPluginIdFinal;
-	}
-
-	public void createControl(Composite parent) {
-		super.createControl(parent);
-		initializeValues();
-		fPluginIdText.setEnabled(!isPluginIdFinal);
-		fPluginBrowseButton.setEnabled(!isPluginIdFinal);
-		setMessage(null);
-	}
-	public boolean finish() {
-		IRunnableWithProgress operation = getOperation();
-		try {
-			getContainer().run(false, true, operation);
-			if (point != null){
-				point.setId(fIdText.getText());
-				point.setName(fNameText.getText());
-				point.setSchema(fSchemaText.getText());
-			}
-				
-		} catch (InvocationTargetException e) {
-			PDEPlugin.logException(e);
-			return false;
-		} catch (InterruptedException e) {
-			return false;
-		} catch (CoreException e){
-			return false;
-		}
-		return true;
-	}
-	protected boolean isPluginIdNeeded() {
-		return true;
-	}
-	protected boolean isPluginIdFinal(){
-		return isPluginIdFinal;
-	}
-	protected boolean isSharedSchemaSwitchNeeded() {
-		return true;
-	}
-	public void initializeValues(){
-		if (container!=null){
-			fPluginIdText.setText(container.getProject().getName());
-			if (!isPluginIdFinal())
-				fSchemaLocationText.setText(container.getProject().getName() + "/" + container.getProjectRelativePath().toString()); //$NON-NLS-1$
-		}
-		if (point == null)
-			return;
-		if (fIdText!=null && point.getId()!=null)
-			fIdText.setText(point.getId());
-		if (fNameText !=null && point.getName() != null)
-			fNameText.setText(point.getName());
-		if (fSchemaText!= null && point.getSchema()!=null)
-			fSchemaText.setText(point.getSchema());
-		
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewSchemaFileWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewSchemaFileWizard.java
deleted file mode 100644
index d754825..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/NewSchemaFileWizard.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.extension;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.ui.*;
-
-public class NewSchemaFileWizard extends Wizard implements INewWizard {
-	private NewSchemaFileMainPage mainPage;
-	private IContainer container;
-	private IPluginExtensionPoint point;
-	private boolean isPluginIdFinal;
-	public NewSchemaFileWizard() {
-		this(null, null, false);
-	}
-	public NewSchemaFileWizard(IProject project, IPluginExtensionPoint point, boolean isFinalPluginId){
-		initialize();
-		this.container = project;
-		this.point = point;
-		this.isPluginIdFinal = isFinalPluginId;
-	}
-	public void initialize(){
-		setDialogSettings(getSettingsSection());
-		setDefaultPageImageDescriptor(PDEPluginImages.DESC_EXT_POINT_SCHEMA_WIZ);
-		setWindowTitle(PDEUIMessages.NewSchemaFileWizard_wtitle);
-		setNeedsProgressMonitor(true);
-	}
-	public void addPages() {
-		mainPage = new NewSchemaFileMainPage(container, point, isPluginIdFinal);
-		addPage(mainPage);
-	}
-
-	private IDialogSettings getSettingsSection() {
-		IDialogSettings root = PDEPlugin.getDefault().getDialogSettings();
-		IDialogSettings section = root.getSection("newExtensionPointWizard"); //$NON-NLS-1$
-		if (section == null)
-			section = root.addNewSection("newExtensionPointWizard"); //$NON-NLS-1$
-		return section;
-	}
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		Object sel = selection.getFirstElement();
-		if (sel instanceof IJavaProject) {
-			container = ((IJavaProject) sel).getProject();
-		} else if (sel instanceof IContainer)
-			container = (IContainer) sel;
-	}
-
-	public boolean performFinish() {
-		return mainPage.finish();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/PointSelectionPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/PointSelectionPage.java
deleted file mode 100644
index 6e8c801..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/extension/PointSelectionPage.java
+++ /dev/null

@@ -1,550 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.extension;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-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.dialogs.Dialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-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.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.wizard.IWizardNode;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.core.plugin.IPluginExtension;
-import org.eclipse.pde.core.plugin.IPluginExtensionPoint;
-import org.eclipse.pde.core.plugin.IPluginImport;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.PluginModelManager;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDELabelProvider;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
-import org.eclipse.pde.internal.ui.elements.ElementLabelProvider;
-import org.eclipse.pde.internal.ui.model.plugin.PluginExtensionPointNode;
-import org.eclipse.pde.internal.ui.search.ShowDescriptionAction;
-import org.eclipse.pde.internal.ui.util.SharedLabelProvider;
-import org.eclipse.pde.internal.ui.wizards.BaseWizardSelectionPage;
-import org.eclipse.pde.internal.ui.wizards.ListUtil;
-import org.eclipse.pde.internal.ui.wizards.PluginSelectionDialog;
-import org.eclipse.pde.internal.ui.wizards.WizardCollectionElement;
-import org.eclipse.pde.internal.ui.wizards.WizardElement;
-import org.eclipse.pde.internal.ui.wizards.WizardNode;
-import org.eclipse.pde.ui.IBasePluginWizard;
-import org.eclipse.pde.ui.IExtensionWizard;
-import org.eclipse.pde.ui.templates.ITemplateSection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-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.Label;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.PlatformUI;
-
-public class PointSelectionPage
-	extends BaseWizardSelectionPage {
-	private TableViewer fPointListViewer;
-	private TableViewer fTemplateViewer;
-	
-	private IPluginModelBase fModel;
-	private Button fFilterCheck;
-	private IPluginExtensionPoint fCurrentPoint;
-	private HashSet fAvailableImports;
-	private Action fShowDetailsSection;
-	private IProject fProject;
-	private Label fTemplateLabel;
-	private ExtensionTreeSelectionPage fWizardsPage;
-	
-	private IPluginExtension fNewExtension;
-	private ShowDescriptionAction fShowDescriptionAction;
-	private WizardCollectionElement fTemplateCollection;
-	private WizardCollectionElement fWizardCollection;
-	private NewExtensionWizard fWizard;
-	
-	class PointFilter extends ViewerFilter {
-		public boolean select(Viewer viewer, Object parentElement, Object element) {
-			if (!fFilterCheck.getSelection())
-				return true;
-			
-			IPluginExtensionPoint point = (IPluginExtensionPoint) element;
-			if (point instanceof PluginExtensionPointNode)
-				return true;
-			
-			return fAvailableImports.contains(point.getPluginBase().getId());
-		}
-	}
-	
-	class TemplateContentProvider extends DefaultContentProvider implements IStructuredContentProvider{
-		public Object[] getElements(Object inputElement) {
-			if (inputElement instanceof IPluginExtensionPoint){
-				IPluginExtensionPoint point = (IPluginExtensionPoint)inputElement;
-				String pointID = getFullId(point);
-				ArrayList result = new ArrayList();
-				if (fTemplateCollection.getWizards() != null) {
-					Object[] wizards = fTemplateCollection.getWizards().getChildren();
-					for (int i = 0; i<wizards.length; i++){
-						String wizardContributorId = ((WizardElement)wizards[i]).getContributingId();
-						if (wizardContributorId == null || pointID == null)
-							continue;
-						if (wizards[i] instanceof WizardElement && wizardContributorId.equals(pointID))
-							result.add(wizards[i]);
-					}
-					return result.toArray();
-				}
-			}
-			return new Object[0];
-		}	
-	}
-	
-	class PointContentProvider
-		extends DefaultContentProvider
-		implements IStructuredContentProvider {
-		public Object[] getElements(Object parent) {
-			ArrayList extPoints = new ArrayList();
-			PluginModelManager manager = (PluginModelManager)parent;
-			IPluginModelBase[] plugins = manager.getPlugins();
-			for (int i = 0; i < plugins.length; i++) {
-				IPluginExtensionPoint[] points = plugins[i].getPluginBase().getExtensionPoints();
-				String id = plugins[i].getPluginBase().getId();
-				if (id.equals(fModel.getPluginBase().getId()))
-					continue;
-				for (int j = 0; j < points.length; j++)
-					extPoints.add(points[j]);
-			}
-			
-			IPluginExtensionPoint[] points = fModel.getPluginBase().getExtensionPoints();
-			for (int i = 0; i < points.length; i++)
-				extPoints.add(points[i]);
-			
-			return extPoints.toArray();
-		}
-	}
-
-	class PointLabelProvider
-		extends LabelProvider
-		implements ITableLabelProvider {
-		public String getText(Object obj) {
-			return getColumnText(obj, 0);
-		}
-		public String getColumnText(Object obj, int index) {
-			IPluginExtensionPoint extPoint = (IPluginExtensionPoint)obj;
-			PDELabelProvider provider = PDEPlugin.getDefault().getLabelProvider();
-			if (provider.isFullNameModeEnabled())
-				return provider.getText(extPoint);
-			
-			return getFullId(extPoint);
-		}
-		
-		public Image getImage(Object obj) {
-			return getColumnImage(obj, 0);
-		}
-		
-		public Image getColumnImage(Object obj, int index) {
-			IPluginExtensionPoint exp = (IPluginExtensionPoint) obj;
-			int flag =
-				exp instanceof PluginExtensionPointNode || 
-				fAvailableImports.contains(exp.getPluginBase().getId())
-					? 0
-					: SharedLabelProvider.F_WARNING;
-			if (((TemplateContentProvider)fTemplateViewer.getContentProvider()).getElements(exp).length >0)
-				return PDEPlugin.getDefault().getLabelProvider().get(
-						PDEPluginImages.DESC_NEWEXP_WIZ_TOOL,
-						flag);
-			return PDEPlugin.getDefault().getLabelProvider().get(
-				PDEPluginImages.DESC_EXT_POINT_OBJ,
-				flag);
-		}
-	}
-
-	public PointSelectionPage(IProject project, IPluginModelBase model, WizardCollectionElement element, WizardCollectionElement templates, NewExtensionWizard wizard) {
-		super("pointSelectionPage", PDEUIMessages.NewExtensionWizard_PointSelectionPage_title); //$NON-NLS-1$ 
-		this.fModel = model;
-		this.fWizardCollection = element;
-		this.fTemplateCollection = templates;
-		this.fWizard= wizard;
-		this.fProject=project;
-		fAvailableImports = PluginSelectionDialog.getExistingImports(model.getPluginBase());
-		setTitle(PDEUIMessages.NewExtensionWizard_PointSelectionPage_title); 
-		setDescription(PDEUIMessages.NewExtensionWizard_PointSelectionPage_desc); 
-		PDEPlugin.getDefault().getLabelProvider().connect(this);
-		makeActions();
-	}
-	
-	public void createControl(Composite parent) {
-		// tab folder
-		final TabFolder tabFolder = new TabFolder(parent, SWT.FLAT);
-		TabItem firstTab = new TabItem(tabFolder, SWT.NULL);
-		firstTab.setText(PDEUIMessages.PointSelectionPage_tab1); 
-		TabItem secondTab = new TabItem(tabFolder, SWT.NULL);
-		secondTab.setText(PDEUIMessages.PointSelectionPage_tab2); 
-		secondTab.setControl(createWizardsPage(tabFolder));
-		tabFolder.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				updateTabSelection(tabFolder.getSelectionIndex());
-			}
-		});
-		// top level group
-		Composite outerContainer = new Composite(tabFolder, SWT.NONE);
-		firstTab.setControl(outerContainer);
-		GridLayout layout = new GridLayout();
-		outerContainer.setLayout(layout);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		outerContainer.setLayoutData(gd);
-
-		Composite pointContainer = new Composite(outerContainer, SWT.NONE);
-		layout = new GridLayout();
-		layout.marginHeight = layout.marginWidth = 0;
-		pointContainer.setLayout(layout);
-		gd = new GridData(GridData.FILL_BOTH);
-		pointContainer.setLayoutData(gd);
-
-		Label pointLabel = new Label(pointContainer, SWT.NONE);
-		pointLabel.setText(PDEUIMessages.NewExtensionWizard_PointSelectionPage_availExtPoints_label); 
-		
-		fPointListViewer =
-			new TableViewer(
-				pointContainer,
-				SWT.V_SCROLL | SWT.H_SCROLL | SWT.BORDER);
-		fPointListViewer.setContentProvider(new PointContentProvider());
-		fPointListViewer.setLabelProvider(new PointLabelProvider());
-		fPointListViewer.addSelectionChangedListener(this);
-		fPointListViewer.addDoubleClickListener(new IDoubleClickListener(){
-			public void doubleClick(DoubleClickEvent event) {
-				if (canFinish()){
-					fWizard.performFinish();
-					fWizard.getShell().close();
-					fWizard.dispose();
-					fWizard.setContainer(null);
-				}
-			}
-		});
-
-		fPointListViewer.setSorter(ListUtil.NAME_SORTER);
-		gd = new GridData(GridData.FILL_BOTH);
-		gd.heightHint = 150;
-		fPointListViewer.getTable().setLayoutData(gd);
-
-		Composite templateComposite =
-			new Composite(outerContainer, SWT.NONE);
-		layout = new GridLayout();
-		layout.marginHeight = 9;
-		layout.marginWidth = 0;
-		templateComposite.setLayout(layout);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		templateComposite.setLayoutData(gd);
-		
-		fTemplateLabel = new Label(templateComposite, SWT.NONE);
-		fTemplateLabel.setText(PDEUIMessages.NewExtensionWizard_PointSelectionPage_contributedTemplates_title); 
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		fTemplateLabel.setLayoutData(gd);
-		
-		SashForm templateSashForm = new SashForm(templateComposite, SWT.HORIZONTAL);
-		templateSashForm.setLayout(new GridLayout());
-		gd = new GridData(GridData.FILL_BOTH);
-		gd.heightHint = 80;
-		templateSashForm.setLayoutData(gd);
-		
-		Composite wizardComposite =
-			new Composite(templateSashForm, SWT.NONE);
-		layout = new GridLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		wizardComposite.setLayout(layout);
-		gd =
-			new GridData(
-				GridData.FILL_BOTH | GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-		wizardComposite.setLayoutData(gd);
-		fTemplateViewer = new TableViewer(wizardComposite, SWT.V_SCROLL | SWT.H_SCROLL | SWT.BORDER);
-		fTemplateViewer.setContentProvider(new TemplateContentProvider());
-		fTemplateViewer.setLabelProvider(ElementLabelProvider.INSTANCE);
-		fTemplateViewer.setSorter(ListUtil.NAME_SORTER);
-		fTemplateViewer.addSelectionChangedListener(this);
-		gd = new GridData(GridData.FILL_BOTH);
-
-		fTemplateViewer.getTable().setLayoutData(gd);  
-		TableItem[] selection = fPointListViewer.getTable().getSelection();
-		if (selection != null && selection.length > 0)
-			fTemplateViewer.setInput(selection[0]);
-		fTemplateViewer.addDoubleClickListener(new IDoubleClickListener(){
-			public void doubleClick(DoubleClickEvent event) {
-				if (canFlipToNextPage()){
-					advanceToNextPage();
-				}
-			}
-		});
-		
-		Composite descriptionComposite =
-			new Composite(templateSashForm, SWT.NONE);
-		layout = new GridLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		descriptionComposite.setLayout(layout);
-		gd = new GridData(GridData.FILL_BOTH | GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-		descriptionComposite.setLayoutData(gd);
-		createDescriptionIn(descriptionComposite);
-
-		
-		fFilterCheck = new Button(outerContainer, SWT.CHECK);
-		fFilterCheck.setText(PDEUIMessages.NewExtensionWizard_PointSelectionPage_filterCheck); 
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		fFilterCheck.setLayoutData(gd);
-		fFilterCheck.setSelection(true);
-		fFilterCheck.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				fPointListViewer.refresh();
-			}
-		});
-		
-		getContainer().getShell().setSize(500, 500);
-		createMenuManager();
-		initialize();
-		setControl(tabFolder);
-		Dialog.applyDialogFont(outerContainer);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(
-			outerContainer,
-			IHelpContextIds.ADD_EXTENSIONS_SCHEMA_BASED);
-	}
-	private Control createWizardsPage(Composite parent) {
-		fWizardsPage = new ExtensionTreeSelectionPage(fWizardCollection, null, PDEUIMessages.PointSelectionPage_categories); 
-		fWizardsPage.createControl(parent);
-		fWizardsPage.setWizard(fWizard);
-		fWizardsPage.getSelectionProvider().addSelectionChangedListener(this);
-		fWizardsPage.init(fProject, fModel.getPluginBase());
-		return fWizardsPage.getControl();
-	}
-	private void createMenuManager(){
-		MenuManager mgr = new MenuManager();
-		mgr.addMenuListener(new IMenuListener(){
-
-			public void menuAboutToShow(IMenuManager manager) {
-				fillContextMenu(manager);
-			}
-			
-		});
-		mgr.setRemoveAllWhenShown(true);
-		Control control = fPointListViewer.getControl();
-		Menu menu = mgr.createContextMenu(control);
-		control.setMenu(menu);
-	}
-	private void fillContextMenu(IMenuManager mgr){
-		mgr.add(fShowDetailsSection);
-		ISelection selection = fPointListViewer.getSelection();
-		IPluginExtensionPoint point = (IPluginExtensionPoint)((IStructuredSelection)selection).getFirstElement();
-		fShowDetailsSection.setEnabled(point != null);
-		
-	}
-	
-	public void advanceToNextPage() {
-		getContainer().showPage(getNextPage());
-	}
-	
-	public boolean canFlipToNextPage() {
-		return getNextPage() != null;
-	}
-
-	public boolean canFinish() {
-		if (fTemplateViewer != null) {
-			ISelection selection = fTemplateViewer.getSelection();
-			if (selection instanceof IStructuredSelection){
-				IStructuredSelection ssel = (IStructuredSelection)selection;
-				if (!ssel.isEmpty())
-					return false;
-			}
-		}
-		if (fPointListViewer != null) {
-			ISelection selection = fPointListViewer.getSelection();
-			if (selection instanceof IStructuredSelection) {
-				IStructuredSelection ssel = (IStructuredSelection) selection;
-				if (ssel.isEmpty() == false)
-					return true;
-			}
-		}
-		return false;
-	}
-
-	public void dispose() {
-		PDEPlugin.getDefault().getLabelProvider().disconnect(this);
-		fWizardsPage.dispose();
-		super.dispose();
-	}
-
-	public boolean finish() {
-		String point = getFullId(fCurrentPoint);
-		
-		try {
-			IPluginExtension extension =
-				fModel.getFactory().createExtension();
-			extension.setPoint(point);
-			fModel.getPluginBase().add(extension);
-			
-			String pluginID = fCurrentPoint.getPluginBase().getId();
-			if (!(fCurrentPoint instanceof PluginExtensionPointNode)
-					&& !fAvailableImports.contains(pluginID)) {
-				if (MessageDialog
-						.openQuestion(
-								getShell(),
-								PDEUIMessages.NewExtensionWizard_PointSelectionPage_dependencyTitle,
-								NLS
-										.bind(
-												PDEUIMessages.NewExtensionWizard_PointSelectionPage_dependencyMessage,
-												new String[] { pluginID,
-														fCurrentPoint.getId() }))) {
-					IPluginImport importNode = fModel.getPluginFactory()
-							.createImport();
-					importNode.setId(pluginID);
-					fModel.getPluginBase().add(importNode);
-				}
-			}
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-		return true;
-	}
-
-	private void doShowDescription() {
-		if (fShowDescriptionAction == null)
-			fShowDescriptionAction = new ShowDescriptionAction(fCurrentPoint);
-		else
-			fShowDescriptionAction.setExtensionPoint(fCurrentPoint);
-		BusyIndicator.showWhile(fPointListViewer.getControl().getDisplay(), new Runnable() {
-			public void run() {
-				fShowDescriptionAction.run();
-			}
-		});
-	}
-	
-	public IPluginExtension getNewExtension() {
-		return fNewExtension;
-	}
-		
-	protected void initialize() {
-		fPointListViewer.addFilter(new PointFilter());
-		fPointListViewer.setInput(PDECore.getDefault().getModelManager());
-		fPointListViewer.getTable().setFocus();
-	}
-	
-	private void makeActions(){
-		fShowDetailsSection = new Action(){
-			public void run(){
-				doShowDescription();
-			}
-		};
-		fShowDetailsSection.setText(PDEUIMessages.NewExtensionWizard_PointSelectionPage_showDetails); 
-	}
-	
-	public void selectionChanged(SelectionChangedEvent event) {
-		
-		ISelection selection = event.getSelection();
-		setDescription(""); //$NON-NLS-1$
-		if (selection instanceof IStructuredSelection) {
-			IStructuredSelection ssel = (IStructuredSelection) selection;
-			if (ssel != null && !ssel.isEmpty()) {
-				if (ssel.getFirstElement() instanceof IPluginExtensionPoint){
-					fCurrentPoint = (IPluginExtensionPoint) ssel.getFirstElement();
-					fTemplateViewer.setInput(fCurrentPoint);
-					setDescription(NLS.bind(PDEUIMessages.NewExtensionWizard_PointSelectionPage_pluginDescription, fCurrentPoint.getFullId())); 
-					setDescriptionText(""); //$NON-NLS-1$
-					fTemplateLabel.setText(NLS.bind(PDEUIMessages.NewExtensionWizard_PointSelectionPage_contributedTemplates_label, fCurrentPoint.getFullId())); 
-					setSelectedNode(null);
-					setPageComplete(true);
-				} else if (ssel.getFirstElement() instanceof WizardElement) {
-					WizardElement wizardSelection = (WizardElement)ssel.getFirstElement();
-					setSelectedNode(createWizardNode(wizardSelection));
-					setDescriptionText(wizardSelection.getDescription());
-					setDescription(NLS.bind(PDEUIMessages.NewExtensionWizard_PointSelectionPage_templateDescription, wizardSelection.getLabel())); 
-					setPageComplete(false);
-				}
-			}
-			else {
-				setSelectedNode(null);
-				setPageComplete(false);
-			}
-		}
-		getContainer().updateButtons();
-	}
-	
-	private void updateTabSelection(int index) {
-		if (index==0) {
-			// extension point page
-			ISelection selection = fTemplateViewer.getSelection();
-			if (selection.isEmpty()==false)
-				selectionChanged(new SelectionChangedEvent(fTemplateViewer, selection));
-			else
-				selectionChanged(new SelectionChangedEvent(fPointListViewer, fPointListViewer.getSelection()));
-		}
-		else {
-			// wizard page
-			ISelectionProvider provider = fWizardsPage.getSelectionProvider();
-			selectionChanged(new SelectionChangedEvent(provider, provider.getSelection()));
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.BaseWizardSelectionPage#createWizardNode(org.eclipse.pde.internal.ui.wizards.WizardElement)
-	 */
-	protected IWizardNode createWizardNode(WizardElement element) {
-		return new WizardNode(this, element) {
-			public IBasePluginWizard createWizard() throws CoreException {
-				IExtensionWizard wizard = createWizard(wizardElement);
-				wizard.init(fProject, fModel);
-				return wizard;
-			}
-			protected IExtensionWizard createWizard(WizardElement element)
-			throws CoreException {
-				if (element.isTemplate()) {
-					IConfigurationElement template = element.getTemplateElement();
-					if (template==null) return null;
-					ITemplateSection section =
-						(ITemplateSection) template.createExecutableExtension("class"); //$NON-NLS-1$
-					return new NewExtensionTemplateWizard(section);
-				} 
-				return (IExtensionWizard) element.createExecutableExtension();
-			}
-		};
-	}
-	
-	private String getFullId(IPluginExtensionPoint point) {
-		if (point instanceof PluginExtensionPointNode) {
-			return fModel.getPluginBase().getId() + "." + point.getId(); //$NON-NLS-1$
-		}
-		return point.getFullId();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/BaseFeatureSpecPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/BaseFeatureSpecPage.java
deleted file mode 100644
index 4877f8d..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/BaseFeatureSpecPage.java
+++ /dev/null

@@ -1,323 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.wizards.feature;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.PluginVersionIdentifier;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.core.util.IdUtil;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.util.SWTUtil;
-import org.eclipse.pde.internal.ui.wizards.FeatureSelectionDialog;
-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.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
-
-public abstract class BaseFeatureSpecPage extends WizardPage {
-	
-	private boolean isPatch;
-	protected WizardNewProjectCreationPage mainPage;
-	protected Text featureIdText;
-	protected Text featureNameText;
-	protected Text featureVersionText;
-	protected Text featureProviderText;
-	protected Text patchIdText;
-	protected Text patchNameText;
-	protected Text patchProviderText;
-	protected Text libraryText;
-	protected Button browseButton;
-	protected Button customChoice;
-	protected String initialId;
-	protected String initialName;
-	protected Label libraryLabel;
-	protected boolean isInitialized = false;
-	protected IFeatureModel fFeatureToPatch;
-	
-	public BaseFeatureSpecPage(WizardNewProjectCreationPage mainPage,
-			boolean isPatch) {
-		super("specPage"); //$NON-NLS-1$
-		this.isPatch = isPatch;
-		this.mainPage = mainPage;
-	}
-	
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.verticalSpacing = 12;
-		layout.horizontalSpacing = 9;
-		container.setLayout(layout);
-		
-		ModifyListener listener = new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				verifyComplete();
-			}
-		};
-		
-		if (isPatch()) {
-			Group patchPropertiesGroup = new Group(container, SWT.NULL);
-			layout = new GridLayout(2, false);
-			patchPropertiesGroup.setLayout(layout);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			patchPropertiesGroup.setLayoutData(gd);
-			patchPropertiesGroup.setText(PDEUIMessages.NewFeatureWizard_SpecPage_patchProperties); 
-			Label label = new Label(patchPropertiesGroup, SWT.NULL);
-			label.setText(PDEUIMessages.NewFeaturePatch_SpecPage_id);
-			patchIdText = new Text(patchPropertiesGroup, SWT.BORDER);
-			gd = new GridData(GridData.FILL_HORIZONTAL);
-			patchIdText.setLayoutData(gd);
-			if (initialId != null)
-				patchIdText.setText(initialId);
-			patchIdText.addModifyListener(listener);
-			
-			label = new Label(patchPropertiesGroup, SWT.NULL);
-			label.setText(PDEUIMessages.NewFeaturePatch_SpecPage_name);
-			patchNameText = new Text(patchPropertiesGroup, SWT.BORDER);
-			gd = new GridData(GridData.FILL_HORIZONTAL);
-			patchNameText.setLayoutData(gd);
-			if (initialName != null)
-				patchNameText.setText(initialName);
-			patchNameText.addModifyListener(listener);
-			
-			label = new Label(patchPropertiesGroup, SWT.NULL);
-			label.setText(PDEUIMessages.NewFeaturePatch_SpecPage_provider);
-			patchProviderText = new Text(patchPropertiesGroup, SWT.BORDER);
-			gd = new GridData(GridData.FILL_HORIZONTAL);
-			patchProviderText.setLayoutData(gd);
-			patchProviderText.addModifyListener(listener);
-		}
-		addFeatureProperties(container, listener);
-		addCustomInstallHandlerSection(container, listener);
-		
-		setControl(container);
-		Dialog.applyDialogFont(container);
-	}
-	private void addCustomInstallHandlerSection(Composite parent, ModifyListener listener) {
-		Group customHandlerGroup = new Group(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		customHandlerGroup.setLayout(layout);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		customHandlerGroup.setLayoutData(gd);
-		customHandlerGroup.setText(PDEUIMessages.BaseFeatureSpecPage_customGroup); 
-
-		customChoice = new Button(customHandlerGroup, SWT.CHECK);
-		if (!isPatch())
-			customChoice.setText(PDEUIMessages.NewFeatureWizard_SpecPage_customProject);
-		else 
-			customChoice.setText(PDEUIMessages.NewFeatureWizard_SpecPage_patch_customProject);
-		customChoice.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				boolean isSelected = ((Button) e.widget).getSelection();
-				libraryText.setEnabled(isSelected);
-				libraryLabel.setEnabled(isSelected);
-				verifyComplete();
-			}
-		});
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		customChoice.setLayoutData(gd);
-		
-		libraryLabel = new Label(customHandlerGroup, SWT.NULL);
-		libraryLabel.setText(
-			PDEUIMessages.NewFeatureWizard_SpecPage_library);
-		gd = new GridData();
-		gd.horizontalIndent = 22;
-		libraryLabel.setLayoutData(gd);
-		libraryText = new Text(customHandlerGroup, SWT.SINGLE | SWT.BORDER);
-		libraryText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		libraryText.addModifyListener(listener);
-		
-	}
-	public boolean isPatch() {
-		return isPatch;
-	}
-	
-	protected abstract void verifyComplete();
-	/**
-	 * @return Returns the initialName.
-	 */
-	public String getInitialName() {
-		return initialName;
-	}
-	
-	/**
-	 * @param initialName
-	 *            The initialName to set.
-	 */
-	public void setInitialName(String initialName) {
-		this.initialName = initialName;
-	}
-	
-	/**
-	 * 
-	 * @param initialId
-	 */
-	public void setInitialId(String initialId) {
-		this.initialId = initialId;
-	}
-	
-	/**
-	 * @return Returns the initialId.
-	 */
-	public String getInitialId() {
-		return initialId;
-	}
-	
-	protected void initialize(){
-		customChoice.setSelection(false);
-		libraryText.setEnabled(false);
-		libraryLabel.setEnabled(false);
-	}
-	
-	private void addFeatureProperties(Composite container, ModifyListener listener){
-		Group featurePropertiesGroup = new Group(container, SWT.NULL);
-		GridLayout layout = new GridLayout(2, false);
-		featurePropertiesGroup.setLayout(layout);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		featurePropertiesGroup.setLayoutData(gd);
-		
-		if (isPatch()){
-			featurePropertiesGroup.setText(PDEUIMessages.BaseFeatureSpecPage_patchGroup_title); 
-						
-			Label label = new Label(featurePropertiesGroup, SWT.NULL);
-			label.setText(PDEUIMessages.NewFeatureWizard_SpecPage_id);
-			
-			Composite patchcontainer = new Composite(featurePropertiesGroup, SWT.NULL);
-			layout = new GridLayout(2, false);
-			layout.marginHeight = layout.marginWidth =0;
-			layout.horizontalSpacing = 5;
-			patchcontainer.setLayout(layout);
-			gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 1;
-			patchcontainer.setLayoutData(gd);
-			
-			featureIdText = new Text(patchcontainer, SWT.BORDER);
-			gd = new GridData(GridData.FILL_HORIZONTAL);
-			featureIdText.setLayoutData(gd);
-			if (initialId != null)
-				featureIdText.setText(initialId);
-			featureIdText.addModifyListener(listener);
-			
-			browseButton = new Button(patchcontainer, SWT.PUSH);
-			browseButton.setText(PDEUIMessages.BaseFeatureSpecPage_browse); 
-			gd = new GridData(GridData.HORIZONTAL_ALIGN_END);
-			browseButton.setLayoutData(gd);
-			browseButton.addSelectionListener(new SelectionAdapter() {
-				
-				public void widgetSelected(SelectionEvent e) {
-					FeatureSelectionDialog dialog = new FeatureSelectionDialog(
-							getShell(), PDECore.getDefault()
-									.getFeatureModelManager().getModels(),
-							false);
-					dialog.create();
-					if (dialog.open() == Window.OK) {
-						Object[] result = dialog.getResult();
-						IFeatureModel selectedModel = (IFeatureModel) result[0];
-						featureIdText.setText(selectedModel.getFeature().getId());
-						featureNameText.setText(selectedModel.getFeature().getLabel());
-						featureVersionText.setText(selectedModel.getFeature().getVersion());
-						fFeatureToPatch = selectedModel;
-					}
-				}
-			});
-			SWTUtil.setButtonDimensionHint(browseButton);
-		} else {
-			featurePropertiesGroup.setText(PDEUIMessages.BaseFeatureSpecPage_featurePropertiesGroup_title); 
-			
-			Label label = new Label(featurePropertiesGroup, SWT.NULL);
-			label.setText(PDEUIMessages.NewFeatureWizard_SpecPage_id);
-			featureIdText = new Text(featurePropertiesGroup, SWT.BORDER);
-			gd = new GridData(GridData.FILL_HORIZONTAL);
-			featureIdText.setLayoutData(gd);
-			if (initialId != null)
-				featureIdText.setText(initialId);
-			featureIdText.addModifyListener(listener);
-			
-		}
-		
-		Label label = new Label(featurePropertiesGroup, SWT.NULL);
-		label.setText(PDEUIMessages.NewFeatureWizard_SpecPage_name);
-		featureNameText = new Text(featurePropertiesGroup, SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		featureNameText.setLayoutData(gd);
-		if (initialName != null)
-			featureNameText.setText(initialName);
-		featureNameText.addModifyListener(listener);
-		
-		label = new Label(featurePropertiesGroup, SWT.NULL);
-		label.setText(PDEUIMessages.NewFeatureWizard_SpecPage_version);
-		featureVersionText = new Text(featurePropertiesGroup, SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		featureVersionText.setLayoutData(gd);
-		featureVersionText.addModifyListener(listener);
-		if (!isPatch()) {
-			label = new Label(featurePropertiesGroup, SWT.NULL);
-			label.setText(PDEUIMessages.NewFeatureWizard_SpecPage_provider);
-			featureProviderText = new Text(featurePropertiesGroup, SWT.BORDER);
-			gd = new GridData(GridData.FILL_HORIZONTAL);
-			featureProviderText.setLayoutData(gd);
-			featureProviderText.addModifyListener(listener);
-		}
-	}
-	protected String computeInitialId(String projectName) {
-		return projectName.replaceAll("[^a-zA-Z0-9\\._]", "_"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	protected String verifyVersion() {
-		String problemText = PDEUIMessages.NewFeatureWizard_SpecPage_versionFormat;
-		String value = featureVersionText.getText();
-		if (PluginVersionIdentifier.validateVersion(value).getSeverity() != IStatus.OK)
-			return problemText;
-		return null;
-	}
-	
-	protected String verifyIdRules() {
-		String id = featureIdText.getText();
-		if (id == null || id.length() == 0)
-			return PDEUIMessages.NewFeatureWizard_SpecPage_missing;
-		if (!IdUtil.isValidPluginId(id)) {
-			return PDEUIMessages.NewFeatureWizard_SpecPage_invalidId;
-		}
-		return null;
-	}
-	
-	public IFeatureModel getFeatureToPatch(){
-		return fFeatureToPatch;
-	}
-		
-	protected String getInstallHandlerLibrary() {
-		if (!customChoice.getSelection())
-			return null;
-		String library = libraryText.getText();
-		if (!library.endsWith(".jar") && !library.endsWith("/") && !library.equals(".")) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			library += "/"; //$NON-NLS-1$
-		return library;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/BasePluginListPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/BasePluginListPage.java
deleted file mode 100644
index 0c4d804..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/BasePluginListPage.java
+++ /dev/null

@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.wizards.feature;
-
-import org.eclipse.jface.resource.*;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.parts.*;
-import org.eclipse.swt.widgets.*;
-
-public class BasePluginListPage extends WizardPage {
-	protected WizardCheckboxTablePart tablePart;
-	/**
-	 * @param pageName
-	 */
-	public BasePluginListPage(String pageName) {
-		super(pageName);
-		tablePart = new WizardCheckboxTablePart(null);
-		PDEPlugin.getDefault().getLabelProvider().connect(this);
-	}
-
-	/**
-	 * @param pageName
-	 * @param title
-	 * @param titleImage
-	 */
-	public BasePluginListPage(String pageName, String title,
-			ImageDescriptor titleImage) {
-		super(pageName, title, titleImage);
-		tablePart = new WizardCheckboxTablePart(null);
-		PDEPlugin.getDefault().getLabelProvider().connect(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-
-	}
-	
-	public void dispose() {
-		super.dispose();
-		PDEPlugin.getDefault().getLabelProvider().disconnect(this);
-	}
-	
-	public void setVisible(boolean visible) {
-		super.setVisible(visible);
-		if (visible) {
-			tablePart.getControl().setFocus();
-		}
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/FeatureData.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/FeatureData.java
deleted file mode 100644
index f4776da..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/FeatureData.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.wizards.feature;
-
-import org.eclipse.jdt.ui.PreferenceConstants;
-
-public class FeatureData {
-
-	String id;
-	String name;
-	String version;
-	String provider;
-	String library;
-	boolean hasCustomHandler;
-	boolean isPatch;
-	String featureToPatchId;
-	String featureToPatchVersion;
-
-	public FeatureData() {
-		library = null;
-		hasCustomHandler = false;
-		isPatch = false;
-	}
-
-	public boolean hasCustomHandler() {
-		return hasCustomHandler;
-	}
-
-	public boolean isPatch(){
-	    return isPatch;
-	}
-	
-	public String getSourceFolderName() {
-		return PreferenceConstants.getPreferenceStore().getString(
-				PreferenceConstants.SRCBIN_SRCNAME);
-	}
-
-	public String getJavaBuildFolderName() {
-		return PreferenceConstants.getPreferenceStore().getString(
-				PreferenceConstants.SRCBIN_BINNAME);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/FeatureSpecPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/FeatureSpecPage.java
deleted file mode 100644
index f1cb943..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/FeatureSpecPage.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.wizards.feature;
-
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
-
-public class FeatureSpecPage extends BaseFeatureSpecPage {
-
-	protected FeatureSpecPage(WizardNewProjectCreationPage mainPage) {
-		super(mainPage, false);
-		setTitle(PDEUIMessages.NewFeatureWizard_SpecPage_title);
-		setDescription(PDEUIMessages.NewFeatureWizard_SpecPage_desc);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.feature.BaseFeatureSpecPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		super.createControl(parent);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IHelpContextIds.NEW_FEATURE_DATA);
-	}
-
-	protected void initialize() {
-		if (isInitialized)
-			return;
-
-		String projectName = mainPage.getProjectName();
-		if (initialId == null) {
-			featureIdText.setText(computeInitialId(projectName));
-		}
-		if (initialName == null)
-			featureNameText.setText(projectName);
-		featureVersionText.setText("1.0.0"); //$NON-NLS-1$
-
-		super.initialize();
-	}
-
-	public FeatureData getFeatureData() {
-		FeatureData data = new FeatureData();
-		data.id = featureIdText.getText();
-		data.version = featureVersionText.getText();
-		data.provider = featureProviderText.getText();
-		data.name = featureNameText.getText();
-		data.library = getInstallHandlerLibrary();
-		data.hasCustomHandler = customChoice.getSelection();
-		return data;
-	}
-
-	protected void verifyComplete() {
-		String message = verifyIdRules();
-		if (message != null) {
-			setPageComplete(false);
-			setErrorMessage(message);
-			return;
-		}
-		message = verifyVersion();
-		if (message != null) {
-			setPageComplete(false);
-			setErrorMessage(message);
-			return;
-		}
-		if (customChoice.getSelection() && libraryText.getText().length() == 0) {
-			setPageComplete(false);
-			setErrorMessage(PDEUIMessages.NewFeatureWizard_SpecPage_error_library);
-			return;
-		}
-		setPageComplete(true);
-		setErrorMessage(null);
-		return;
-
-	}
-	public void setVisible(boolean visible) {
-		super.setVisible(visible);
-		if (visible) {
-			initialize();
-			isInitialized = true;
-			featureIdText.setFocus();
-		}
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/NewFeaturePatchWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/NewFeaturePatchWizard.java
deleted file mode 100644
index 0287cb2..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/NewFeaturePatchWizard.java
+++ /dev/null

@@ -1,371 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.wizards.feature;
-
-import java.lang.reflect.InvocationTargetException;
-
-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.IWorkspace;
-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.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.pde.core.build.IBuildEntry;
-import org.eclipse.pde.internal.PDE;
-import org.eclipse.pde.internal.build.IBuildPropertiesConstants;
-import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;
-import org.eclipse.pde.internal.core.feature.FeatureImport;
-import org.eclipse.pde.internal.core.feature.WorkspaceFeatureModel;
-import org.eclipse.pde.internal.core.ifeature.IFeature;
-import org.eclipse.pde.internal.core.ifeature.IFeatureImport;
-import org.eclipse.pde.internal.core.ifeature.IFeatureInfo;
-import org.eclipse.pde.internal.core.ifeature.IFeatureInstallHandler;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.core.util.CoreUtility;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.wizards.IProjectProvider;
-import org.eclipse.pde.internal.ui.wizards.NewWizard;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.ISetSelectionTarget;
-import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
-
-public class NewFeaturePatchWizard extends NewWizard implements IExecutableExtension {
-
-	public static final String DEF_PROJECT_NAME = "project-name"; //$NON-NLS-1$
-	public static final String DEF_FEATURE_ID = "feature-id"; //$NON-NLS-1$
-	public static final String DEF_FEATURE_NAME = "feature-name"; //$NON-NLS-1$
-	private WizardNewProjectCreationPage mainPage;
-	private PatchSpecPage specPage;
-	private IConfigurationElement config;
-	private FeaturePatchProvider provider;
-
-	public class FeaturePatchProvider implements IProjectProvider {
-
-		public FeaturePatchProvider() {
-			super();
-		}
-
-		public String getProjectName() {
-			return mainPage.getProjectName();
-		}
-
-		public IProject getProject() {
-			return mainPage.getProjectHandle();
-		}
-
-		public IPath getLocationPath() {
-			return mainPage.getLocationPath();
-		}
-
-		public IFeatureModel getFeatureToPatch() {
-			if (specPage != null)
-				return specPage.getFeatureToPatch();
-			return null;
-		}
-
-		public FeatureData getFeatureData() {
-			return specPage.getFeatureData();
-		}
-
-	}
-
-	public NewFeaturePatchWizard() {
-		super();
-		setDefaultPageImageDescriptor(PDEPluginImages.DESC_NEWFTRPTCH_WIZ);
-		setDialogSettings(PDEPlugin.getDefault().getDialogSettings());
-		setNeedsProgressMonitor(true);
-		setWindowTitle(PDEUIMessages.FeaturePatch_wtitle);
-	}
-
-	public void addPages() {
-		mainPage = new WizardNewProjectCreationPage("main") { //$NON-NLS-1$
-			public void createControl(Composite parent) {
-				super.createControl(parent);
-				PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IHelpContextIds.NEW_PATCH_MAIN);
-			}
-		};
-		mainPage.setTitle(PDEUIMessages.FeaturePatch_MainPage_title);
-		mainPage.setDescription(PDEUIMessages.FeaturePatch_MainPage_desc);
-		String pname = getDefaultValue(DEF_PROJECT_NAME);
-		if (pname != null)
-			mainPage.setInitialProjectName(pname);
-		addPage(mainPage);
-		provider = new FeaturePatchProvider();
-
-		specPage = new PatchSpecPage(mainPage);
-		specPage.setInitialId(getDefaultValue(DEF_FEATURE_ID));
-		specPage.setInitialName(getDefaultValue(DEF_FEATURE_NAME));
-		addPage(specPage);
-	}
-
-	public boolean canFinish() {
-		IWizardPage page = getContainer().getCurrentPage();
-		return ((page == specPage && page.isPageComplete()));
-	}
-
-	public boolean performFinish() {
-		final IProject project = provider.getProject();
-		final IPath location = provider.getLocationPath();
-		final IFeatureModel featureModel = provider.getFeatureToPatch();
-		final FeatureData data = provider.getFeatureData();
-		IRunnableWithProgress operation = new WorkspaceModifyOperation() {
-
-			public void execute(IProgressMonitor monitor) {
-				try {
-					createFeatureProject(project, location, featureModel, data,
-							monitor);
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				} finally {
-					monitor.done();
-				}
-			}
-		};
-		try {
-			getContainer().run(false, true, operation);
-			BasicNewProjectResourceWizard.updatePerspective(config);
-		} catch (InvocationTargetException e) {
-			PDEPlugin.logException(e);
-			return false;
-		} catch (InterruptedException e) {
-			return false;
-		}
-		return true;
-
-	}
-
-	public void setInitializationData(IConfigurationElement config, String property,
-			Object data) throws CoreException {
-		this.config = config;
-	}
-
-	/* finish methods */
-
-	private void createFeatureProject(IProject project, IPath location, IFeatureModel featureModel, FeatureData data,
-			IProgressMonitor monitor) throws CoreException {
-
-		monitor.beginTask(PDEUIMessages.NewFeatureWizard_creatingProject, 3);
-		boolean overwrite = true;
-		if (location.append(project.getName()).toFile().exists()) {
-			overwrite = MessageDialog.openQuestion(PDEPlugin.getActiveWorkbenchShell(),
-					PDEUIMessages.FeaturePatch_wtitle, PDEUIMessages.NewFeatureWizard_overwriteFeature);
-		}
-		if (overwrite) {
-			CoreUtility.createProject(project, location, monitor);
-			project.open(monitor);
-			IProjectDescription desc = project.getWorkspace().newProjectDescription(
-					project.getName());
-			desc.setLocation(provider.getLocationPath());
-			if (!project.hasNature(PDE.FEATURE_NATURE))
-				CoreUtility.addNatureToProject(project, PDE.FEATURE_NATURE, monitor);
-
-			if (!project.hasNature(JavaCore.NATURE_ID) && data.hasCustomHandler()) {
-				CoreUtility.addNatureToProject(project, JavaCore.NATURE_ID, monitor);
-				JavaCore.create(project).setOutputLocation(
-						project.getFullPath().append(data.getJavaBuildFolderName()),
-						monitor);
-				JavaCore.create(project).setRawClasspath(
-						new IClasspathEntry[]{
-								JavaCore.newContainerEntry(new Path(
-										JavaRuntime.JRE_CONTAINER)),
-								JavaCore.newSourceEntry(project.getFullPath().append(
-										data.getSourceFolderName()))}, monitor);
-				addSourceFolder(data.getSourceFolderName(), project, monitor);
-			}
-
-			monitor.subTask(PDEUIMessages.NewFeatureWizard_creatingManifest);
-			monitor.worked(1);
-			createBuildProperties(project, data);
-			monitor.worked(1);
-			// create feature.xml
-			IFile file = createFeatureManifest(project, featureModel, data);
-			monitor.worked(1);
-			// open manifest for editing
-			openFeatureManifest(file);
-		} else {
-			project.create(monitor);
-			project.open(monitor);
-			IFile featureFile = project.getFile("feature.xml"); //$NON-NLS-1$
-			if (featureFile.exists())
-				openFeatureManifest(featureFile);
-			monitor.worked(3);
-		}
-
-	}
-
-	protected static void addSourceFolder(String name, IProject project,
-			IProgressMonitor monitor) throws CoreException {
-		IPath path = project.getFullPath().append(name);
-		ensureFolderExists(project, path, monitor);
-		monitor.worked(1);
-	}
-
-	private void createBuildProperties(IProject project, FeatureData data)
-			throws CoreException {
-		String fileName = "build.properties"; //$NON-NLS-1$
-		IPath path = project.getFullPath().append(fileName);
-		IFile file = project.getWorkspace().getRoot().getFile(path);
-		if (!file.exists()) {
-			WorkspaceBuildModel model = new WorkspaceBuildModel(file);
-			IBuildEntry ientry = model.getFactory().createEntry("bin.includes"); //$NON-NLS-1$
-			ientry.addToken("feature.xml"); //$NON-NLS-1$
-			String library = specPage.getInstallHandlerLibrary();
-			if (library != null) {
-				String source = data.getSourceFolderName();
-				if (source != null) {
-					IBuildEntry entry = model.getFactory().createEntry(
-							IBuildEntry.JAR_PREFIX + library);
-					if (!source.endsWith("/")) //$NON-NLS-1$
-						source += "/"; //$NON-NLS-1$
-					entry.addToken(source);
-					ientry.addToken(library);
-					model.getBuild().add(entry);
-				}
-				String output = data.getJavaBuildFolderName();
-				if (output != null) {
-					IBuildEntry entry = model.getFactory().createEntry(
-							IBuildPropertiesConstants.PROPERTY_OUTPUT_PREFIX + library);
-					if (!output.endsWith("/")) //$NON-NLS-1$
-						output += "/"; //$NON-NLS-1$
-					entry.addToken(output);
-					model.getBuild().add(entry);
-				}
-			}
-
-			model.getBuild().add(ientry);
-			model.save();
-		}
-		IDE.setDefaultEditor(file, PDEPlugin.BUILD_EDITOR_ID);
-	}
-
-	private IFile createFeatureManifest(IProject project,
-			IFeatureModel featureModel, FeatureData data) throws CoreException {
-		IFile file = project.getFile("feature.xml"); //$NON-NLS-1$
-		WorkspaceFeatureModel model = new WorkspaceFeatureModel();
-		model.setFile(file);
-		IFeature feature = model.getFeature();
-		feature.setLabel(data.name);
-		feature.setId(data.id);
-		feature.setVersion("1.0.0"); //$NON-NLS-1$
-		feature.setProviderName(data.provider);
-		if(data.hasCustomHandler){
-			feature.setInstallHandler(model.getFactory().createInstallHandler());
-		}
-
-		FeatureImport featureImport = (FeatureImport) model.getFactory().createImport();
-		if (featureModel != null){
-		    featureImport.loadFrom(featureModel.getFeature());
-		    featureImport.setPatch(true);
-		    featureImport.setVersion(featureModel.getFeature().getVersion());
-		    featureImport.setId(featureModel.getFeature().getId());
-		} else if (data.isPatch()){
-			featureImport.setType(IFeatureImport.FEATURE);
-		    featureImport.setPatch(true);
-		    featureImport.setVersion(data.featureToPatchVersion);
-		    featureImport.setId(data.featureToPatchId);
-		}
-		
-		feature.addImports(new IFeatureImport[]{featureImport});
-		IFeatureInstallHandler handler = feature.getInstallHandler();
-		if (handler != null) {
-			handler.setLibrary(specPage.getInstallHandlerLibrary());
-		}
-
-		IFeatureInfo info = model.getFactory().createInfo(IFeature.INFO_COPYRIGHT);
-		feature.setFeatureInfo(info, IFeature.INFO_COPYRIGHT);
-
-		info.setURL("http://www.example.com/copyright"); //$NON-NLS-1$
-		info.setDescription(PDEUIMessages.NewFeatureWizard_sampleCopyrightDesc); 
-
-		info = model.getFactory().createInfo(IFeature.INFO_LICENSE);
-		feature.setFeatureInfo(info, IFeature.INFO_LICENSE);
-
-		info.setURL("http://www.example.com/license"); //$NON-NLS-1$
-		info.setDescription(PDEUIMessages.NewFeatureWizard_sampleLicenseDesc); 
-
-		info = model.getFactory().createInfo(IFeature.INFO_DESCRIPTION);
-		feature.setFeatureInfo(info, IFeature.INFO_DESCRIPTION);
-
-		info.setURL("http://www.example.com/description"); //$NON-NLS-1$
-		info.setDescription(PDEUIMessages.NewFeatureWizard_sampleDescriptionDesc); 
-
-		// Save the model
-		model.save();
-		model.dispose();
-		IDE.setDefaultEditor(file, PDEPlugin.FEATURE_EDITOR_ID);
-		return file;
-	}
-
-	private void openFeatureManifest(IFile manifestFile) {
-		IWorkbenchPage page = PDEPlugin.getActivePage();
-		// Reveal the file first
-		final ISelection selection = new StructuredSelection(manifestFile);
-		final IWorkbenchPart activePart = page.getActivePart();
-
-		if (activePart instanceof ISetSelectionTarget) {
-			getShell().getDisplay().asyncExec(new Runnable() {
-
-				public void run() {
-					((ISetSelectionTarget) activePart).selectReveal(selection);
-				}
-			});
-		}
-		// Open the editor
-
-		FileEditorInput input = new FileEditorInput(manifestFile);
-		String id = PDEPlugin.FEATURE_EDITOR_ID;
-		try {
-			page.openEditor(input, id);
-		} catch (PartInitException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	private static void ensureFolderExists(IProject project, IPath folderPath,
-			IProgressMonitor monitor) throws CoreException {
-		IWorkspace workspace = project.getWorkspace();
-
-		for (int i = 1; i <= folderPath.segmentCount(); i++) {
-			IPath partialPath = folderPath.uptoSegment(i);
-			if (!workspace.getRoot().exists(partialPath)) {
-				IFolder folder = workspace.getRoot().getFolder(partialPath);
-				folder.create(true, true, null);
-			}
-			monitor.worked(1);
-		}
-
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/NewFeatureProjectWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/NewFeatureProjectWizard.java
deleted file mode 100644
index 04a1568..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/NewFeatureProjectWizard.java
+++ /dev/null

@@ -1,406 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.feature;
-
-import java.lang.reflect.InvocationTargetException;
-
-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.IWorkspace;
-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.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.pde.core.build.IBuildEntry;
-import org.eclipse.pde.core.plugin.IPluginBase;
-import org.eclipse.pde.internal.PDE;
-import org.eclipse.pde.internal.build.IBuildPropertiesConstants;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;
-import org.eclipse.pde.internal.core.feature.FeaturePlugin;
-import org.eclipse.pde.internal.core.feature.WorkspaceFeatureModel;
-import org.eclipse.pde.internal.core.ifeature.IFeature;
-import org.eclipse.pde.internal.core.ifeature.IFeatureInfo;
-import org.eclipse.pde.internal.core.ifeature.IFeatureInstallHandler;
-import org.eclipse.pde.internal.core.ifeature.IFeaturePlugin;
-import org.eclipse.pde.internal.core.util.CoreUtility;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.wizards.IProjectProvider;
-import org.eclipse.pde.internal.ui.wizards.NewWizard;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.ISetSelectionTarget;
-import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
-
-public class NewFeatureProjectWizard extends NewWizard
-		implements
-			IExecutableExtension {
-	public static final String DEF_PROJECT_NAME = "project-name"; //$NON-NLS-1$
-	public static final String DEF_ID = "feature-id"; //$NON-NLS-1$
-	public static final String DEF_NAME = "feature-name"; //$NON-NLS-1$
-
-	private WizardNewProjectCreationPage mainPage;
-	private FeatureSpecPage specPage;
-	private PluginListPage pluginListPage;
-	private IConfigurationElement config;
-	private IProjectProvider provider;
-	private FeatureData fFeatureData;
-	public class FeatureProjectProvider implements IProjectProvider {
-		public FeatureProjectProvider() {
-			super();
-		}
-		public String getProjectName() {
-			return mainPage.getProjectName();
-		}
-		public IProject getProject() {
-			return mainPage.getProjectHandle();
-		}
-		public IPath getLocationPath() {
-			return mainPage.getLocationPath();
-		}
-		public FeatureData getFeatureData() {
-			return specPage.getFeatureData();
-		}
-		public IPluginBase[] getPluginListSelection() {
-			if (pluginListPage == null)
-				return null;
-			return pluginListPage.getSelectedPlugins();
-		}
-		public IConfigurationElement getConfigElement() {
-			return config;
-		}
-	}
-	public NewFeatureProjectWizard() {
-		super();
-		setDefaultPageImageDescriptor(PDEPluginImages.DESC_NEWFTRPRJ_WIZ);
-		setDialogSettings(PDEPlugin.getDefault().getDialogSettings());
-		setNeedsProgressMonitor(true);
-		setWindowTitle(PDEUIMessages.NewFeatureWizard_wtitle);
-	}
-	
-	public void addPages() {
-		provider = new FeatureProjectProvider();
-		mainPage = new WizardNewProjectCreationPage("main") { //$NON-NLS-1$
-			public void createControl(Composite parent) {
-				super.createControl(parent);
-				PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IHelpContextIds.NEW_FEATURE_MAIN);
-			}
-		};
-		
-		mainPage.setTitle(PDEUIMessages.NewFeatureWizard_MainPage_title);
-		mainPage.setDescription(PDEUIMessages.NewFeatureWizard_MainPage_desc);
-		String pname = getDefaultValue(DEF_PROJECT_NAME);
-		if (pname != null)
-			mainPage.setInitialProjectName(pname);
-		addPage(mainPage);
-		specPage = new FeatureSpecPage(mainPage);
-		specPage.setInitialId(getDefaultValue(DEF_ID));
-		specPage.setInitialName(getDefaultValue(DEF_NAME));
-		addPage(specPage);
-		if (hasInterestingProjects()) {
-			pluginListPage = new PluginListPage();
-			addPage(pluginListPage);
-		}
-	}
-
-	public boolean canFinish() {
-		IWizardPage page = getContainer().getCurrentPage();
-		return ((page == specPage && page.isPageComplete()) 
-				|| (page == pluginListPage && page.isPageComplete()));
-	}
-
-	private boolean hasInterestingProjects() {
-		return PDECore.getDefault().getModelManager().getPlugins().length > 0;
-	}
-
-	public boolean performFinish() {
-		final IProject project = ((FeatureProjectProvider) provider)
-				.getProject();
-		final IPath location = ((FeatureProjectProvider) provider)
-				.getLocationPath();
-		fFeatureData = ((FeatureProjectProvider) provider)
-				.getFeatureData();
-		final IPluginBase[] plugins = ((FeatureProjectProvider) provider)
-				.getPluginListSelection() != null
-				? ((FeatureProjectProvider) provider).getPluginListSelection()
-				: (new IPluginBase[0]);
-		IRunnableWithProgress operation = new WorkspaceModifyOperation() {
-			public void execute(IProgressMonitor monitor) {
-				try {
-					createFeatureProject(project, location, fFeatureData, plugins,
-							monitor);
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				} finally {
-					monitor.done();
-				}
-			}
-		};
-		try {
-			getContainer().run(false, true, operation);
-			BasicNewProjectResourceWizard
-					.updatePerspective(((FeatureProjectProvider) provider)
-							.getConfigElement());
-		} catch (InvocationTargetException e) {
-			PDEPlugin.logException(e);
-			return false;
-		} catch (InterruptedException e) {
-			return false;
-		}
-		return true;
-
-	}
-
-	public void setInitializationData(IConfigurationElement config,
-			String property, Object data) throws CoreException {
-		this.config = config;
-	}
-
-	/* feature creation methods */
-
-	protected static void addSourceFolder(String name, IProject project,
-			IProgressMonitor monitor) throws CoreException {
-		IPath path = project.getFullPath().append(name);
-		ensureFolderExists(project, path, monitor);
-		monitor.worked(1);
-	}
-
-	private static void ensureFolderExists(IProject project, IPath folderPath,
-			IProgressMonitor monitor) throws CoreException {
-		IWorkspace workspace = project.getWorkspace();
-
-		for (int i = 1; i <= folderPath.segmentCount(); i++) {
-			IPath partialPath = folderPath.uptoSegment(i);
-			if (!workspace.getRoot().exists(partialPath)) {
-				IFolder folder = workspace.getRoot().getFolder(partialPath);
-				folder.create(true, true, null);
-			}
-			monitor.worked(1);
-		}
-
-	}
-	private void createBuildProperties(IProject project, FeatureData data) throws CoreException {
-		String fileName = "build.properties"; //$NON-NLS-1$
-		IPath path = project.getFullPath().append(fileName);
-		IFile file = project.getWorkspace().getRoot().getFile(path);
-		if (!file.exists()) {
-			WorkspaceBuildModel model = new WorkspaceBuildModel(file);
-			IBuildEntry ientry = model.getFactory().createEntry("bin.includes"); //$NON-NLS-1$
-			ientry.addToken("feature.xml"); //$NON-NLS-1$
-			String library = data.library;
-			if (library != null) {
-				String source = data.getSourceFolderName();
-				if (source != null) {
-					IBuildEntry entry = model.getFactory().createEntry(
-							IBuildEntry.JAR_PREFIX + library);
-					if (!source.endsWith("/")) //$NON-NLS-1$
-						source += "/"; //$NON-NLS-1$
-					entry.addToken(source);
-					ientry.addToken(library);
-					model.getBuild().add(entry);
-				}
-				String output = data.getJavaBuildFolderName();
-				if (output != null) {
-					IBuildEntry entry = model.getFactory().createEntry(
-							IBuildPropertiesConstants.PROPERTY_OUTPUT_PREFIX
-									+ library);
-					if (!output.endsWith("/")) //$NON-NLS-1$
-						output += "/"; //$NON-NLS-1$
-					entry.addToken(output);
-					model.getBuild().add(entry);
-				}
-			}
-
-			model.getBuild().add(ientry);
-			model.save();
-		}
-		IDE.setDefaultEditor(file, PDEPlugin.BUILD_EDITOR_ID);
-	}
-
-	private IFile createFeatureManifest(IProject project, FeatureData data,
-			IPluginBase[] plugins) throws CoreException {
-		IFile file = project.getFile("feature.xml"); //$NON-NLS-1$
-		WorkspaceFeatureModel model = new WorkspaceFeatureModel();
-		model.setFile(file);
-		IFeature feature = model.getFeature();
-		String name = data.name;
-		feature.setLabel(name);
-		feature.setId(data.id);
-		feature.setVersion(data.version);
-		feature.setProviderName(data.provider);
-		if(data.hasCustomHandler){
-			feature.setInstallHandler(model.getFactory().createInstallHandler());
-		}
-
-		IFeaturePlugin[] added = new IFeaturePlugin[plugins.length];
-
-		for (int i = 0; i < plugins.length; i++) {
-			IPluginBase plugin = plugins[i];
-			FeaturePlugin fplugin = (FeaturePlugin) model.getFactory()
-					.createPlugin();
-			fplugin.loadFrom(plugin);
-			fplugin.setVersion("0.0.0"); //$NON-NLS-1$
-			fplugin.setUnpack(CoreUtility.guessUnpack(plugin.getPluginModel()
-					.getBundleDescription()));
-			added[i] = fplugin;
-		}
-		feature.addPlugins(added);
-		//feature.computeImports();
-		IFeatureInstallHandler handler = feature.getInstallHandler();
-		if (handler != null) {		
-			handler.setLibrary(data.library);
-		}
-
-		IFeatureInfo info = model.getFactory().createInfo(IFeature.INFO_COPYRIGHT);
-		feature.setFeatureInfo(info, IFeature.INFO_COPYRIGHT);
-		
-		info.setURL("http://www.example.com/copyright"); //$NON-NLS-1$
-		info.setDescription(PDEUIMessages.NewFeatureWizard_sampleCopyrightDesc); 
-		
-		info = model.getFactory().createInfo(IFeature.INFO_LICENSE);
-		feature.setFeatureInfo(info, IFeature.INFO_LICENSE);
-		
-		info.setURL("http://www.example.com/license"); //$NON-NLS-1$
-		info.setDescription(PDEUIMessages.NewFeatureWizard_sampleLicenseDesc); 
-
-		info = model.getFactory().createInfo(IFeature.INFO_DESCRIPTION);
-		feature.setFeatureInfo(info, IFeature.INFO_DESCRIPTION);
-		
-		info.setURL("http://www.example.com/description"); //$NON-NLS-1$
-		info.setDescription(PDEUIMessages.NewFeatureWizard_sampleDescriptionDesc); 
-
-		// Save the model
-		model.save();
-		model.dispose();
-		IDE.setDefaultEditor(file, PDEPlugin.FEATURE_EDITOR_ID);
-		return file;
-	}
-
-	private void createFeatureProject(IProject project, IPath location,
-			FeatureData data, IPluginBase[] plugins, IProgressMonitor monitor)
-			throws CoreException {
-
-		monitor.beginTask(PDEUIMessages.NewFeatureWizard_creatingProject, 3);
-		boolean overwrite = true;
-		if (location.append(project.getName()).toFile().exists()) {
-			overwrite = MessageDialog.openQuestion(PDEPlugin
-					.getActiveWorkbenchShell(), PDEUIMessages.NewFeatureWizard_wtitle, PDEUIMessages.NewFeatureWizard_overwriteFeature);
-		}
-		if (overwrite) {
-			CoreUtility.createProject(project, location, monitor);
-			project.open(monitor);
-			IProjectDescription desc = project.getWorkspace()
-					.newProjectDescription(project.getName());
-			desc.setLocation(provider.getLocationPath());
-			if (!project.hasNature(PDE.FEATURE_NATURE))
-				CoreUtility.addNatureToProject(project, PDE.FEATURE_NATURE,
-						monitor);
-
-			if (!project.hasNature(JavaCore.NATURE_ID)
-					&& data.hasCustomHandler()) {
-				CoreUtility.addNatureToProject(project, JavaCore.NATURE_ID,
-						monitor);
-				JavaCore.create(project).setOutputLocation(
-						project.getFullPath().append(
-								data.getJavaBuildFolderName()),
-						monitor);
-				JavaCore
-						.create(project)
-						.setRawClasspath(
-								new IClasspathEntry[]{
-										JavaCore.newContainerEntry(new Path(
-												JavaRuntime.JRE_CONTAINER)),
-										JavaCore
-												.newSourceEntry(project
-														.getFullPath()
-														.append(
-																data
-																		.getSourceFolderName()))},
-								monitor);
-				addSourceFolder(data.getSourceFolderName(), project,
-						monitor);
-			}
-
-			monitor.subTask(PDEUIMessages.NewFeatureWizard_creatingManifest);
-			monitor.worked(1);
-			createBuildProperties(project, data);
-			monitor.worked(1);
-			// create feature.xml
-			IFile file = createFeatureManifest(project, data, plugins);
-			monitor.worked(1);
-			// open manifest for editing
-			openFeatureManifest(file);
-		} else {
-			project.create(monitor);
-			project.open(monitor);
-			IFile featureFile = project.getFile("feature.xml"); //$NON-NLS-1$
-			if (featureFile.exists())
-				openFeatureManifest(featureFile);
-			monitor.worked(3);
-		}
-
-	}
-
-	private void openFeatureManifest(IFile manifestFile) {
-		IWorkbenchPage page = PDEPlugin.getActivePage();
-		// Reveal the file first
-		final ISelection selection = new StructuredSelection(manifestFile);
-		final IWorkbenchPart activePart = page.getActivePart();
-
-		if (activePart instanceof ISetSelectionTarget) {
-			getShell().getDisplay().asyncExec(new Runnable() {
-				public void run() {
-					((ISetSelectionTarget) activePart).selectReveal(selection);
-				}
-			});
-		}
-		// Open the editor
-
-		FileEditorInput input = new FileEditorInput(manifestFile);
-		String id = PDEPlugin.FEATURE_EDITOR_ID;
-		try {
-			page.openEditor(input, id);
-		} catch (PartInitException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-	
-	public String getFeatureId() {
-		return fFeatureData.id;
-	}
-	
-	public String getFeatureVersion() {
-		return fFeatureData.version;	
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/OpenProjectWizardAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/OpenProjectWizardAction.java
deleted file mode 100644
index 6fabbcc..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/OpenProjectWizardAction.java
+++ /dev/null

@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.feature;
-
-import java.util.Hashtable;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.util.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.cheatsheets.*;
-import org.eclipse.ui.cheatsheets.ICheatSheetAction;
-
-public class OpenProjectWizardAction extends Action implements ICheatSheetAction {
-	/**
-	 * @param text
-	 */
-	public OpenProjectWizardAction() {
-		super(PDEUIMessages.Actions_Feature_OpenProjectWizardAction); 
-	}
-	
-	/**
-	 * @see IActionDelegate#run(IAction)
-	 */
-	public void run() {
-		run(new String [] {}, null);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.cheatsheets.ICheatSheetAction#run(java.lang.String[], org.eclipse.ui.cheatsheets.ICheatSheetManager)
-	 */
-	public void run(String[] params, ICheatSheetManager manager) {
-		Hashtable defValues = new Hashtable();
-		if (params.length>0)
-			defValues.put(NewFeatureProjectWizard.DEF_PROJECT_NAME, params[0]);
-		if (params.length>1)
-			defValues.put(NewFeatureProjectWizard.DEF_ID, params[1]);
-		if (params.length>2)
-			defValues.put(NewFeatureProjectWizard.DEF_NAME, params[2]);
-		NewFeatureProjectWizard wizard = new NewFeatureProjectWizard();
-		wizard.init(defValues);
-		wizard.init(PlatformUI.getWorkbench(), new StructuredSelection());
-		WizardDialog dialog = new WizardDialog(PDEPlugin.getActiveWorkbenchShell(), wizard);
-		dialog.create();
-		SWTUtil.setDialogSize(dialog, 500, 500);
-		dialog.getShell().setText(wizard.getWindowTitle());
-		int result = dialog.open();
-		notifyResult(result==WizardDialog.OK);		
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/PatchSpecPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/PatchSpecPage.java
deleted file mode 100644
index 9c7c788..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/PatchSpecPage.java
+++ /dev/null

@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.wizards.feature;
-
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.util.IdUtil;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
-
-public class PatchSpecPage extends BaseFeatureSpecPage {
-
-	public PatchSpecPage(WizardNewProjectCreationPage mainPage) {
-		super(mainPage, true);
-		setTitle(PDEUIMessages.PatchSpec_title); 
-		setDescription(PDEUIMessages.PatchSpec_desc); 
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.feature.BaseFeatureSpecPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		super.createControl(parent);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IHelpContextIds.NEW_PATCH_REQUIRED_DATA);
-	}
-
-	protected void initialize() {
-		if (isInitialized)
-			return;
-		String projectName = mainPage.getProjectName();
-		if (initialId == null)
-			patchIdText.setText(computeInitialId(projectName));
-		if (initialName == null)
-			patchNameText.setText(projectName);
-		setErrorMessage(null);
-		super.initialize();
-	}
-
-	protected void verifyComplete() {
-		String message = verifyIdRules();
-		if (message != null) {
-			setPageComplete(false);
-			setErrorMessage(message);
-			return;
-		}
-		message = verifyVersion();
-		if (message != null) {
-			setPageComplete(false);
-			setErrorMessage(message);
-			return;
-		}
-		if (customChoice.getSelection() && libraryText.getText().length() == 0) {
-			setPageComplete(false);
-			setErrorMessage(PDEUIMessages.NewFeatureWizard_SpecPage_error_library);
-			return;
-		}
-		
-		fFeatureToPatch = PDECore.getDefault().getFeatureModelManager()
-				.findFeatureModel(featureIdText.getText(),
-						featureVersionText.getText());
-		if (fFeatureToPatch != null) {
-			setMessage(null);
-			setPageComplete(true);
-			setErrorMessage(null);
-			return;
-		}
-		
-		setMessage(NLS.bind(PDEUIMessages.NewFeaturePatch_SpecPage_notFound, featureIdText.getText()), IMessageProvider.WARNING); 
-		setErrorMessage(null);
-		getContainer().updateButtons();
-		return;
-	}
-	
-	/* (non-Javadoc)
-     * @see org.eclipse.jface.wizard.WizardPage#getNextPage()
-     */
-    public IWizardPage getNextPage() {
-        if (fFeatureToPatch == null)
-            return null;
-        return super.getNextPage();
-    }
-
-	private String getPatchId() {
-		if (patchIdText == null)
-			return ""; //$NON-NLS-1$
-		return patchIdText.getText();
-	}
-
-	private String getPatchName() {
-		if (patchNameText == null)
-			return ""; //$NON-NLS-1$
-		return patchNameText.getText();
-	}
-
-	private String getPatchProvider() {
-		if (patchProviderText == null)
-			return ""; //$NON-NLS-1$
-		return patchProviderText.getText();
-	}
-	
-	public FeatureData getFeatureData() {
-		FeatureData data = new FeatureData();
-		data.id = getPatchId();
-		data.version = "1.0.0"; //$NON-NLS-1$
-		data.provider = getPatchProvider();
-		data.name = getPatchName();
-		data.library = getInstallHandlerLibrary();
-		data.hasCustomHandler = customChoice.getSelection();
-		data.isPatch = true;
-		data.featureToPatchId = featureIdText.getText();
-		data.featureToPatchVersion = featureVersionText.getText();
-		return data;
-	}
-
-	protected String verifyIdRules() {
-		String id = patchIdText.getText();
-		if (id == null || id.length() == 0)
-			return PDEUIMessages.NewFeatureWizard_SpecPage_pmissing;
-		if (!IdUtil.isValidPluginId(id)) {
-			return PDEUIMessages.NewFeatureWizard_SpecPage_invalidId;
-		}
-		return super.verifyIdRules();
-	}
-	
-	public void setVisible(boolean visible) {
-		super.setVisible(visible);
-		if (visible) {
-			initialize();
-			isInitialized = true;
-			patchIdText.setFocus();
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/PluginListPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/PluginListPage.java
deleted file mode 100644
index 2cba69e..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/feature/PluginListPage.java
+++ /dev/null

@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.feature;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.pde.core.plugin.IPluginBase;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
-import org.eclipse.pde.internal.ui.wizards.ListUtil;
-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.ui.PlatformUI;
-
-public class PluginListPage extends BasePluginListPage {
-	class PluginContentProvider
-		extends DefaultContentProvider
-		implements IStructuredContentProvider {
-		public Object[] getElements(Object parent) {
-			return PDECore.getDefault().getModelManager().getPlugins();
-		}
-	}
-
-	public PluginListPage() {
-		super("pluginListPage"); //$NON-NLS-1$
-		setTitle(PDEUIMessages.NewFeatureWizard_PlugPage_title);
-		setDescription(PDEUIMessages.NewFeatureWizard_PlugPage_desc);
-	}
-
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.verticalSpacing = 9;
-		container.setLayout(layout);
-
-		tablePart.createControl(container);
-		CheckboxTableViewer pluginViewer = tablePart.getTableViewer();
-		pluginViewer.setContentProvider(new PluginContentProvider());
-		pluginViewer.setLabelProvider(PDEPlugin.getDefault().getLabelProvider());
-		pluginViewer.setSorter(ListUtil.PLUGIN_SORTER);
-		GridData gd = (GridData) tablePart.getControl().getLayoutData();
-		gd.heightHint = 250;
-		pluginViewer.setInput(PDECore.getDefault().getModelManager());
-		tablePart.setSelection(new Object[0]);
-		setControl(container);
-		Dialog.applyDialogFont(container);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(container, IHelpContextIds.NEW_FEATURE_REFERENCED_PLUGINS);
-	}
-
-	public IPluginBase[] getSelectedPlugins() {
-		Object[] result = tablePart.getSelection();
-		IPluginBase[] plugins = new IPluginBase[result.length];
-		for (int i=0; i<result.length; i++) {
-			IPluginModelBase model = (IPluginModelBase)result[i];
-			plugins[i] = model.getPluginBase();
-		}
-		return plugins;
-	}
-	
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/BaseImportWizardSecondPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/BaseImportWizardSecondPage.java
deleted file mode 100644
index f9cb9e8..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/BaseImportWizardSecondPage.java
+++ /dev/null

@@ -1,243 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.imports;
-
-import java.util.ArrayList;
-
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
-import org.eclipse.pde.internal.ui.wizards.ListUtil;
-import org.eclipse.swt.SWT;
-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.Table;
-import org.eclipse.swt.widgets.TableItem;
-
-public abstract class BaseImportWizardSecondPage extends WizardPage implements IModelProviderListener {
-	
-	protected static final String SETTINGS_ADD_FRAGMENTS = "addFragments"; //$NON-NLS-1$
-	protected static final String SETTINGS_AUTOBUILD = "autobuild"; //$NON-NLS-1$
-	
-	protected PluginImportWizardFirstPage fPage1;
-	protected IPluginModelBase[] fModels = new IPluginModelBase[0];
-	private String fLocation;
-	protected Button fAddFragmentsButton;
-	private Button fAutoBuildButton;
-	protected TableViewer fImportListViewer;
-	private boolean fRefreshNeeded = true;
-
-	class ContentProvider
-		extends DefaultContentProvider
-		implements IStructuredContentProvider {
-		public Object[] getElements(Object element) {
-			return new Object[0];
-		}
-	}
-	
-	public BaseImportWizardSecondPage(String pageName, PluginImportWizardFirstPage page) {
-		super(pageName);
-		fPage1 = page;
-		PDEPlugin.getDefault().getLabelProvider().connect(this);
-		PDECore.getDefault().getExternalModelManager().addModelProviderListener(this);
-	}
-
-	protected Composite createImportList(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.marginWidth = 0;
-		layout.marginHeight = 0;
-		container.setLayout(layout);
-		container.setLayoutData(new GridData(GridData.FILL_BOTH));
-		
-		Label label = new Label(container, SWT.NONE);
-		label.setText(PDEUIMessages.ImportWizard_DetailedPage_importList); 
-
-		Table table = new Table(container, SWT.BORDER | SWT.MULTI | SWT.V_SCROLL);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.widthHint = 225;
-		table.setLayoutData(gd);
-
-		fImportListViewer = new TableViewer(table);
-		fImportListViewer.setLabelProvider(PDEPlugin.getDefault().getLabelProvider());
-		fImportListViewer.setContentProvider(new ContentProvider());
-		fImportListViewer.setInput(PDECore.getDefault().getExternalModelManager());
-		fImportListViewer.setSorter(ListUtil.PLUGIN_SORTER);
-		return container;
-	}
-	
-	protected Composite createComputationsOption(Composite parent, int span) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(new GridLayout());
-		GridData gd = new GridData();
-		gd.horizontalSpan = span;
-		composite.setLayoutData(gd);
-		
-		fAddFragmentsButton = new Button(composite, SWT.CHECK);
-		fAddFragmentsButton.setText(PDEUIMessages.ImportWizard_SecondPage_addFragments); 
-		fAddFragmentsButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		if (getDialogSettings().get(SETTINGS_ADD_FRAGMENTS) != null)
-			fAddFragmentsButton.setSelection(getDialogSettings().getBoolean(SETTINGS_ADD_FRAGMENTS));
-		else 
-			fAddFragmentsButton.setSelection(true);
-		
-		if (!PDEPlugin.getWorkspace().isAutoBuilding()) {
-			fAutoBuildButton = new Button(composite, SWT.CHECK);
-			fAutoBuildButton.setText(PDEUIMessages.BaseImportWizardSecondPage_autobuild);
-			fAutoBuildButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			fAutoBuildButton.setSelection(getDialogSettings().getBoolean(SETTINGS_AUTOBUILD));
-		}
-		return composite;
-		
-	}
-
-	public void dispose() {
-		PDEPlugin.getDefault().getLabelProvider().disconnect(this);
-		PDECore.getDefault().getExternalModelManager().removeModelProviderListener(this);
-	}
-	
-	public void setVisible(boolean visible) {
-		super.setVisible(visible);
-		if (visible && isRefreshNeeded()) {
-			fModels = fPage1.getModels();
-			refreshPage();
-		}
-	}
-
-	protected abstract void refreshPage();
-
-	protected boolean isRefreshNeeded() {
-		if (fRefreshNeeded) {
-			fRefreshNeeded = false;
-			fLocation = fPage1.getDropLocation();
-			return true;	
-		}			
-		String currLocation = fPage1.getDropLocation();
-		if (fLocation == null || !fLocation.equals(currLocation)) {
-			fLocation = fPage1.getDropLocation();
-			return true;
-		}
-		return false;	
-	}
-	
-	private IPluginModelBase findModel(String id) {
-		for (int i = 0; i < fModels.length; i++) {
-			String modelId = fModels[i].getPluginBase().getId();
-			if (modelId != null && modelId.equals(id))
-				return fModels[i];
-		}
-		return null;
-	}
-
-	private IFragmentModel[] findFragments(IPlugin plugin) {
-		ArrayList result = new ArrayList();
-		for (int i = 0; i < fModels.length; i++) {
-			if (fModels[i] instanceof IFragmentModel) {
-				IFragment fragment = ((IFragmentModel) fModels[i]).getFragment();
-				if (plugin.getId().equalsIgnoreCase(fragment.getPluginId())) {
-					result.add(fModels[i]);
-				}
-			}
-		}
-		return (IFragmentModel[]) result.toArray(new IFragmentModel[result.size()]);
-	}
-
-	protected void addPluginAndDependencies(
-		IPluginModelBase model,
-		ArrayList selected,
-		boolean addFragments) {
-			
-		boolean containsVariable = false;
-		if (!selected.contains(model)) {
-			selected.add(model);
-			boolean hasextensibleAPI = model instanceof IPluginModel && ClasspathUtilCore.hasExtensibleAPI((IPlugin)model.getPluginBase());
-			if (!addFragments && !hasextensibleAPI && model instanceof IPluginModel) {
-				IPluginLibrary[] libraries = model.getPluginBase().getLibraries();
-				for (int i = 0; i < libraries.length; i++) {
-					if (ClasspathUtilCore.containsVariables(libraries[i].getName())) {
-						containsVariable = true;
-						break;
-					}
-				}
-			}
-			addDependencies(model, selected, addFragments || containsVariable || hasextensibleAPI);
-		}
-	}
-	
-	protected void addDependencies(
-		IPluginModelBase model,
-		ArrayList selected,
-		boolean addFragments) {
-		
-		IPluginImport[] required = model.getPluginBase().getImports();
-		if (required.length > 0) {
-			for (int i = 0; i < required.length; i++) {
-				IPluginModelBase found = findModel(required[i].getId());
-				if (found != null) {
-					addPluginAndDependencies(found, selected, addFragments);
-				}
-			}
-		}
-		
-		if (addFragments) {
-			if (model instanceof IPluginModel) {	
-				IFragmentModel[] fragments = findFragments(((IPluginModel)model).getPlugin());
-				for (int i = 0; i < fragments.length; i++) {
-					addPluginAndDependencies(fragments[i], selected, addFragments);
-				}
-			} else {
-				IFragment fragment = ((IFragmentModel) model).getFragment();
-				IPluginModelBase found = findModel(fragment.getPluginId());
-				if (found != null) {
-					addPluginAndDependencies(found, selected, addFragments);
-				}
-			}
-		}
-	}
-	
-	public IPluginModelBase[] getModelsToImport() {
-		TableItem[] items = fImportListViewer.getTable().getItems();
-		ArrayList result = new ArrayList();
-		for (int i = 0; i < items.length; i++) {
-			result.add(items[i].getData());
-		}
-		return (IPluginModelBase[]) result.toArray(new IPluginModelBase[result.size()]);
-	}
-	
-	public void storeSettings() {
-		IDialogSettings settings = getDialogSettings();
-		settings.put(SETTINGS_ADD_FRAGMENTS, fAddFragmentsButton.getSelection());
-		if (fAutoBuildButton != null)
-			settings.put(SETTINGS_AUTOBUILD, fAutoBuildButton.getSelection());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IModelProviderListener#modelsChanged(org.eclipse.pde.core.IModelProviderEvent)
-	 */
-	public void modelsChanged(IModelProviderEvent event) {
-		fRefreshNeeded = true;
-	}
-	
-	public boolean forceAutoBuild() {
-		return fAutoBuildButton != null && getDialogSettings().getBoolean(SETTINGS_AUTOBUILD);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/BinaryProjectFilter.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/BinaryProjectFilter.java
deleted file mode 100644
index cd21e1e..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/BinaryProjectFilter.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.imports;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.team.core.*;
-
-public class BinaryProjectFilter extends ViewerFilter {
-
-	/**
-	 * Constructor for BinaryProjectFilter.
-	 */
-	public BinaryProjectFilter() {
-		super();
-	}
-
-	/**
-	 * @see ViewerFilter#select(Viewer, Object, Object)
-	 */
-	public boolean select(Viewer viewer, Object parentElement, Object element) {
-		IProject project = null;
-
-		if (element instanceof IJavaProject) {
-			project = ((IJavaProject) element).getProject();
-		} else if (element instanceof IProject) {
-			project = (IProject) element;
-		}
-		if (project != null) {
-			if (isPluginProject(project) || isFeatureProject(project)) {
-				return !isBinary(project);
-			}
-		}
-		return true;
-	}
-	
-	private boolean isPluginProject(IProject project) {
-		if (project.isOpen() == false)
-			return false;
-		return project.exists(new Path("plugin.xml")) //$NON-NLS-1$
-			|| project.exists(new Path("fragment.xml")) || project.exists(new Path("META-INF/MANIFEST.MF")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	private boolean isFeatureProject(IProject project) {
-		if (project.isOpen() == false)
-			return false;
-		return project.exists(new Path("feature.xml")); //$NON-NLS-1$
-	}
-	
-	private boolean isBinary(IProject project) {
-		try {
-			String binary = project.getPersistentProperty(PDECore.EXTERNAL_PROJECT_PROPERTY);
-			if (binary != null) {
-				RepositoryProvider provider = RepositoryProvider.getProvider(project);
-				return provider==null || provider instanceof BinaryRepositoryProvider;
-			}
-		} catch (CoreException e) {
-			PDECore.logException(e);
-		}
-		return false;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/FeatureImportOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/FeatureImportOperation.java
deleted file mode 100644
index e62b9f9..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/FeatureImportOperation.java
+++ /dev/null

@@ -1,285 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.imports;
-
-import java.io.File;
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-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.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.internal.PDE;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.ifeature.IFeatureInstallHandler;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.core.ifeature.IFeaturePlugin;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.team.core.RepositoryProvider;
-import org.eclipse.team.core.TeamException;
-import org.eclipse.ui.dialogs.IOverwriteQuery;
-import org.eclipse.ui.wizards.datatransfer.FileSystemStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.IImportStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.ImportOperation;
-
-public class FeatureImportOperation implements IWorkspaceRunnable {
-	public interface IReplaceQuery {
-
-		// return codes
-		public static final int CANCEL = 0;
-		public static final int NO = 1;
-		public static final int YES = 2;
-
-		/**
-		 * Do the callback. Returns YES, NO or CANCEL
-		 */
-		int doQuery(IProject project);
-	}
-
-	private IFeatureModel[] fModels;
-	private boolean fBinary;
-	private IPath fTargetPath;
-
-	private IWorkspaceRoot fRoot;
-	private IReplaceQuery fReplaceQuery;
-
-	/**
-	 * 
-	 * @param models
-	 * @param targetPath a parent of external project or null
-	 * @param replaceQuery
-	 */
-	public FeatureImportOperation(
-		IFeatureModel[] models,
-		boolean binary,
-		IPath targetPath,
-		IReplaceQuery replaceQuery) {
-		fModels = models;
-		fBinary = binary;
-		fTargetPath = targetPath;
-		fRoot = ResourcesPlugin.getWorkspace().getRoot();
-		fReplaceQuery = replaceQuery;
-	}
-
-	/*
-	 * @see IWorkspaceRunnable#run(IProgressMonitor)
-	 */
-	public void run(IProgressMonitor monitor)
-		throws CoreException, OperationCanceledException {
-		if (monitor == null) {
-			monitor = new NullProgressMonitor();
-		}
-		monitor.beginTask(
-			PDEUIMessages.FeatureImportWizard_operation_creating, 
-			fModels.length);
-		try {
-			MultiStatus multiStatus =
-				new MultiStatus(
-					PDEPlugin.getPluginId(),
-					IStatus.OK,
-					PDEUIMessages.FeatureImportWizard_operation_multiProblem, 
-					null);
-			for (int i = 0; i < fModels.length; i++) {
-				try {
-					createProject(fModels[i], new SubProgressMonitor(monitor, 1));
-				} catch (CoreException e) {
-					multiStatus.merge(e.getStatus());
-				}
-				if (monitor.isCanceled()) {
-					throw new OperationCanceledException();
-				}
-			}
-			if (!multiStatus.isOK()) {
-				throw new CoreException(multiStatus);
-			}
-		} finally {
-			monitor.done();
-		}
-	}
-
-	private void createProject(IFeatureModel model, IProgressMonitor monitor)
-		throws CoreException {
-		String name = model.getFeature().getId();
-
-		IFeaturePlugin[] plugins = model.getFeature().getPlugins();
-		for (int i = 0; i < plugins.length; i++) {
-			if (name.equals(plugins[i].getId())) {
-				name += "-feature"; //$NON-NLS-1$
-				break;
-			}
-
-		}
-		
-		String task =
-			NLS.bind(PDEUIMessages.FeatureImportWizard_operation_creating2, name);
-		monitor.beginTask(task, 8);
-		try {
-			IProject project = fRoot.getProject(name);
-
-			if (project.exists()) {
-				if (queryReplace(project)) {
-					project.delete(true, true, new SubProgressMonitor(monitor, 1));
-					try {
-						RepositoryProvider.unmap(project);
-					} catch (TeamException e) {
-					}
-				} else {
-					return;
-				}
-			} else {
-				monitor.worked(1);
-			}
-
-			IProjectDescription description =
-				PDEPlugin.getWorkspace().newProjectDescription(name);
-			if (fTargetPath != null)
-				description.setLocation(fTargetPath.append(name));
-
-			project.create(description, new SubProgressMonitor(monitor, 1));
-			if (!project.isOpen()) {
-				project.open(null);
-			}
-			File featureDir = new File(model.getInstallLocation());
-
-			importContent(
-				featureDir,
-				project.getFullPath(),
-				FileSystemStructureProvider.INSTANCE,
-				null,
-				new SubProgressMonitor(monitor, 1));
-
-			if (fBinary) {
-				// Mark this project so that we can show image overlay
-				// using the label decorator
-				project.setPersistentProperty(
-						PDECore.EXTERNAL_PROJECT_PROPERTY,
-						PDECore.BINARY_PROJECT_VALUE);
-			}
-			
-				setProjectNatures(project, model, monitor);
-				if (project.hasNature(JavaCore.NATURE_ID))
-					setClasspath(project, model, monitor);
-
-		} finally {
-			monitor.done();
-		}
-	}
-
-	private void importContent(
-		Object source,
-		IPath destPath,
-		IImportStructureProvider provider,
-		List filesToImport,
-		IProgressMonitor monitor)
-		throws CoreException {
-		IOverwriteQuery query = new IOverwriteQuery() {
-			public String queryOverwrite(String file) {
-				return ALL;
-			}
-		};
-		ImportOperation op = new ImportOperation(destPath, source, provider, query);
-		op.setCreateContainerStructure(false);
-		if (filesToImport != null) {
-			op.setFilesToImport(filesToImport);
-		}
-
-		try {
-			op.run(monitor);
-		} catch (InvocationTargetException e) {
-			Throwable th = e.getTargetException();
-			if (th instanceof CoreException) {
-				throw (CoreException) th;
-			}
-			IStatus status =
-				new Status(
-					IStatus.ERROR,
-					PDEPlugin.getPluginId(),
-					IStatus.ERROR,
-					e.getMessage(),
-					e);
-			throw new CoreException(status);
-		} catch (InterruptedException e) {
-			throw new OperationCanceledException(e.getMessage());
-		}
-	}
-
-	private boolean queryReplace(IProject project) throws OperationCanceledException {
-		switch (fReplaceQuery.doQuery(project)) {
-			case IReplaceQuery.CANCEL :
-				throw new OperationCanceledException();
-			case IReplaceQuery.NO :
-				return false;
-		}
-		return true;
-	}
-
-	private void setProjectNatures(
-		IProject project,
-		IFeatureModel model,
-		IProgressMonitor monitor)
-		throws CoreException {
-		IProjectDescription desc = project.getDescription();
-		if (needsJavaNature(model)) {
-			desc.setNatureIds(new String[] { JavaCore.NATURE_ID,
-					PDE.FEATURE_NATURE });
-		} else {
-			desc.setNatureIds(new String[] { PDE.FEATURE_NATURE });
-		}
-		project.setDescription(desc, new SubProgressMonitor(monitor, 1));
-	}
-
-	private void setClasspath(IProject project, IFeatureModel model,
-			IProgressMonitor monitor) throws JavaModelException {
-		IJavaProject jProject = JavaCore.create(project);
-
-		IClasspathEntry jreCPEntry = JavaCore.newContainerEntry(new Path(
-				"org.eclipse.jdt.launching.JRE_CONTAINER")); //$NON-NLS-1$
-
-		String libName = model.getFeature().getInstallHandler().getLibrary();
-		IClasspathEntry handlerCPEntry = JavaCore.newLibraryEntry(project
-				.getFullPath().append(libName), null, null);
-
-		jProject.setRawClasspath(new IClasspathEntry[] { jreCPEntry,
-				handlerCPEntry }, monitor);
-	}
-
-	private boolean needsJavaNature(IFeatureModel model) {
-		IFeatureInstallHandler handler = model.getFeature().getInstallHandler();
-		if (handler == null) {
-			return false;
-		}
-		String libName = handler.getLibrary();
-		if (libName == null || libName.length() <= 0) {
-			return false;
-		}
-		File lib = new File(model.getInstallLocation(), libName);
-		return lib.exists();
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/FeatureImportWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/FeatureImportWizard.java
deleted file mode 100644
index dd2960b..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/FeatureImportWizard.java
+++ /dev/null

@@ -1,188 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.imports;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.*;
-import org.eclipse.pde.internal.ui.wizards.imports.FeatureImportOperation.IReplaceQuery;
-
-public class FeatureImportWizard extends Wizard implements IImportWizard {
-
-	private static final String STORE_SECTION = "FeatureImportWizard"; //$NON-NLS-1$
-	private FeatureImportWizardFirstPage fPage1;
-	private FeatureImportWizardDetailedPage fPage2;
-
-	public FeatureImportWizard() {
-		IDialogSettings masterSettings = PDEPlugin.getDefault().getDialogSettings();
-		setDialogSettings(getSettingsSection(masterSettings));
-		setDefaultPageImageDescriptor(PDEPluginImages.DESC_FEATURE_IMPORT_WIZ);
-		setWindowTitle(PDEUIMessages.FeatureImportWizard_title); 
-	}
-
-	/*
-	 * @see IWorkbenchWizard#init(IWorkbench, IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-	}
-
-	/*
-	 * @see org.eclipse.jface.wizard.IWizard#addPages
-	 */
-	public void addPages() {
-		setNeedsProgressMonitor(true);
-
-		fPage1 = new FeatureImportWizardFirstPage();
-		addPage(fPage1);
-		fPage2 = new FeatureImportWizardDetailedPage(fPage1);
-		addPage(fPage2);
-	}
-
-	private IDialogSettings getSettingsSection(IDialogSettings master) {
-		IDialogSettings setting = master.getSection(STORE_SECTION);
-		if (setting == null) {
-			setting = master.addNewSection(STORE_SECTION);
-		}
-		return setting;
-	}
-
-	/*
-	 * @see Wizard#performFinish()
-	 */
-	public boolean performFinish() {
-		try {
-			final IFeatureModel[] models = fPage2.getSelectedModels();
-			fPage1.storeSettings(true);
-			IPath targetPath = computeTargetPath();
-
-			IRunnableWithProgress op = getImportOperation(getShell(), fPage1
-					.isBinary(), models, targetPath);
-			getContainer().run(true, true, op);
-
-		} catch (InterruptedException e) {
-			return false;
-		} catch (InvocationTargetException e) {
-			PDEPlugin.logException(e);
-			return true; // exception handled
-		}
-		return true;
-	}
-
-	/**
-	 * 
-	 * @return IPath or null
-	 */private IPath computeTargetPath() {
-		IPath pluginsLocation = PDEPlugin.getWorkspace().getRoot().getLocation();
-		if("plugins".equals(pluginsLocation.lastSegment())) //$NON-NLS-1$
-			return pluginsLocation.removeLastSegments(1).append("features"); //$NON-NLS-1$
-		return null;
-	}
-
-	/**
-	 * 
-	 * @param shell
-	 * @param models
-	 * @param targetPath null to use default workspace location
-	 * @return
-	 */
-	public static IRunnableWithProgress getImportOperation(
-		final Shell shell,
-		final boolean binary,
-		final IFeatureModel[] models,
-		final IPath targetPath) {
-		return new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor)
-				throws InvocationTargetException, InterruptedException {
-				try {
-					IReplaceQuery query = new ReplaceQuery(shell);
-					FeatureImportOperation op =
-						new FeatureImportOperation(models, binary, targetPath, query);
-					PDEPlugin.getWorkspace().run(op, monitor);
-				} catch (CoreException e) {
-					throw new InvocationTargetException(e);
-				} catch (OperationCanceledException e) {
-					throw new InterruptedException(e.getMessage());
-				} finally {
-					monitor.done();
-				}
-			}
-		};
-	}
-
-	private static class ReplaceDialog extends MessageDialog {
-		public ReplaceDialog(Shell parentShell, String dialogMessage) {
-			super(
-				parentShell,
-				PDEUIMessages.FeatureImportWizard_messages_title,
-				null,
-				dialogMessage,
-				MessageDialog.QUESTION,
-				new String[] {
-					IDialogConstants.YES_LABEL,
-					IDialogConstants.YES_TO_ALL_LABEL,
-					IDialogConstants.NO_LABEL,
-					PDEUIMessages.FeatureImportWizard_noToAll, 
-					IDialogConstants.CANCEL_LABEL },
-				0);
-		}
-	}
-
-	private static class ReplaceQuery implements IReplaceQuery {
-		private Shell shell;
-		public ReplaceQuery(Shell shell) {
-			this.shell = shell;
-		}
-
-		private int yesToAll = 0;
-		private int[] RETURNCODES =
-			{
-				IReplaceQuery.YES,
-				IReplaceQuery.YES,
-				IReplaceQuery.NO,
-				IReplaceQuery.NO,
-				IReplaceQuery.CANCEL };
-
-		public int doQuery(IProject project) {
-			if (yesToAll != 0) {
-				return yesToAll > 0 ? IReplaceQuery.YES : IReplaceQuery.NO;
-			}
-
-			final String message =
-				NLS.bind(PDEUIMessages.FeatureImportWizard_messages_exists, project.getName());
-			final int[] result = { IReplaceQuery.CANCEL };
-			shell.getDisplay().syncExec(new Runnable() {
-				public void run() {
-					ReplaceDialog dialog = new ReplaceDialog(shell, message);
-					int retVal = dialog.open();
-					if (retVal >= 0) {
-						result[0] = RETURNCODES[retVal];
-						if (retVal == 1) {
-							yesToAll = 1;
-						} else if (retVal == 3) {
-							yesToAll = -1;
-						}
-					}
-				}
-			});
-			return result[0];
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/FeatureImportWizardDetailedPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/FeatureImportWizardDetailedPage.java
deleted file mode 100644
index b10a3ac..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/FeatureImportWizardDetailedPage.java
+++ /dev/null

@@ -1,340 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.imports;
-
-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 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.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.feature.ExternalFeatureModel;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
-import org.eclipse.pde.internal.ui.parts.WizardCheckboxTablePart;
-import org.eclipse.pde.internal.ui.wizards.ListUtil;
-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.ui.PlatformUI;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-public class FeatureImportWizardDetailedPage extends WizardPage {
-
-	private FeatureImportWizardFirstPage fFirstPage;
-	private boolean fIsOtherLocation;
-	private IPath fDropLocation;
-	private CheckboxTableViewer fFeatureViewer;
-	private TablePart fTablePart;
-	private IFeatureModel[] fModels;
-
-	public class ContentProvider
-	extends DefaultContentProvider
-	implements IStructuredContentProvider {
-		public Object[] getElements(Object parent) {
-			return getModels();
-		}
-	}
-	
-	class TablePart extends WizardCheckboxTablePart {
-		public TablePart(String mainLabel) {
-			super(mainLabel);
-		}
-
-		public void updateCounter(int count) {
-			super.updateCounter(count);
-			dialogChanged();
-		}
-		protected StructuredViewer createStructuredViewer(
-			Composite parent,
-			int style,
-			FormToolkit toolkit) {
-			StructuredViewer viewer =
-				super.createStructuredViewer(parent, style, toolkit);
-			viewer.setSorter(ListUtil.FEATURE_SORTER);
-			return viewer;
-		}
-	}
-
-	public FeatureImportWizardDetailedPage(FeatureImportWizardFirstPage firstPage) {
-		super("FeatureImportWizardDetailedPage"); //$NON-NLS-1$
-		setTitle(PDEUIMessages.FeatureImportWizard_DetailedPage_title); 
-		setDescription(PDEUIMessages.FeatureImportWizard_DetailedPage_desc); 
-
-		fFirstPage = firstPage;
-		fIsOtherLocation = false;
-		fDropLocation = null;
-		fTablePart = new TablePart(PDEUIMessages.FeatureImportWizard_DetailedPage_featureList); 
-		PDEPlugin.getDefault().getLabelProvider().connect(this);
-	}
-
-	private void initializeFields(boolean isOtherLocation, IPath dropLocation) {
-		if (isOtherLocation != fIsOtherLocation
-				|| !dropLocation.equals(this.fDropLocation)) {
-			this.fIsOtherLocation = fFirstPage.isOtherLocation();
-			this.fDropLocation = dropLocation;
-			fModels = null;
-		}
-		if (fModels == null) {
-			getModels(); // force loading
-			IRunnableWithProgress op = new IRunnableWithProgress() {
-				public void run(IProgressMonitor monitor) {
-					monitor.beginTask(
-						PDEUIMessages.FeatureImportWizard_messages_updating, 
-						IProgressMonitor.UNKNOWN);
-					fFeatureViewer
-						.getControl()
-						.getDisplay()
-						.asyncExec(new Runnable() {
-						public void run() {
-							fFeatureViewer.setInput(PDEPlugin.getDefault());
-							if (getModels() != null)
-								fFeatureViewer.setCheckedElements(getModels());
-								fTablePart.updateCounter(getModels().length);
-						}
-					});
-					monitor.done();
-				}
-			};
-			try {
-				getContainer().run(true, false, op);
-			} catch (InterruptedException e) {
-			} catch (InvocationTargetException e) {
-				PDEPlugin.logException(e);
-			} finally {
-				dialogChanged();
-			}
-			//treePart.updateCounter(0);
-		}
-	}
-
-	/*
-	 * @see DialogPage#setVisible(boolean)
-	 */
-	public void setVisible(boolean visible) {
-		super.setVisible(visible);
-		if (visible) {
-			initializeFields(fFirstPage.isOtherLocation(), fFirstPage.getDropLocation());
-		}
-	}
-
-	/*
-	 * @see IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		initializeDialogUnits(parent);
-
-		Composite container = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginHeight = 0;
-		layout.marginWidth = 5;
-		container.setLayout(layout);
-
-		fTablePart.createControl(container);
-		fFeatureViewer = fTablePart.getTableViewer();
-		fFeatureViewer.setContentProvider(new ContentProvider());
-		fFeatureViewer.setLabelProvider(PDEPlugin.getDefault().getLabelProvider());
-		GridData gd = (GridData) fTablePart.getControl().getLayoutData();
-		gd.heightHint = 300;
-		gd.widthHint = 300;
-		setControl(container);
-		dialogChanged();
-		Dialog.applyDialogFont(container);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(container, IHelpContextIds.FEATURE_IMPORT_SECOND_PAGE);
-	}
-
-	public void dispose() {
-		super.dispose();
-		PDEPlugin.getDefault().getLabelProvider().disconnect(this);
-	}
-
-	public IFeatureModel[] getModels() {
-		if (fModels != null)
-			return fModels;
-
-		final ArrayList result = new ArrayList();
-		final IPath home = fDropLocation;
-		if (home != null) {
-			IRunnableWithProgress op = new IRunnableWithProgress() {
-				public void run(IProgressMonitor monitor)
-					throws InvocationTargetException {
-					monitor.beginTask(
-						PDEUIMessages.FeatureImportWizard_messages_loadingFile, 
-						IProgressMonitor.UNKNOWN);
-
-					try {
-						if (!fIsOtherLocation) {
-							IFeatureModel[] allModels = PDECore.getDefault()
-									.getFeatureModelManager().getModels();
-							for (int i = 0; i < allModels.length; i++) {
-								if (allModels[i].getUnderlyingResource() == null) {
-									result.add(allModels[i]);
-								}
-							}
-						} else {
-							MultiStatus errors = doLoadFeatures(result,
-									createPath(home), monitor);
-							if (errors != null
-									&& errors.getChildren().length > 0) {
-								PDEPlugin.log(errors);
-							}
-						}
-						fModels =
-							(IFeatureModel[]) result.toArray(
-								new IFeatureModel[result.size()]);
-
-					} catch (CoreException e) {
-						throw new InvocationTargetException(e);
-					} finally {
-						monitor.done();
-					}
-				}
-			};
-			try {
-				getContainer().run(true, false, op);
-			} catch (InterruptedException e) {
-				return null;
-			} catch (InvocationTargetException e) {
-				PDEPlugin.logException(e);
-			}
-		}
-		return fModels;
-	}
-
-	private File createPath(IPath dropLocation) {
-		File featuresDir = new File(dropLocation.toFile(), "features"); //$NON-NLS-1$
-		if (featuresDir.exists())
-			return featuresDir;
-		return null;
-	}
-
-	private MultiStatus doLoadFeatures(
-		ArrayList result,
-		File path,
-		IProgressMonitor monitor)
-		throws CoreException {
-		if (path == null)
-			return null;
-		File[] dirs = path.listFiles();
-		if (dirs == null)
-			return null;
-		monitor.beginTask(PDEUIMessages.FeatureImportWizard_DetailedPage_loading, dirs.length); 
-		ArrayList resultStatus = new ArrayList();
-		for (int i = 0; i < dirs.length; i++) {
-			File dir = dirs[i];
-			if (dir.isDirectory()) {
-				File manifest = new File(dir, "feature.xml"); //$NON-NLS-1$
-				if (manifest.exists()) {
-					IStatus status = doLoadFeature(dir, manifest, result);
-					if (status != null)
-						resultStatus.add(status);
-				}
-				monitor.worked(1);
-			}
-		}
-		if (resultStatus != null) {
-			IStatus[] children =
-				(IStatus[]) resultStatus.toArray(new IStatus[resultStatus.size()]);
-			MultiStatus multiStatus =
-				new MultiStatus(
-					PDEPlugin.PLUGIN_ID,
-					IStatus.OK,
-					children,
-					PDEUIMessages.FeatureImportWizard_DetailedPage_problemsLoading, 
-					null);
-			return multiStatus;
-		}
-		return null;
-	}
-
-	private IStatus doLoadFeature(File dir, File manifest, ArrayList result) {
-		ExternalFeatureModel model = new ExternalFeatureModel();
-		model.setInstallLocation(dir.getAbsolutePath());
-		IStatus status = null;
-
-		InputStream stream = null;
-
-		try {
-			stream = new FileInputStream(manifest);
-			model.load(stream, false);
-			if(!model.isValid()){
-				status =
-					new Status(
-						IStatus.WARNING,
-						PDEPlugin.PLUGIN_ID,
-						IStatus.OK,
-						"Import location "+dir+" contains invalid feature.", //$NON-NLS-1$ //$NON-NLS-2$
-						null);
-			}
-		} catch (Exception e) {
-			// Errors in the file
-			status =
-				new Status(
-					IStatus.ERROR,
-					PDEPlugin.PLUGIN_ID,
-					IStatus.OK,
-					e.getMessage(),
-					e);
-		}
-		if (stream != null) {
-			try {
-				stream.close();
-			} catch (IOException e) {
-			}
-		}
-		if (status == null)
-			result.add(model);
-		return status;
-	}
-
-	public IFeatureModel[] getSelectedModels() { 
-		Object[] selected = fFeatureViewer.getCheckedElements();
-		IFeatureModel[] result = new IFeatureModel[selected.length];
-		System.arraycopy(selected, 0, result, 0, selected.length);
-		return result;
-	}
-
-	private void dialogChanged() {
-		String message = null;
-		if (fFeatureViewer != null && fFeatureViewer.getTable().getItemCount() == 0) {
-			message = PDEUIMessages.FeatureImportWizard_messages_noFeatures; 
-		}
-		setMessage(message, WizardPage.INFORMATION);
-		setPageComplete(fTablePart.getSelectionCount() > 0);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()
-	 */
-	public boolean isPageComplete() {
-		return fTablePart.getSelectionCount() > 0;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/FeatureImportWizardFirstPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/FeatureImportWizardFirstPage.java
deleted file mode 100644
index db8af1f..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/FeatureImportWizardFirstPage.java
+++ /dev/null

@@ -1,266 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.imports;
-
-import java.io.File;
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.pde.internal.core.ICoreConstants;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.util.SWTUtil;
-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.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.PlatformUI;
-
-public class FeatureImportWizardFirstPage extends WizardPage {
-
-	private static final String SETTINGS_DROPLOCATION = "droplocation"; //$NON-NLS-1$
-	private static final String SETTINGS_DOOTHER = "doother"; //$NON-NLS-1$
-	private static final String SETTINGS_NOT_BINARY = "notbinary"; //$NON-NLS-1$
-
-	private Label fOtherLocationLabel;
-	private Button fRuntimeLocationButton;
-	private Button fBrowseButton;
-	private Combo fDropLocation;
-	private Button fBinaryButton;
-
-	public FeatureImportWizardFirstPage() {
-		super("FeatureImportWizardPage"); //$NON-NLS-1$
-		setTitle(PDEUIMessages.FeatureImportWizard_FirstPage_title); 
-		setDescription(PDEUIMessages.FeatureImportWizard_FirstPage_desc); 
-	}
-
-	/*
-	 * @see IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		initializeDialogUnits(parent);
-
-		Composite composite = new Composite(parent, SWT.NONE);
-
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		composite.setLayout(layout);
-
-		fRuntimeLocationButton = new Button(composite, SWT.CHECK);
-		fillHorizontal(fRuntimeLocationButton, 3, false);
-		fRuntimeLocationButton.setText(
-			PDEUIMessages.FeatureImportWizard_FirstPage_runtimeLocation); 
-
-		fOtherLocationLabel = new Label(composite, SWT.NULL);
-		fOtherLocationLabel.setText(
-			PDEUIMessages.FeatureImportWizard_FirstPage_otherFolder); 
-
-		fDropLocation = new Combo(composite, SWT.DROP_DOWN);
-		fillHorizontal(fDropLocation, 1, true);
-
-		fBrowseButton = new Button(composite, SWT.PUSH);
-		fBrowseButton.setText(PDEUIMessages.FeatureImportWizard_FirstPage_browse); 
-		fBrowseButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				IPath chosen = chooseDropLocation();
-				if (chosen != null)
-					fDropLocation.setText(chosen.toOSString());
-			}
-		});
-		fBrowseButton.setLayoutData(new GridData());
-		SWTUtil.setButtonDimensionHint(fBrowseButton);
-
-		fBinaryButton = new Button(composite, SWT.CHECK);
-		fillHorizontal(fBinaryButton, 3, false);
-		fBinaryButton.setText(
-			PDEUIMessages.FeatureImportWizard_FirstPage_binaryImport); 
-		
-		initializeFields(getDialogSettings());
-		hookListeners();
-
-		setControl(composite);
-		Dialog.applyDialogFont(composite);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.FEATURE_IMPORT_FIRST_PAGE);
-	}
-
-	private String getTargetHome() {
-		Preferences preferences = PDECore.getDefault().getPluginPreferences();
-		return preferences.getString(ICoreConstants.PLATFORM_PATH);
-	}
-
-	private void hookListeners() {
-		fRuntimeLocationButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				setOtherEnabled(!fRuntimeLocationButton.getSelection());
-				validateDropLocation();
-				if (fRuntimeLocationButton.getSelection()) {
-					fDropLocation.setText(getTargetHome());
-				}
-			}
-		});
-
-		fDropLocation.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				validateDropLocation();
-			}
-		});
-		fDropLocation.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				validateDropLocation();
-			}
-		});
-	}
-
-	private GridData fillHorizontal(Control control, int span, boolean grab) {
-		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gd.horizontalSpan = span;
-		gd.grabExcessHorizontalSpace = grab;
-		control.setLayoutData(gd);
-		return gd;
-	}
-
-	private void initializeFields(IDialogSettings initialSettings) {
-		String[] dropItems = new String[0];
-		boolean doOther = false;
-		boolean binary = true;
-
-		if (initialSettings != null) {
-			doOther = initialSettings.getBoolean(SETTINGS_DOOTHER);
-			binary = !initialSettings.getBoolean(SETTINGS_NOT_BINARY);
-
-			ArrayList items = new ArrayList();
-			for (int i = 0; i < 6; i++) {
-				String curr =
-					initialSettings.get(
-						SETTINGS_DROPLOCATION + String.valueOf(i));
-				if (curr != null && !items.contains(curr)) {
-					items.add(curr);
-				}
-			}
-			dropItems = (String[]) items.toArray(new String[items.size()]);
-		}
-		fDropLocation.setItems(dropItems);
-		fRuntimeLocationButton.setSelection(!doOther);
-		setOtherEnabled(doOther);
-		if (doOther) {
-			if (dropItems.length > 0)
-				fDropLocation.setText(dropItems[0]);
-		} else {
-			fDropLocation.setText(getTargetHome());
-		}
-		fBinaryButton.setSelection(binary);
-
-		validateDropLocation();
-	}
-
-	private void setOtherEnabled(boolean enabled) {
-		fOtherLocationLabel.setEnabled(enabled);
-		fDropLocation.setEnabled(enabled);
-		fBrowseButton.setEnabled(enabled);
-	}
-
-	public void storeSettings(boolean finishPressed) {
-		IDialogSettings settings = getDialogSettings();
-		boolean other = !fRuntimeLocationButton.getSelection();
-		boolean binary = fBinaryButton.getSelection();
-		if (finishPressed || fDropLocation.getText().length() > 0 && other) {
-			settings.put(
-				SETTINGS_DROPLOCATION + String.valueOf(0),
-				fDropLocation.getText());
-			String[] items = fDropLocation.getItems();
-			int nEntries = Math.min(items.length, 5);
-			for (int i = 0; i < nEntries; i++) {
-				settings.put(
-					SETTINGS_DROPLOCATION + String.valueOf(i + 1),
-					items[i]);
-			}
-		}
-		if (finishPressed) {
-			settings.put(SETTINGS_DOOTHER, other);
-			settings.put(SETTINGS_NOT_BINARY, !binary);
-		}
-	}
-
-	/**
-	 * Browses for a drop location.
-	 */
-	private IPath chooseDropLocation() {
-		DirectoryDialog dialog = new DirectoryDialog(getShell());
-		dialog.setFilterPath(fDropLocation.getText());
-		dialog.setText(PDEUIMessages.FeatureImportWizard_messages_folder_title); 
-		dialog.setMessage(PDEUIMessages.FeatureImportWizard_messages_folder_message); 
-		String res = dialog.open();
-		if (res != null) {
-			return new Path(res);
-		}
-		return null;
-	}
-
-	private void validateDropLocation() {
-		String errorMessage = null;
-		if (isOtherLocation()) {
-			IPath curr = getDropLocation();
-			if (curr.segmentCount() == 0) {
-				errorMessage =
-					PDEUIMessages.FeatureImportWizard_errors_locationMissing; 
-			} else if (!Path.ROOT.isValidPath(fDropLocation.getText())) {
-				errorMessage =
-					PDEUIMessages.FeatureImportWizard_errors_buildFolderInvalid; 
-			} else {
-
-				File file = curr.toFile();
-				if (!file.exists() || !file.isDirectory()) {
-					errorMessage =
-						PDEUIMessages.FeatureImportWizard_errors_buildFolderMissing; 
-				}
-			}
-		}
-		setErrorMessage(errorMessage);
-		setPageComplete(errorMessage == null);
-	}
-	
-	public boolean isBinary(){
-		return fBinaryButton.getSelection();
-	}
-
-	/**
-	 * Returns the drop location.
-	 */
-	public IPath getDropLocation() {
-		return new Path(fDropLocation.getText());
-	}
-
-	public boolean isOtherLocation() {
-		return !fRuntimeLocationButton.getSelection();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()
-	 */
-	public boolean isPageComplete() {
-		return getErrorMessage() == null;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/JarImportOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/JarImportOperation.java
deleted file mode 100644
index a01dccf..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/JarImportOperation.java
+++ /dev/null

@@ -1,310 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.imports;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-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.OperationCanceledException;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.pde.internal.core.util.CoreUtility;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.ui.dialogs.IOverwriteQuery;
-import org.eclipse.ui.wizards.datatransfer.IImportStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.ImportOperation;
-import org.eclipse.ui.wizards.datatransfer.ZipFileStructureProvider;
-
-public abstract class JarImportOperation implements IWorkspaceRunnable {
-
-	protected void extractZipFile(File file, IPath destPath, IProgressMonitor monitor)
-			throws CoreException {
-		ZipFile zipFile = null;
-		try {
-			zipFile = new ZipFile(file);
-			ZipFileStructureProvider provider = new ZipFileStructureProvider(zipFile);
-			importContent(provider.getRoot(), destPath, provider, null, monitor);
-		} catch (IOException e) {
-			IStatus status = new Status(IStatus.ERROR, PDEPlugin.getPluginId(),
-					IStatus.ERROR, e.getMessage(), e);
-			throw new CoreException(status);
-		} finally {
-			if (zipFile != null) {
-				try {
-					zipFile.close();
-				} catch (IOException e) {
-				}
-			}
-		}
-	}
-
-	protected void importContent(Object source, IPath destPath,
-			IImportStructureProvider provider, List filesToImport,
-			IProgressMonitor monitor) throws CoreException {
-		IOverwriteQuery query = new IOverwriteQuery() {
-			public String queryOverwrite(String file) {
-				return ALL;
-			}
-		};
-		try {
-			ImportOperation op = new ImportOperation(destPath, source, provider, query);
-			op.setCreateContainerStructure(false);
-			if (filesToImport != null) {
-				op.setFilesToImport(filesToImport);
-			}
-			op.run(monitor);
-		} catch (InvocationTargetException e) {
-			IStatus status = new Status(IStatus.ERROR, PDEPlugin.getPluginId(),
-					IStatus.ERROR, e.getMessage(), e);
-			throw new CoreException(status);
-		} catch (InterruptedException e) {
-			throw new OperationCanceledException(e.getMessage());
-		}
-	}
-
-	protected void extractResources(File file, IResource dest, IProgressMonitor monitor) throws CoreException {
-		ZipFile zipFile = null;
-		try {
-			zipFile = new ZipFile(file);
-			ZipFileStructureProvider provider = new ZipFileStructureProvider(zipFile);
-			ArrayList collected = new ArrayList();
-			collectResources(provider, provider.getRoot(), true, collected);
-			importContent(provider.getRoot(), dest.getFullPath(), provider, collected,
-					monitor);
-		} catch (IOException e) {
-			IStatus status = new Status(IStatus.ERROR, PDEPlugin.getPluginId(),
-					IStatus.ERROR, e.getMessage(), e);
-			throw new CoreException(status);
-		} finally {
-			if (zipFile != null) {
-				try {
-					zipFile.close();
-				} catch (IOException e) {
-				}
-			}
-		}
-	}
-	
-	protected void extractJavaResources(File file, IResource dest, IProgressMonitor monitor) throws CoreException {
-		ZipFile zipFile = null;
-		try {
-			zipFile = new ZipFile(file);
-			ZipFileStructureProvider provider = new ZipFileStructureProvider(zipFile);
-			ArrayList collected = new ArrayList();
-			collectJavaResources(provider, provider.getRoot(), collected);
-			importContent(provider.getRoot(), dest.getFullPath(), provider, collected,
-					monitor);
-		} catch (IOException e) {
-			IStatus status = new Status(IStatus.ERROR, PDEPlugin.getPluginId(),
-					IStatus.ERROR, e.getMessage(), e);
-			throw new CoreException(status);
-		} finally {
-			if (zipFile != null) {
-				try {
-					zipFile.close();
-				} catch (IOException e) {
-				}
-			}
-		}
-	}
-
-	protected void importArchive(IProject project, File archive, IPath destPath)
-			throws CoreException {
-		try {
-			if (destPath.segmentCount() > 2)
-				CoreUtility.createFolder(project.getFolder(destPath.removeLastSegments(1)));
-			IFile file = project.getFile(destPath);
-			FileInputStream fstream = new FileInputStream(archive);
-			if (file.exists())
-				file.setContents(fstream, true, false, null);
-			else
-				file.create(fstream, true, null);
-			fstream.close();
-		} catch (IOException e) {
-			IStatus status = new Status(IStatus.ERROR, PDEPlugin.getPluginId(),
-					IStatus.OK, e.getMessage(), e);
-			throw new CoreException(status);
-		}
-	}
-
-	private void collectResources(ZipFileStructureProvider provider, Object element, boolean excludeMeta, ArrayList collected) {
-		List children = provider.getChildren(element);
-		if (children != null && !children.isEmpty()) {
-			for (int i = 0; i < children.size(); i++) {
-				Object curr = children.get(i);
-				if (provider.isFolder(curr)) {
-					if (!excludeMeta || !provider.getLabel(curr).equals("META-INF")) { //$NON-NLS-1$
-						collectResources(provider, curr, excludeMeta, collected);
-					}
-				} else if (!provider.getLabel(curr).endsWith(".class")) { //$NON-NLS-1$
-					collected.add(curr);
-				}
-			}
-		}
-	}
-
-	protected void collectNonJavaResources(ZipFileStructureProvider provider, Object element, ArrayList collected) {
-		List children = provider.getChildren(element);
-		if (children != null && !children.isEmpty()) {
-			for (int i = 0; i < children.size(); i++) {
-				Object curr = children.get(i);
-				if (provider.isFolder(curr)) {
-					if (!provider.getLabel(curr).equals("src") && !isClassFolder(provider, curr)) { //$NON-NLS-1$
-						ArrayList list = new ArrayList();
-						collectResources(provider, curr, false, list);
-						collected.addAll(list);
-					}
-				} else if (!provider.getLabel(curr).endsWith(".class")) { //$NON-NLS-1$
-					collected.add(curr);
-				}
-			}
-		}
-	}
-	
-	protected void collectJavaFiles(ZipFileStructureProvider provider, Object element, ArrayList collected) {
-		List children = provider.getChildren(element);
-		if (children != null && !children.isEmpty()) {
-			for (int i = 0; i < children.size(); i++) {
-				Object curr = children.get(i);
-				if (provider.isFolder(curr)) {
-					if (provider.getLabel(curr).equals("src")) { //$NON-NLS-1$
-						ArrayList list = new ArrayList();
-						collectResources(provider, curr, false, list);
-						collected.addAll(list);
-					}
-				}
-			}
-		}
-	}
-	
-	protected void collectJavaResources(ZipFileStructureProvider provider, Object element, ArrayList collected) {
-		List children = provider.getChildren(element);
-		if (children != null && !children.isEmpty()) {
-			for (int i = 0; i < children.size(); i++) {
-				Object curr = children.get(i);
-				if (provider.isFolder(curr)) {
-					if (isClassFolder(provider, curr)) {
-						ArrayList list = new ArrayList();
-						collectResources(provider, curr, false, list);
-						collected.addAll(list);
-					}
-				}
-			}
-		}
-	}
-	
-	private boolean isClassFolder(ZipFileStructureProvider provider, Object element) {
-		List children = provider.getChildren(element);
-		if (children != null && !children.isEmpty()) {
-			for (int i = 0; i < children.size(); i++) {
-				Object curr = children.get(i);
-				if (provider.isFolder(curr)) {
-					if (isClassFolder(provider, curr)) {
-						return true;
-					}
-				} else if (provider.getLabel(curr).endsWith(".class")) { //$NON-NLS-1$
-					return true;
-				} 
-			}
-		}
-		return false;
-	}
-	
-	protected boolean hasEmbeddedSource(ZipFileStructureProvider provider) {
-		List children = provider.getChildren(provider.getRoot());
-		if (children != null && !children.isEmpty()) {
-			for (int i = 0; i < children.size(); i++) {
-				Object curr = children.get(i);
-				if (provider.isFolder(curr) && provider.getLabel(curr).equals("src")) { //$NON-NLS-1$
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-	
-	protected boolean containsCode(ZipFileStructureProvider provider) {
-		List children = provider.getChildren(provider.getRoot());
-		if (children != null && !children.isEmpty()) {
-			for (int i = 0; i < children.size(); i++) {
-				Object curr = children.get(i);
-				if (provider.isFolder(curr) && isClassFolder(provider, curr)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-	
-	protected boolean containsCode(File file) {
-		ZipFile zipFile = null;
-		try {
-			zipFile = new ZipFile(file);
-			return containsCode(new ZipFileStructureProvider(zipFile));
-		} catch (IOException e) {
-		} finally {
-			if (zipFile != null) {
-				try {
-					zipFile.close();
-				} catch (IOException e) {
-				}
-			}
-		}
-		return true;
-	}
-	
-	protected String[] getTopLevelResources(File file) {
-		ArrayList result = new ArrayList();
-		ZipFile zipFile = null;
-		try {
-			zipFile = new ZipFile(file);
-			ZipFileStructureProvider provider = new ZipFileStructureProvider(zipFile);
-			List children = provider.getChildren(provider.getRoot());
-			if (children != null && !children.isEmpty()) {
-				for (int i = 0; i < children.size(); i++) {
-					Object curr = children.get(i);
-					if (provider.isFolder(curr)) {
-						if (!isClassFolder(provider, curr)) 
-							result.add(provider.getLabel(curr) + "/"); //$NON-NLS-1$
-						else {
-							if (!result.contains(".")) //$NON-NLS-1$
-								result.add("."); //$NON-NLS-1$
-						}
-					} else {
-						result.add(provider.getLabel(curr));
-					}
-				}
-			}			
-		} catch (IOException e) {
-		} finally {
-			if (zipFile != null) {
-				try {
-					zipFile.close();
-				} catch (IOException e) {
-				}
-			}
-		}	
-		return (String[])result.toArray(new String[result.size()]);
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportOperation.java
deleted file mode 100644
index 80cf52f..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportOperation.java
+++ /dev/null

@@ -1,636 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.imports;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.zip.ZipFile;
-
-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.IncrementalProjectBuilder;
-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.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-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.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.osgi.service.environment.Constants;
-import org.eclipse.osgi.service.resolver.BundleDescription;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.core.build.IBuild;
-import org.eclipse.pde.core.build.IBuildEntry;
-import org.eclipse.pde.core.plugin.IFragment;
-import org.eclipse.pde.core.plugin.IFragmentModel;
-import org.eclipse.pde.core.plugin.IPluginLibrary;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.PDE;
-import org.eclipse.pde.internal.core.ClasspathUtilCore;
-import org.eclipse.pde.internal.core.ModelEntry;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.PDEPluginConverter;
-import org.eclipse.pde.internal.core.SourceLocationManager;
-import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.wizards.plugin.ClasspathComputer;
-import org.eclipse.team.core.RepositoryProvider;
-import org.eclipse.team.core.TeamException;
-import org.eclipse.ui.wizards.datatransfer.FileSystemStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.ZipFileStructureProvider;
-
-public class PluginImportOperation extends JarImportOperation {
-
-	public static final int IMPORT_BINARY = 1;
-
-	public static final int IMPORT_BINARY_WITH_LINKS = 2;
-
-	public static final int IMPORT_WITH_SOURCE = 3;
-
-	private IPluginModelBase[] fModels;
-
-	private int fImportType;
-
-	private IReplaceQuery fReplaceQuery;
-	
-	private Hashtable fProjectClasspaths = new Hashtable();
-
-	private boolean fForceAutobuild;
-
-	public interface IReplaceQuery {
-		public static final int CANCEL = 0;
-
-		public static final int NO = 1;
-
-		public static final int YES = 2;
-
-		int doQuery(IProject project);
-	}
-
-	public PluginImportOperation(IPluginModelBase[] models, int importType, IReplaceQuery replaceQuery) {
-		fModels = models;
-		fImportType = importType;
-		fReplaceQuery = replaceQuery;
-	}
-
-	public PluginImportOperation(IPluginModelBase[] models, int importType, IReplaceQuery replaceQuery, boolean forceAutobuild) {
-		this(models, importType, replaceQuery);
-		fForceAutobuild = forceAutobuild;
-	}
-
-	public void run(IProgressMonitor monitor) throws CoreException,
-			OperationCanceledException{
-		if (monitor == null) {
-			monitor = new NullProgressMonitor();
-		}
-		monitor.beginTask(PDEUIMessages.ImportWizard_operation_creating, fModels.length + 1);
-		try {
-			MultiStatus multiStatus = new MultiStatus(PDEPlugin.getPluginId(),
-					IStatus.OK,
-					PDEUIMessages.ImportWizard_operation_multiProblem, 
-					null);
-
-			for (int i = 0; i < fModels.length; i++) {
-				try {
-					importPlugin(fModels[i], new SubProgressMonitor(monitor, 1));
-				} catch (CoreException e) {
-					multiStatus.merge(e.getStatus());
-				}
-				if (monitor.isCanceled()) {
-					setClasspaths(new SubProgressMonitor(monitor, 1));
-					throw new OperationCanceledException();
-				}
-			}
-			setClasspaths(new SubProgressMonitor(monitor, 1));
-			if (!ResourcesPlugin.getWorkspace().isAutoBuilding() && fForceAutobuild)
-				runBuildJob();
-			if (!multiStatus.isOK())
-				throw new CoreException(multiStatus);
-		} finally {
-			monitor.done();
-		}
-	}
-	
-	private void runBuildJob() {
-		Job buildJob = new Job(PDEUIMessages.CompilersConfigurationBlock_building) { 
-			public boolean belongsTo(Object family) {
-				return ResourcesPlugin.FAMILY_AUTO_BUILD == family;
-			}
-
-			protected IStatus run(IProgressMonitor monitor) {
-				try {
-					PDEPlugin.getWorkspace().build(IncrementalProjectBuilder.INCREMENTAL_BUILD, monitor);
-				} catch (CoreException e) {
-				}
-				return Status.OK_STATUS;
-			}
-		};
-		buildJob.setRule(ResourcesPlugin.getWorkspace().getRuleFactory().buildRule());
-		buildJob.schedule();
-	}
-	
-	private void setClasspaths(IProgressMonitor monitor) throws JavaModelException {
-		monitor.beginTask("", fProjectClasspaths.size()); //$NON-NLS-1$
-		Enumeration keys = fProjectClasspaths.keys();
-		while (keys.hasMoreElements()) {
-			IProject project = (IProject)keys.nextElement();
-			IClasspathEntry[] classpath = (IClasspathEntry[])fProjectClasspaths.get(project);
-			monitor.subTask(project.getName());
-			JavaCore.create(project).setRawClasspath(classpath, new SubProgressMonitor(monitor, 1));
-		}		
-	}
-
-	private void importPlugin(IPluginModelBase model, IProgressMonitor monitor)
-			throws CoreException {
-		String id = model.getPluginBase().getId();
-		monitor.beginTask(NLS.bind(PDEUIMessages.ImportWizard_operation_creating2, id), 6);
-		try {
-			IProject project = findProject(model.getPluginBase().getId());
-
-			if (project.exists()) {
-				if (!queryReplace(project))
-					return;
-				if (RepositoryProvider.isShared(project))
-					RepositoryProvider.unmap(project);
-				project.delete(true, true, monitor);
-			}
-
-			project.create(monitor);
-			if (!project.isOpen())
-				project.open(monitor);			
-			monitor.worked(1);
-
-			switch (fImportType) {
-				case IMPORT_BINARY:
-					importAsBinary(project, model, true, new SubProgressMonitor(monitor, 4));
-					break;
-				case IMPORT_BINARY_WITH_LINKS:
-					if (model.getPluginBase().getId().startsWith("org.eclipse.swt") && !isJARd(model)) { //$NON-NLS-1$
-						importAsBinary(project, model, true, monitor);
-					} else {
-						importAsBinaryWithLinks(project, model, new SubProgressMonitor(monitor, 4));
-					}
-					break;
-				case IMPORT_WITH_SOURCE:
-					if (isExempt(model)) {
-						importAsBinary(project, model, true, new SubProgressMonitor(monitor, 4));
-					} else {
-						importAsSource(project, model, new SubProgressMonitor(monitor, 4));
-					}
-			}
-
-			setProjectDescription(project, model);
-
-			if (project.hasNature(JavaCore.NATURE_ID) && project.findMember(".classpath") == null) //$NON-NLS-1$
-				fProjectClasspaths .put(project, ClasspathComputer.getClasspath(project, model, true));
-		} catch (CoreException e) {
-		} finally {
-			monitor.done();
-		}
-	}
-	
-	private void importAsBinaryWithLinks(IProject project, IPluginModelBase model, IProgressMonitor monitor) throws CoreException {
-		if (isJARd(model)) {
-			extractJARdPlugin(
-					project,
-					model,
-					monitor);
-		} else {
-			File[] items = new File(model.getInstallLocation()).listFiles();
-			if (items != null) {
-				monitor.beginTask(PDEUIMessages.PluginImportOperation_linking, items.length + 1); 
-				for (int i = 0; i < items.length; i++) {
-					File sourceFile = items[i];
-					String name = sourceFile.getName();
-					if (sourceFile.isDirectory()) {
-						project.getFolder(name).createLink(
-							new Path(sourceFile.getPath()),
-							IResource.NONE,
-							new SubProgressMonitor(monitor, 1));
-					} else {
-						if (!name.equals(".project")) { //$NON-NLS-1$ 
-							project.getFile(name).createLink(
-								new Path(sourceFile.getPath()),
-								IResource.NONE,
-								new SubProgressMonitor(monitor, 1));
-						}
-					}
-				}
-			}
-			linkSourceArchives(project, model, new SubProgressMonitor(monitor, 1));
-		}
-		try {
-			RepositoryProvider.map(project, PDECore.BINARY_REPOSITORY_PROVIDER);
-		} catch (TeamException e) {
-		}
-	}
-
-	private void importAsBinary(IProject project, IPluginModelBase model, boolean markAsBinary, IProgressMonitor monitor) throws CoreException {
-		monitor.beginTask("", 2); //$NON-NLS-1$
-		if (isJARd(model)) {
-			extractJARdPlugin(
-					project,
-					model,
-					new SubProgressMonitor(monitor, 1));
-		} else {
-			importContent(
-					new File(model.getInstallLocation()),
-					project.getFullPath(),
-					FileSystemStructureProvider.INSTANCE,
-					null,
-					new SubProgressMonitor(monitor, 1));
-			importSourceArchives(
-					project,
-					model,
-					new SubProgressMonitor(monitor, 1));	
-			
-			// make sure all libraries have been imported
-			// if any are missing, check in fragments		
-			IFragment[] fragments = getFragmentsFor(model);
-			IPluginLibrary[] libraries = model.getPluginBase().getLibraries();
-			
-			for (int i = 0; i < libraries.length; i++) {
-				String libraryName = libraries[i].getName();
-				if (ClasspathUtilCore.containsVariables(libraryName) &&
-						!project.exists(new Path(ClasspathUtilCore.expandLibraryName(libraryName)))) {
-					for (int j = 0; j < fragments.length; j++) {
-						importJarFromFragment(project, fragments[j], libraryName);
-						importSourceFromFragment(project, fragments[j], libraryName);
-					}
-				}
-			}
-		}
-		
-		if (markAsBinary)
-			project.setPersistentProperty(
-					PDECore.EXTERNAL_PROJECT_PROPERTY,
-					PDECore.BINARY_PROJECT_VALUE);		
-	}
-
-	private void importAsSource(IProject project, IPluginModelBase model, SubProgressMonitor monitor) throws CoreException {
-		monitor.beginTask("", 3); //$NON-NLS-1$
-		importAsBinary(project, model, false, new SubProgressMonitor(monitor, 2));
-		
-		WorkspaceBuildModel buildModel = new WorkspaceBuildModel(project.getFile("build.properties")); //$NON-NLS-1$
-		if (!isJARd(model) || containsCode(new File(model.getInstallLocation()))) {
-			String[] libraries = getLibraryNames(model, false);
-			for (int i = 0; i < libraries.length; i++) {
-				if (ClasspathUtilCore.containsVariables(libraries[i]))
-					continue;
-				String name = ClasspathUtilCore.expandLibraryName(libraries[i]);
-				IPath libraryPath = (name.equals(".") && isJARd(model)) //$NON-NLS-1$
-										? new Path(new File(model.getInstallLocation()).getName())
-										: new Path(name);
-				IResource jarFile = project.findMember(libraryPath);
-				if (jarFile != null) {
-					IResource srcZip = jarFile.getProject().findMember(ClasspathUtilCore.getSourceZipName(jarFile.getName()));
-					if (srcZip != null) {
-						String jarName = libraries[i].equals(".") ? "" : libraryPath.removeFileExtension().lastSegment(); //$NON-NLS-1$ //$NON-NLS-2$
-						String folder = addBuildEntry(buildModel, "source." + libraries[i], "src" + (jarName.length() == 0 ? "/" : "-" + jarName + "/")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-						IFolder dest = jarFile.getProject().getFolder(folder); 
-						if (!dest.exists()) {
-							dest.create(true, true, null);
-						}
-						extractZipFile(srcZip.getLocation().toFile(), dest.getFullPath(), monitor);
-						if (isJARd(model)) {
-							extractJavaResources(jarFile.getLocation().toFile(), dest, monitor);
-						} else {
-							extractResources(jarFile.getLocation().toFile(), dest, monitor);
-						}
-						srcZip.delete(true, null);
-						jarFile.delete(true, null);
-					}
-				} else if (name.equals(".") && project.getFolder("src").exists()) { //$NON-NLS-1$ //$NON-NLS-2$
-					addBuildEntry(buildModel, "source..", "src/"); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-			}	
-		}
-		configureBinIncludes(buildModel, model);
-		buildModel.save();
-	}
-	
-	private void configureBinIncludes(WorkspaceBuildModel buildModel, IPluginModelBase model) throws CoreException {
-		IBuildEntry entry = buildModel.getBuild(true).getEntry("bin.includes"); //$NON-NLS-1$
-		if (entry == null) {
-			entry = buildModel.getFactory().createEntry("bin.includes"); //$NON-NLS-1$
-			File location = new File(model.getInstallLocation());
-			if (location.isDirectory()) {
-				File[] files = location.listFiles();
-				for (int i = 0; i < files.length; i++) {
-					String token = files[i].getName();
-					if (files[i].isDirectory())
-						token = token + "/"; //$NON-NLS-1$
-					entry.addToken(token);
-				}
-			} else {
-				String[] tokens = getTopLevelResources(location);
-				for (int i = 0; i < tokens.length; i++) {
-					entry.addToken(tokens[i]);
-				}
-			}
-			buildModel.getBuild().add(entry);
-		}
-	}
-	
-	private String addBuildEntry(WorkspaceBuildModel model, String key, String value) throws CoreException {
-		IBuild build = model.getBuild(true);
-		IBuildEntry entry = build.getEntry(key);
-		if (entry == null) {
-			entry = model.getFactory().createEntry(key);
-			entry.addToken(value);
-			build.add(entry);
-		}
-		String[] tokens = entry.getTokens();
-		return (tokens.length > 0) ? tokens[0] : "src/"; //$NON-NLS-1$
-	}
-
-	private void linkSourceArchives(IProject project, IPluginModelBase model,
-			IProgressMonitor monitor) throws CoreException {
-
-		String[] libraries = getLibraryNames(model, true);
-		monitor.beginTask(PDEUIMessages.ImportWizard_operation_copyingSource,
-				libraries.length);
-
-		SourceLocationManager manager = PDECore.getDefault().getSourceLocationManager();
-		for (int i = 0; i < libraries.length; i++) {
-			String zipName = ClasspathUtilCore.getSourceZipName(libraries[i]);
-			IPath path = new Path(zipName);
-			if (project.findMember(path) == null) {
-				IPath srcPath = manager.findSourcePath(model.getPluginBase(), path);
-				if (srcPath != null) {
-					if ("src.zip".equals(zipName) && isJARd(model)) { //$NON-NLS-1$
-						path = new Path(ClasspathUtilCore.getSourceZipName(new File(model
-								.getInstallLocation()).getName()));
-					}
-					IFile zipFile = project.getFile(path.lastSegment());
-					if (!zipFile.exists()) {
-						zipFile.createLink(
-								srcPath,
-								IResource.NONE,
-								new SubProgressMonitor(monitor, 1));
-					}
-				}
-			}
-			monitor.worked(1);
-		}
-		monitor.done();
-	}
-
-	private void importSourceArchives(IProject project, IPluginModelBase model, IProgressMonitor monitor)
-			throws CoreException {
-		
-		String[] libraries = getLibraryNames(model, true);
-		monitor.beginTask(PDEUIMessages.ImportWizard_operation_copyingSource, libraries.length);
-
-		SourceLocationManager manager = PDECore.getDefault().getSourceLocationManager();
-		for (int i = 0; i < libraries.length; i++) {
-			String zipName = ClasspathUtilCore.getSourceZipName(libraries[i]);
-			IPath path = new Path(zipName);
-			if (project.findMember(path) == null) {
-				IPath srcPath = manager.findSourcePath(model.getPluginBase(), path);
-				if (srcPath != null) {
-					if ("src.zip".equals(zipName) && isJARd(model)) { //$NON-NLS-1$
-						path = new Path(ClasspathUtilCore.getSourceZipName(new File(model.getInstallLocation()).getName()));
-					}
-					importArchive(project, new File(srcPath.toOSString()), path);						
-				}
-			}
-			monitor.worked(1);
-		}
-		monitor.done();
-	}
-	
-	private String[] getLibraryNames(IPluginModelBase model, boolean expand) {
-		IPluginLibrary[] libraries = model.getPluginBase().getLibraries();
-		ArrayList list = new ArrayList();
-		for (int i = 0; i < libraries.length; i++) {
-			if (expand)
-				list.add(ClasspathUtilCore.expandLibraryName(libraries[i].getName()));
-			else
-				list.add(libraries[i].getName());
-		}
-		if (libraries.length == 0 && isJARd(model))
-			list.add("."); //$NON-NLS-1$
-		return (String[])list.toArray(new String[list.size()]);
-	}
-	
-	private void extractJARdPlugin(IProject project, IPluginModelBase model, IProgressMonitor monitor) throws CoreException {
-		ZipFile zipFile = null;
-		try {
-			zipFile = new ZipFile(model.getInstallLocation());
-			ZipFileStructureProvider provider = new ZipFileStructureProvider(zipFile);
-			if (!containsCode(provider)) {
-				extractZipFile(new File(model.getInstallLocation()), project.getFullPath(), monitor);
-				return;
-			}
-			ArrayList collected = new ArrayList();
-			collectNonJavaResources(provider, provider.getRoot(), collected);
-			importContent(provider.getRoot(), project.getFullPath(), provider, collected, monitor);
-
-			File file = new File(model.getInstallLocation());
-			if (hasEmbeddedSource(provider) && fImportType == IMPORT_WITH_SOURCE) {
-				collected = new ArrayList();
-				collectJavaFiles(provider, provider.getRoot(), collected);
-				importContent(provider.getRoot(), project.getFullPath(), provider, collected, monitor);
-				collected = new ArrayList();
-				collectJavaResources(provider, provider.getRoot(), collected);
-				importContent(provider.getRoot(), project.getFullPath().append("src"), provider, collected, monitor); //$NON-NLS-1$
-			} else {
-				if (fImportType == IMPORT_BINARY_WITH_LINKS) {
-					 project.getFile(file.getName()).createLink(
-						new Path(file.getAbsolutePath()),
-						IResource.NONE,
-					 	null);
-				} else {
-					importArchive(project, file, new Path(file.getName()));				
-				}
-				if (!hasEmbeddedSource(provider)) {
-					if (fImportType == IMPORT_BINARY_WITH_LINKS) {
-						linkSourceArchives(
-								project, 
-								model, 
-								new SubProgressMonitor(monitor, 1));
-					} else {
-						importSourceArchives(
-								project,
-								model,
-								new SubProgressMonitor(monitor, 1));
-					}
-				}
-			}
-			if (fImportType != IMPORT_WITH_SOURCE) {
-				PDEPluginConverter.modifyBundleClasspathHeader(project, model);
-			}
-			setPermissions(model, project);
-		} catch (IOException e) {
-			IStatus status = new Status(IStatus.ERROR, PDEPlugin.getPluginId(),
-					IStatus.ERROR, e.getMessage(), e);
-			throw new CoreException(status);
-		} finally {
-			if (zipFile != null) {
-				try {
-					zipFile.close();
-				} catch (IOException e) {
-				}
-			}
-		}
-	}
-
-
-
-	private IProject findProject(String id) {
-		ModelEntry entry = PDECore.getDefault().getModelManager().findEntry(id);
-		if (entry != null) {
-			IPluginModelBase model = entry.getWorkspaceModel();
-			if (model != null)
-				return model.getUnderlyingResource().getProject();
-		}
-		return PDEPlugin.getWorkspace().getRoot().getProject(id);
-	}
-
-	private boolean queryReplace(IProject project) throws OperationCanceledException {
-		switch (fReplaceQuery.doQuery(project)) {
-			case IReplaceQuery.CANCEL:
-				throw new OperationCanceledException();
-			case IReplaceQuery.NO:
-				return false;
-		}
-		return true;
-	}
-	
-	private void setProjectDescription(IProject project, IPluginModelBase model)
-			throws CoreException {
-		IProjectDescription desc = project.getDescription();
-		if (needsJavaNature(project, model))
-			desc.setNatureIds(new String[] { JavaCore.NATURE_ID, PDE.PLUGIN_NATURE });
-		else
-			desc.setNatureIds(new String[] { PDE.PLUGIN_NATURE });
-		project.setDescription(desc, null);
-	}
-
-	private boolean needsJavaNature(IProject project, IPluginModelBase model) {
-		if (model.getPluginBase().getLibraries().length > 0)
-			return true;
-		
-		BundleDescription desc = model.getBundleDescription();
-		if (desc != null) {
-			if (desc.getExportPackages().length > 0)
-				return true;
-			if (desc.getRequiredBundles().length > 0)
-				return true;
-			if (desc.getImportPackages().length > 0)
-				return true;
-		}		
-		return false;
-	}
-	
-	private boolean isExempt(IPluginModelBase model) {
-		String id = model.getPluginBase().getId();
-		if ("org.apache.ant".equals(id) //$NON-NLS-1$
-			|| "org.eclipse.osgi.util".equals(id) //$NON-NLS-1$
-			|| "org.eclipse.osgi.services".equals(id) //$NON-NLS-1$
-			|| "org.eclipse.team.cvs.ssh2".equals(id)) //$NON-NLS-1$
-			return true;
-		
-		if ("org.eclipse.swt".equals(id) && !isJARd(model)) //$NON-NLS-1$
-			return true;
-		return false;
-	}
-
-	private boolean isJARd(IPluginModelBase model) {
-		return new File(model.getInstallLocation()).isFile();
-	}
-	
-	private void setPermissions(IPluginModelBase model, IProject project) {
-		try {
-			if (!Platform.getOS().equals(Constants.OS_WIN32) && model instanceof IFragmentModel) {
-				IFragment fragment = ((IFragmentModel)model).getFragment();
-				if ("org.eclipse.swt".equals(fragment.getPluginId())) { //$NON-NLS-1$
-					IResource[] children = project.members();
-					for (int i = 0; i < children.length; i++) {
-						if (children[i] instanceof IFile && isInterestingResource(children[i].getName())) {
-							Runtime.getRuntime().exec(new String[] {"chmod", "755", children[i].getLocation().toOSString()}).waitFor();						 //$NON-NLS-1$ //$NON-NLS-2$
-						}
-					}
-				}			
-			}
-		} catch (CoreException e) {
-		} catch (InterruptedException e) {
-		} catch (IOException e) {
-		}
-	}
-	
-	private boolean isInterestingResource(String name) {
-		return name.endsWith(".jnilib") //$NON-NLS-1$
-		|| name.endsWith(".sl") //$NON-NLS-1$
-		|| name.endsWith(".a") //$NON-NLS-1$
-		|| name.indexOf(".so") != -1; //$NON-NLS-1$
-	}
-	
-	private IFragment[] getFragmentsFor(IPluginModelBase model) {
-		ArrayList result = new ArrayList();
-		for (int i = 0; i < fModels.length; i++) {
-			if (fModels[i] instanceof IFragmentModel) {
-				IFragment fragment = ((IFragmentModel) fModels[i]).getFragment();
-				if (PDECore.compare(
-						model.getPluginBase().getId(),
-						model.getPluginBase().getVersion(),
-						fragment.getPluginId(),
-						fragment.getVersion(),
-						fragment.getRule())) {
-					result.add(fragment);
-				}
-			}
-		}
-		return (IFragment[])result.toArray(new IFragment[result.size()]);
-	}
-	
-	private void importJarFromFragment(IProject project, IFragment fragment, String name)
-		throws CoreException {
-		IPath jarPath = new Path(ClasspathUtilCore.expandLibraryName(name));
-		File jar =
-			new File(fragment.getModel().getInstallLocation(), jarPath.toString());
-		if (jar.exists()) {
-			importArchive(project, jar, jarPath);
-		}
-	}
-	
-	private void importSourceFromFragment(IProject project, IFragment fragment, String name)
-		throws CoreException {
-		IPath jarPath = new Path(ClasspathUtilCore.expandLibraryName(name));
-		IPath srcPath = new Path(ClasspathUtilCore.getSourceZipName(jarPath.toString()));
-		SourceLocationManager manager = PDECore.getDefault().getSourceLocationManager();
-		File srcFile = manager.findSourceFile(fragment, srcPath);
-		if (srcFile != null) {
-			importArchive(project, srcFile, srcPath);
-		}
-	}
-	
-
-
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizard.java
deleted file mode 100644
index 7055a4a..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizard.java
+++ /dev/null

@@ -1,204 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.imports;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.jface.dialogs.IDialogConstants;
-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.wizard.IWizardPage;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IImportWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.pde.internal.ui.wizards.imports.PluginImportOperation.IReplaceQuery;
-
-public class PluginImportWizard extends Wizard implements IImportWizard {
-
-	private static final String STORE_SECTION = "PluginImportWizard"; //$NON-NLS-1$
-		
-	private IStructuredSelection selection;	
-	private PluginImportWizardFirstPage page1;
-	private BaseImportWizardSecondPage page2;
-	private BaseImportWizardSecondPage page3;
-
-	public PluginImportWizard() {
-		IDialogSettings masterSettings = PDEPlugin.getDefault().getDialogSettings();
-		setDialogSettings(getSettingsSection(masterSettings));
-		setDefaultPageImageDescriptor(PDEPluginImages.DESC_PLUGIN_IMPORT_WIZ);
-		setWindowTitle(PDEUIMessages.ImportWizard_title); 
-	}
-
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		this.selection = selection;
-	}
-
-	public void addPages() {
-		setNeedsProgressMonitor(true);
-		page1 = new PluginImportWizardFirstPage("first"); //$NON-NLS-1$
-		addPage(page1);
-		page2 = new PluginImportWizardExpressPage("express", page1, selection); //$NON-NLS-1$
-		addPage(page2);
-		page3 = new PluginImportWizardDetailedPage("detailed", page1); //$NON-NLS-1$
-		addPage(page3);
-	}
-
-	private IDialogSettings getSettingsSection(IDialogSettings master) {
-		IDialogSettings setting = master.getSection(STORE_SECTION);
-		if (setting == null) {
-			setting = master.addNewSection(STORE_SECTION);
-		}
-		return setting;
-	}
-
-	private IPluginModelBase[] getModelsToImport() {
-		if (page1.getNextPage().equals(page2))
-			return page2.getModelsToImport();
-		return page3.getModelsToImport();
-	}
-
-	public boolean performFinish() {
-		page1.storeSettings();
-		((BaseImportWizardSecondPage)page1.getNextPage()).storeSettings();
-		
-		try {
-			final IPluginModelBase[] models = getModelsToImport();
-			IRunnableWithProgress op =
-				getImportOperation(
-					getShell(),
-					page1.getImportType(),
-					models,
-					page2.forceAutoBuild());
-			getContainer().run(true, true, op);
-
-		} catch (InterruptedException e) {
-			return false;
-		} catch (InvocationTargetException e) {
-			PDEPlugin.logException(e);
-			return true; // exception handled
-		}		
-		return true;
-	}
-	
-	public static IRunnableWithProgress getImportOperation(
-		final Shell shell,
-		final int importType,
-		final IPluginModelBase[] models,
-		final boolean forceAutobuild) {
-		return new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor)
-				throws InvocationTargetException, InterruptedException {
-				try {
-					PluginImportOperation.IReplaceQuery query = new ReplaceQuery(shell);
-					PluginImportOperation op =
-						new PluginImportOperation(models, importType, query, forceAutobuild);
-					PDEPlugin.getWorkspace().run(op, monitor);
-				} catch (CoreException e) {
-					throw new InvocationTargetException(e);
-				} catch (OperationCanceledException e) {
-					throw new InterruptedException(e.getMessage());
-				} finally {
-					monitor.done();
-				}
-			}
-		};
-	}
-	
-
-	private static class ReplaceDialog extends MessageDialog {
-		public ReplaceDialog(Shell parentShell, String dialogMessage) {
-			super(
-				parentShell,
-				PDEUIMessages.ImportWizard_messages_title, 
-				null,
-				dialogMessage,
-				MessageDialog.QUESTION,
-				new String[] {
-					IDialogConstants.YES_LABEL,
-					IDialogConstants.YES_TO_ALL_LABEL,
-					IDialogConstants.NO_LABEL,
-					PDEUIMessages.ImportWizard_noToAll, 
-					IDialogConstants.CANCEL_LABEL },
-				0);
-		}
-	}
-
-	private static class ReplaceQuery implements IReplaceQuery {
-		private Shell shell;
-		public ReplaceQuery(Shell shell) {
-			this.shell = shell;
-		}
-
-		private int yesToAll = 0;
-		private int[] RETURNCODES =
-			{
-				IReplaceQuery.YES,
-				IReplaceQuery.YES,
-				IReplaceQuery.NO,
-				IReplaceQuery.NO,
-				IReplaceQuery.CANCEL };
-
-		public int doQuery(IProject project) {
-			if (yesToAll != 0) {
-				return yesToAll > 0 ? IReplaceQuery.YES : IReplaceQuery.NO;
-			}
-
-			final String message =
-				NLS.bind(PDEUIMessages.ImportWizard_messages_exists, project.getName()); 
-			final int[] result = { IReplaceQuery.CANCEL };
-			shell.getDisplay().syncExec(new Runnable() {
-				public void run() {
-					ReplaceDialog dialog = new ReplaceDialog(shell, message);
-					int retVal = dialog.open();
-					if (retVal >= 0) {
-						result[0] = RETURNCODES[retVal];
-						if (retVal == 1) {
-							yesToAll = 1;
-						} else if (retVal == 3) {
-							yesToAll = -1;
-						}
-					}
-				}
-			});
-			return result[0];
-		}
-	}
-	
-	public IWizardPage getNextPage(IWizardPage page) {
-		if (page.equals(page1)) {
-			if (page1.getScanAllPlugins()) {
-				return page3;
-			}
-			return page2;			
-		}
-		return null;
-	}
-	
-	public IWizardPage getPreviousPage(IWizardPage page) {
-		return page.equals(page1) ? null : page1;
-	}
-	
-	public boolean canFinish() {
-		return !page1.isCurrentPage() && page1.getNextPage().isPageComplete();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardDetailedPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardDetailedPage.java
deleted file mode 100644
index 0a6d637..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardDetailedPage.java
+++ /dev/null

@@ -1,470 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 31, 2003
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code Template
- */
-package org.eclipse.pde.internal.ui.wizards.imports;
-
-
-
-import java.util.ArrayList;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.WorkspaceModelManager;
-import org.eclipse.pde.internal.core.util.PatternConstructor;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
-import org.eclipse.pde.internal.ui.util.SWTUtil;
-import org.eclipse.pde.internal.ui.wizards.ListUtil;
-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.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Wassim Melhem
- */
-public class PluginImportWizardDetailedPage extends BaseImportWizardSecondPage {
-
-	
-	class ContentProvider
-		extends DefaultContentProvider
-		implements IStructuredContentProvider {
-		public Object[] getElements(Object element) {
-			return fModels;
-		}
-	}
-
-	private Label fCountLabel;
-	private TableViewer fAvailableListViewer;
-	private Text fFilterText;
-	
-	public PluginImportWizardDetailedPage(String pageName, PluginImportWizardFirstPage firstPage) {
-		super(pageName, firstPage);
-		setTitle(PDEUIMessages.ImportWizard_DetailedPage_title); 
-		setMessage(PDEUIMessages.ImportWizard_DetailedPage_desc); 
-	}
-
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		layout.makeColumnsEqualWidth = false;
-		layout.horizontalSpacing = 5;
-		layout.verticalSpacing = 10;
-		container.setLayout(layout);
-				
-		createScrollArea(container);
-		createAvailableList(container).setLayoutData(new GridData(GridData.FILL_BOTH));
-		createButtonArea(container);
-		createImportList(container).setLayoutData(new GridData(GridData.FILL_BOTH));
-		updateCount();
-		createComputationsOption(container, 3);		
-		addViewerListeners();
-		
-		initialize();
-		setControl(container);
-		Dialog.applyDialogFont(container);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(container, IHelpContextIds.PLUGIN_IMPORT_SECOND_PAGE);
-	}
-	
-	private void initialize(){
-		setPageComplete(false);
-	}
-	
-	private void addViewerListeners() {
-		fAvailableListViewer.addDoubleClickListener(new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent event) {
-				handleAdd();
-			}
-		});
-				
-		fImportListViewer.addDoubleClickListener(new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent event) {
-				handleRemove();
-			}
-		});
-		
-		fFilterText.addModifyListener(new ModifyListener(){
-			public void modifyText(ModifyEvent e) {
-				handleFilter();
-			}
-		});
-		
-	}
-
-	private Composite createAvailableList(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.marginWidth = 0;
-		layout.marginHeight = 0;
-		container.setLayout(layout);
-		container.setLayoutData(new GridData());
-
-		Label label = new Label(container, SWT.NONE);
-		label.setText(PDEUIMessages.ImportWizard_DetailedPage_availableList); 
-
-		Table table = new Table(container, SWT.BORDER | SWT.MULTI | SWT.V_SCROLL);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.widthHint = 225;
-		table.setLayoutData(gd);
-
-		fAvailableListViewer = new TableViewer(table);
-		fAvailableListViewer.setLabelProvider(PDEPlugin.getDefault().getLabelProvider());
-		fAvailableListViewer.setContentProvider(new ContentProvider());
-		fAvailableListViewer.setInput(PDECore.getDefault().getExternalModelManager());
-		fAvailableListViewer.setSorter(ListUtil.PLUGIN_SORTER);
-
-		return container;
-	}
-	
-	
-	private Composite createButtonArea(Composite parent) {
-		Composite comp = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.marginWidth = layout.marginHeight = 0;
-		comp.setLayout(layout);
-		comp.setLayoutData(new GridData(GridData.FILL_VERTICAL));
-		
-		Composite container = new Composite(comp, SWT.NONE);
-		layout = new GridLayout();
-		layout.marginWidth = 0;
-		container.setLayout(layout);
-		GridData gd = new GridData(GridData.FILL_VERTICAL);
-		gd.verticalIndent = 15;
-		container.setLayoutData(gd);
-		
-		Button button = new Button(container, SWT.PUSH);
-		button.setText(PDEUIMessages.ImportWizard_DetailedPage_existing); 
-		button.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		button.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleExistingProjects();
-			}
-		});
-		SWTUtil.setButtonDimensionHint(button);
-
-		button = new Button(container, SWT.PUSH);
-		button.setText(PDEUIMessages.ImportWizard_DetailedPage_existingUnshared); 
-		button.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		button.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleExistingUnshared();
-			}
-		});
-		SWTUtil.setButtonDimensionHint(button);
-		
-		button = new Button(container, SWT.PUSH);
-		button.setText(PDEUIMessages.ImportWizard_DetailedPage_add); 
-		button.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		button.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleAdd();
-			}
-		});
-		SWTUtil.setButtonDimensionHint(button);
-		
-		button = new Button(container, SWT.PUSH);
-		button.setText(PDEUIMessages.ImportWizard_DetailedPage_addAll); 
-		button.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		button.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleAddAll();
-			}
-		});
-		SWTUtil.setButtonDimensionHint(button);
-		
-		button = new Button(container, SWT.PUSH);
-		button.setText(PDEUIMessages.ImportWizard_DetailedPage_remove); 
-		button.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		button.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleRemove();
-			}
-		});
-		SWTUtil.setButtonDimensionHint(button);
-		
-		button = new Button(container, SWT.PUSH);
-		button.setText(PDEUIMessages.ImportWizard_DetailedPage_removeAll); 
-		button.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		button.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleRemoveAll();
-			}
-		});
-		SWTUtil.setButtonDimensionHint(button);
-		
-		button = new Button(container, SWT.PUSH);
-		button.setText(PDEUIMessages.ImportWizard_DetailedPage_swap); 
-		button.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		button.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleSwap();
-			}
-		});
-		SWTUtil.setButtonDimensionHint(button);
-		
-		button = new Button(container, SWT.PUSH);
-		button.setText(PDEUIMessages.ImportWizard_DetailedPage_addRequired); 
-		button.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		button.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleAddRequiredPlugins();
-			}
-
-		});
-		SWTUtil.setButtonDimensionHint(button);
-		
-		fCountLabel = new Label(comp, SWT.NONE);
-		fCountLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_CENTER));		
-		return container;
-	}
-	
-	private Composite createScrollArea(Composite parent){
-		Group container = new Group(parent, SWT.NONE);
-		GridLayout layout = new GridLayout(2,false);
-		layout.marginWidth = layout.marginHeight = 6;
-		container.setLayout(layout);
-		
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan=3;
-		container.setLayoutData(gd);
-		container.setText(PDEUIMessages.ImportWizard_DetailedPage_locate); 
-	
-		Label filterLabel = new Label(container, SWT.NONE);
-		filterLabel.setText(PDEUIMessages.ImportWizard_DetailedPage_search); 
-		
-		fFilterText = new Text(container, SWT.BORDER);
-		fFilterText.setText(""); //$NON-NLS-1$
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		fFilterText.setLayoutData(gd);
-			
-		return container;
-	}
-	public void setVisible(boolean visible) {
-		super.setVisible(visible);
-		setPageComplete(visible && fImportListViewer.getTable().getItemCount() > 0);
-		
-	}
-	protected void refreshPage() {
-		fAvailableListViewer.refresh();
-		fImportListViewer.getTable().removeAll();		
-		pageChanged();
-	}
-	protected void pageChanged() {
-		updateCount();
-		handleFilter();
-		setPageComplete(fImportListViewer.getTable().getItemCount() > 0);
-	}
-	private void updateCount() {
-		fCountLabel.setText(
-			NLS.bind(PDEUIMessages.ImportWizard_DetailedPage_count, (new String[] {
-			new Integer(fImportListViewer.getTable().getItemCount()).toString(),
-			new Integer(fModels.length).toString()})));
-		fCountLabel.getParent().layout();
-	}
-	
-	private void handleAdd() {
-		IStructuredSelection ssel = (IStructuredSelection)fAvailableListViewer.getSelection();
-		if (ssel.size() > 0) {
-			Table table = fAvailableListViewer.getTable();
-			int index = table.getSelectionIndices()[0];
-			fAvailableListViewer.remove(ssel.toArray());
-			fImportListViewer.add(ssel.toArray());
-			table.setSelection(index < table.getItemCount() ? index : table.getItemCount() -1);
-			pageChanged();
-		}		
-	}
-
-	private void handleAddAll() {
-		TableItem[] items = fAvailableListViewer.getTable().getItems();
-
-		ArrayList data = new ArrayList();
-		for (int i = 0; i < items.length; i++) {
-			data.add(items[i].getData());
-		}
-		if (data.size() > 0) {
-			fImportListViewer.add(data.toArray());
-			fAvailableListViewer.remove(data.toArray());
-			pageChanged();
-		}
-	}
-	
-	private void handleFilter() {
-		if (fFilterText == null ||fFilterText.getText().trim().length() == 0)
-			return;
-
-		String text = fFilterText.getText().trim();
-		if (!text.endsWith("*")) //$NON-NLS-1$
-			text += "*"; //$NON-NLS-1$
-		Pattern pattern = PatternConstructor.createPattern(text, true);
-		TableItem[] tableItems = fAvailableListViewer.getTable().getItems();
-		ArrayList results = new ArrayList();
-		for (int i = 0; i<tableItems.length; i++){
-			Object data = tableItems[i].getData();
-			if (data instanceof IPluginModelBase){
-				IPluginModelBase model = (IPluginModelBase)data;
-				if (pattern.matcher(model.getPluginBase().getId()).matches())
-					results.add(tableItems[i]);
-			}
-		}
-		if (results.size()>0){
-			TableItem[] selectionList = (TableItem[])results.toArray(new TableItem[results.size()]);
-			fAvailableListViewer.getTable().setSelection(selectionList);
-		} else {
-			fAvailableListViewer.setSelection(null);
-		}
-	}
-	
-	private void handleRemove() {
-		IStructuredSelection ssel = (IStructuredSelection)fImportListViewer.getSelection();
-		if (ssel.size() > 0) {
-			Table table = fImportListViewer.getTable();
-			int index = table.getSelectionIndices()[0];
-			fImportListViewer.remove(ssel.toArray());
-			fAvailableListViewer.add(ssel.toArray());
-			table.setSelection(index < table.getItemCount() ? index : table.getItemCount() -1);
-			pageChanged();
-		}		
-	}
-	
-	private void handleRemoveAll() {
-		handleRemoveAll(true);
-	}
-	
-	private void handleRemoveAll(boolean refresh) {
-		TableItem[] items = fImportListViewer.getTable().getItems();
-		
-		ArrayList data = new ArrayList();
-		for (int i = 0; i < items.length; i++) {
-			data.add(items[i].getData());
-		}
-		if (data.size() > 0) {
-			fAvailableListViewer.add(data.toArray());
-			fImportListViewer.remove(data.toArray());
-			pageChanged();
-		}		
-	}
-	
-	private void handleSwap() {
-		TableItem[] aItems = fAvailableListViewer.getTable().getItems();
-		TableItem[] iItems = fImportListViewer.getTable().getItems();
-		
-		ArrayList data = new ArrayList();
-		for (int i = 0; i < iItems.length; i++) {
-			data.add(iItems[i].getData());
-		}
-		if (data.size() > 0) {
-			fAvailableListViewer.add(data.toArray());
-			fImportListViewer.remove(data.toArray());
-		}
-		
-		data.clear();
-		for (int i = 0; i < aItems.length; i++) {
-			data.add(aItems[i].getData());
-		}
-		if (data.size() > 0) {
-			fImportListViewer.add(data.toArray());
-			fAvailableListViewer.remove(data.toArray());
-		}
-		pageChanged();		
-	}
-	
-	private void handleExistingProjects() {
-		handleRemoveAll(false);
-		ArrayList result = new ArrayList();
-		for (int i = 0; i < fModels.length; i++) {
-			String id = fModels[i].getPluginBase().getId();
-			IProject project =
-				(IProject) PDEPlugin.getWorkspace().getRoot().findMember(id);
-			if (project != null
-				&& project.isOpen()
-				&& WorkspaceModelManager.isPluginProject(project)) {
-				result.add(fModels[i]);
-			}
-		}
-		if (result.size() > 0) {
-			fImportListViewer.add(result.toArray());
-			fAvailableListViewer.remove(result.toArray());
-		}
-		pageChanged();		
-	}
-	
-	private void handleExistingUnshared() {
-		handleRemoveAll(false);
-		ArrayList result = new ArrayList();
-		for (int i = 0; i < fModels.length; i++) {
-			String id = fModels[i].getPluginBase().getId();
-			IProject project =
-				(IProject) PDEPlugin.getWorkspace().getRoot().findMember(id);
-			if (project != null
-				&& project.isOpen()
-				&& WorkspaceModelManager.isUnsharedPluginProject(project)) {
-				result.add(fModels[i]);
-			}
-		}
-		if (result.size() > 0) {
-			fImportListViewer.add(result.toArray());
-			fAvailableListViewer.remove(result.toArray());
-		}
-		pageChanged();		
-	}
-	
-	private void handleAddRequiredPlugins() {
-		TableItem[] items = fImportListViewer.getTable().getItems();
-		if (items.length == 0)
-			return;
-		if (items.length == 1) {
-			IPluginModelBase model = (IPluginModelBase) items[0].getData();
-			if (model.getPluginBase().getId().equals("org.eclipse.core.boot")) { //$NON-NLS-1$
-				return;
-			}
-		}
-						
-		ArrayList result = new ArrayList();
-		for (int i = 0; i < items.length; i++) {
-			addPluginAndDependencies((IPluginModelBase) items[i].getData(), result, fAddFragmentsButton.getSelection());
-		}
-
-		handleRemoveAll(false);
-		fImportListViewer.add(result.toArray());
-		fAvailableListViewer.remove(result.toArray());
-		pageChanged();		
-	}
-	
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardExpressPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardExpressPage.java
deleted file mode 100644
index dac495b..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardExpressPage.java
+++ /dev/null

@@ -1,296 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.imports;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.core.build.IBuildEntry;
-import org.eclipse.pde.core.build.IBuildModel;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.PluginModelManager;
-import org.eclipse.pde.internal.core.WorkspaceModelManager;
-import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
-import org.eclipse.pde.internal.ui.parts.WizardCheckboxTablePart;
-import org.eclipse.pde.internal.ui.wizards.ListUtil;
-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.PlatformUI;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author Wassim Melhem
- */
-public class PluginImportWizardExpressPage extends BaseImportWizardSecondPage {
-
-	private TablePart tablePart;
-	private IStructuredSelection initialSelection;
-	private Label counterLabel;
-
-	class PluginContentProvider
-		extends DefaultContentProvider
-		implements IStructuredContentProvider {
-		public Object[] getElements(Object parent) {
-			IProject[] projects = PDEPlugin.getWorkspace().getRoot().getProjects();
-			ArrayList result = new ArrayList();
-			PluginModelManager manager = PDECore.getDefault().getModelManager();
-			for (int i = 0; i < projects.length; i++) {
-				if (projects[i].isOpen()
-					&& WorkspaceModelManager.isPluginProject(projects[i])
-					&& !WorkspaceModelManager.isBinaryPluginProject(projects[i])) {
-					IPluginModelBase model = manager.findModel(projects[i]);
-					if (model != null)
-						result.add(model);
-				}
-			}
-			return result.toArray();
-		}
-	}
-	
-	
-	class TablePart extends WizardCheckboxTablePart {
-		public TablePart(String mainLabel, String[] buttonLabels) {
-			super(mainLabel, buttonLabels);
-			setSelectAllIndex(0);
-			setDeselectAllIndex(1);
-		}
-		public void updateCounter(int count) {
-			super.updateCounter(count);
-		}
-		public void buttonSelected(Button button, int index) {
-			if (index == 0 || index == 1)
-				super.buttonSelected(button, index);
-		}
-		protected StructuredViewer createStructuredViewer(
-			Composite parent,
-			int style,
-			FormToolkit toolkit) {
-			StructuredViewer viewer =
-				super.createStructuredViewer(parent, style, toolkit);
-			return viewer;
-		}
-		
-		protected void elementChecked(Object element, boolean checked) {
-			super.elementChecked(element, checked);
-			pageChanged();
-		}
-		
-		protected void handleSelectAll(boolean select) {
-			super.handleSelectAll(select);
-			pageChanged();
-		}		
-	}
-	
-	public PluginImportWizardExpressPage(String pageName, PluginImportWizardFirstPage page, IStructuredSelection selection) {
-		super(pageName, page);
-		this.initialSelection = selection;
-		setTitle(PDEUIMessages.ImportWizard_expressPage_title); 
-		setMessage(PDEUIMessages.ImportWizard_expressPage_desc); 
-	}
-
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.horizontalSpacing = 20;
-		layout.verticalSpacing = 10;
-		container.setLayout(layout);
-		container.setLayoutData(new GridData(GridData.FILL_BOTH));
-		
-		createTablePart(container);
-		createImportPart(container);
-
-		createComputationsOption(container, 2);
-
-		fAddFragmentsButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				pageChanged();
-			}
-		});
-		
-		initialize();
-		setControl(container);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(container, IHelpContextIds.PLUGIN_IMPORT_EXPRESS_PAGE);
-		Dialog.applyDialogFont(container);
-	}
-	
-	private Composite createTablePart(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		container.setLayout(layout);
-		container.setLayoutData(new GridData(GridData.FILL_BOTH));
-		
-		tablePart =
-			new TablePart(
-				PDEUIMessages.ImportWizard_expressPage_nonBinary, 
-				new String[] {
-					PDEUIMessages.WizardCheckboxTablePart_selectAll,
-					PDEUIMessages.WizardCheckboxTablePart_deselectAll});
-		tablePart.createControl(container);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.widthHint = 225;
-		gd.heightHint = 200;
-		tablePart.getControl().setLayoutData(gd);
-		
-		CheckboxTableViewer viewer = tablePart.getTableViewer();
-		viewer.setLabelProvider(PDEPlugin.getDefault().getLabelProvider());
-		viewer.setContentProvider(new PluginContentProvider());
-		viewer.setSorter(ListUtil.PLUGIN_SORTER);
-		viewer.setInput(PDEPlugin.getWorkspace().getRoot());
-		
-		return container;
-	}
-	
-	private void createImportPart(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		container.setLayout(new GridLayout());
-		container.setLayoutData(new GridData(GridData.FILL_BOTH));
-		
-		createImportList(container);
-		counterLabel = new Label(container, SWT.NONE);
-		counterLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));		
-	}
-	
-	private void initialize() {
-		Object[] items = initialSelection.toArray();
-		ArrayList list = new ArrayList();
-		PluginModelManager manager = PDECore.getDefault().getModelManager();
-		
-		for (int i = 0; i < items.length; i++) {
-			Object item = items[i];
-			if (item instanceof IJavaProject) {
-				item = ((IJavaProject)item).getProject();
-			}
-			if (item instanceof IProject) {
-				IProject project = (IProject) item;
-				if (project.isOpen()
-					&& WorkspaceModelManager.isPluginProject(project)
-					&& !WorkspaceModelManager.isBinaryPluginProject(project)) {
-					IPluginModelBase model = manager.findModel(project);
-					if (model != null)
-						list.add(model);
-				}
-			}
-		}
-		tablePart.setSelection(list.toArray());
-	}
-	
-	
-	private void computeModelsToImport() {
-		fImportListViewer.getTable().removeAll();
-		
-		ArrayList result = new ArrayList();
-		Object[] wModels = tablePart.getSelection();
-		for (int i = 0; i < wModels.length; i++) {
-			IPluginModelBase model = (IPluginModelBase)wModels[i];
-			addDependencies(model, result, fAddFragmentsButton.getSelection());
-			addExtraPrerequisites(model, result);
-		}
-		
-		if (wModels.length > 0) {
-			removeSharedModels(result);
-		}
-		
-		fImportListViewer.add(result.toArray());
-	}
-	
-	private void removeSharedModels(ArrayList result) {
-		IPluginModelBase[] smodels = (IPluginModelBase[])result.toArray(new IPluginModelBase[result.size()]);
-		PluginModelManager manager = PDECore.getDefault().getModelManager();
-		for (int i = 0; i < smodels.length; i++) {
-			String id = smodels[i].getPluginBase().getId();
-			IPluginModelBase model = manager.findModel(id);
-			if (model != null) {
-				IResource resource = model.getUnderlyingResource();
-				if (resource != null) {
-					IProject project = resource.getProject();
-					if (!WorkspaceModelManager.isUnsharedPluginProject(project)) {
-						result.remove(smodels[i]);
-					}
-				}
-			}
-		}
-	}
-
-	private void addExtraPrerequisites(IPluginModelBase model, ArrayList result) {
-		try {
-			IBuildModel buildModel = model.getBuildModel();
-			if (buildModel == null) {
-				IFile buildFile = model.getUnderlyingResource().getProject().getFile("build.properties"); //$NON-NLS-1$
-				if (buildFile.exists()) {
-					buildModel = new WorkspaceBuildModel(buildFile);
-					buildModel.load();
-				}
-			}
-			if (buildModel == null)
-				return;
-				
-			IBuildEntry entry = buildModel.getBuild().getEntry(IBuildEntry.JARS_EXTRA_CLASSPATH);
-			if (entry == null)
-				return;
-				
-			String[] tokens = entry.getTokens();
-			for (int i = 0; i < tokens.length; i++) {
-				Path path = new Path(tokens[i]);
-				if (path.segmentCount() >= 2 && path.segment(0).equals("..")) { //$NON-NLS-1$
-					for (int j = 0; j < fModels.length; j++) {
-						if (fModels[j].getPluginBase().getId().equals(path.segment(1))
-							&& !result.contains(fModels[j])) {
-							result.add(fModels[j]);
-						}
-					}
-				}
-			}
-		} catch (CoreException e) {
-		}
-	}
-	
-	protected void refreshPage() {
-		pageChanged();
-	}
-	
-	protected void pageChanged() {
-		computeModelsToImport();
-		updateCount();
-		setPageComplete(fImportListViewer.getTable().getItemCount() > 0);	
-	}
-
-	private void updateCount() {
-		counterLabel.setText(
-			NLS.bind(PDEUIMessages.ImportWizard_expressPage_total, new Integer(fImportListViewer.getTable().getItemCount()).toString()));
-		counterLabel.getParent().layout();
-	}
-
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardFirstPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardFirstPage.java
deleted file mode 100644
index a48b8d9..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardFirstPage.java
+++ /dev/null

@@ -1,453 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 30, 2003
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code Template
- */
-package org.eclipse.pde.internal.ui.wizards.imports;
-
-import java.io.File;
-import java.lang.reflect.InvocationTargetException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.DialogPage;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.preference.IPreferenceNode;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.ExternalModelManager;
-import org.eclipse.pde.internal.core.ICoreConstants;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.PDEState;
-import org.eclipse.pde.internal.core.PluginPathFinder;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.preferences.PDEPreferencesUtil;
-import org.eclipse.pde.internal.ui.preferences.SourceCodeLocationsPreferenceNode;
-import org.eclipse.pde.internal.ui.preferences.TargetEnvironmentPreferenceNode;
-import org.eclipse.pde.internal.ui.preferences.TargetPlatformPreferenceNode;
-import org.eclipse.pde.internal.ui.util.SWTUtil;
-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.DirectoryDialog;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author Wassim Melhem
- */
-public class PluginImportWizardFirstPage extends WizardPage {
-	
-	private static String SETTINGS_IMPORTTYPE = "importType"; //$NON-NLS-1$
-	private static String SETTINGS_DOOTHER = "doother"; //$NON-NLS-1$
-	private static String SETTINGS_DROPLOCATION = "droplocation"; //$NON-NLS-1$
-	private static String SETTINGS_SCAN_ALL = "scanAll"; //$NON-NLS-1$
-	
-	private Button runtimeLocationButton;
-	private Button browseButton;
-	private Label otherLocationLabel;
-	private Combo dropLocation;
-	private Button changeButton;
-	
-	private Button importButton;
-	private Button scanButton;
-
-	private Button binaryButton;
-	private Button binaryWithLinksButton;
-	private Button sourceButton;
-	
-	//private String currentLocation;
-	public static String TARGET_PLATFORM = "targetPlatform"; //$NON-NLS-1$
-	private IPluginModelBase[] models = new IPluginModelBase[0];
-	
-	public PluginImportWizardFirstPage(String name) {
-		super(name);
-		setTitle(PDEUIMessages.ImportWizard_FirstPage_title); 
-		setMessage(PDEUIMessages.ImportWizard_FirstPage_desc); 
-		PDEPlugin.getDefault().getLabelProvider().connect(this);
-	}
-
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.verticalSpacing = 15;
-		container.setLayout(layout);
-		
-		createDirectoryGroup(container);
-		createImportChoicesGroup(container);
-		createImportOptionsGroup(container);
-		
-		Dialog.applyDialogFont(container);
-		initialize();
-		setControl(container);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(container, IHelpContextIds.PLUGIN_IMPORT_FIRST_PAGE);		
-	}
-	
-	private void createImportChoicesGroup(Composite container) {
-		Group importChoices = new Group(container, SWT.NONE);
-		importChoices.setText(PDEUIMessages.ImportWizard_FirstPage_importGroup); 
-		importChoices.setLayout(new GridLayout());
-		importChoices.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-				
-		scanButton = new Button(importChoices, SWT.RADIO);
-		scanButton.setText(PDEUIMessages.ImportWizard_FirstPage_scanAll);		 
-		
-		importButton = new Button(importChoices, SWT.RADIO);
-		importButton.setText(PDEUIMessages.ImportWizard_FirstPage_importPrereqs); 
-		
-	}
-	
-	private void createImportOptionsGroup(Composite container) {
-		Group options = new Group(container, SWT.NONE);
-		options.setText(PDEUIMessages.ImportWizard_FirstPage_importAs); 
-		options.setLayout(new GridLayout());
-		options.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		binaryButton = new Button(options, SWT.RADIO);
-		binaryButton.setText(PDEUIMessages.ImportWizard_FirstPage_binary); 
-		
-		binaryWithLinksButton = new Button(options, SWT.RADIO);
-		binaryWithLinksButton.setText(PDEUIMessages.ImportWizard_FirstPage_binaryLinks); 
-		
-		sourceButton = new Button(options, SWT.RADIO);
-		sourceButton.setText(PDEUIMessages.ImportWizard_FirstPage_source); 
-	}
-	
-	
-	private void initialize() {
-		IDialogSettings settings = getDialogSettings();
-		
-		ArrayList items = new ArrayList();
-		for (int i = 0; i < 6; i++) {
-			String curr = settings.get(SETTINGS_DROPLOCATION + String.valueOf(i));
-			if (curr != null && !items.contains(curr)) {
-				items.add(curr);
-			}
-		}
-		dropLocation.setItems((String[]) items.toArray(new String[items.size()]));
-		
-		if (settings.getBoolean(SETTINGS_DOOTHER)) {
-			runtimeLocationButton.setSelection(false);
-			changeButton.setEnabled(false);
-			dropLocation.setText(items.get(0).toString());		
-		} else {
-			runtimeLocationButton.setSelection(true);
-			otherLocationLabel.setEnabled(false);
-			dropLocation.setEnabled(false);
-			browseButton.setEnabled(false);
-			dropLocation.setText(getTargetHome());
-		}
-
-		
-		int importType = PluginImportOperation.IMPORT_BINARY;
-		try {
-			importType = settings.getInt(SETTINGS_IMPORTTYPE);
-		} catch (NumberFormatException e) {
-		}
-		if (importType == PluginImportOperation.IMPORT_BINARY) {
-			binaryButton.setSelection(true);
-		} else if (importType == PluginImportOperation.IMPORT_BINARY_WITH_LINKS) {
-			binaryWithLinksButton.setSelection(true);
-		} else {
-			sourceButton.setSelection(true);
-		}
-		
-		boolean scan = true;
-		if (settings.get(SETTINGS_SCAN_ALL) != null) {
-			scan = settings.getBoolean(SETTINGS_SCAN_ALL);
-		}
-		scanButton.setSelection(scan);
-		importButton.setSelection(!scan);
-		
-	}
-	
-	private void createDirectoryGroup(Composite parent) {
-		Group composite = new Group(parent, SWT.NONE);
-		composite.setText(PDEUIMessages.ImportWizard_FirstPage_importFrom); 
-
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		runtimeLocationButton = new Button(composite, SWT.CHECK);
-		GridData gd = new GridData();
-		gd.horizontalSpan = 2;
-		runtimeLocationButton.setLayoutData(gd);
-		
-		runtimeLocationButton.setText(PDEUIMessages.ImportWizard_FirstPage_target); 
-		runtimeLocationButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				boolean selected = runtimeLocationButton.getSelection();
-				if (selected) {
-					dropLocation.setText(getTargetHome());
-				}
-				otherLocationLabel.setEnabled(!selected);
-				dropLocation.setEnabled(!selected);
-				browseButton.setEnabled(!selected);
-				changeButton.setEnabled(selected);
-				validateDropLocation();
-			}
-		});
-
-		changeButton = new Button(composite, SWT.PUSH);
-		changeButton.setText(PDEUIMessages.ImportWizard_FirstPage_goToTarget); 
-		changeButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleChangeTargetPlatform();
-			}
-		});
-		changeButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-		SWTUtil.setButtonDimensionHint(changeButton);
-
-		otherLocationLabel = new Label(composite, SWT.NULL);
-		otherLocationLabel.setText(PDEUIMessages.ImportWizard_FirstPage_otherFolder); 
-
-		dropLocation = new Combo(composite, SWT.DROP_DOWN);
-		dropLocation.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		dropLocation.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				validateDropLocation();
-			}
-		});
-
-		browseButton = new Button(composite, SWT.PUSH);
-		browseButton.setText(PDEUIMessages.ImportWizard_FirstPage_browse); 
-		browseButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				IPath chosen = chooseDropLocation();
-				if (chosen != null)
-					dropLocation.setText(chosen.toOSString());
-			}
-		});
-		browseButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-		SWTUtil.setButtonDimensionHint(browseButton);
-
-		Label label = new Label(composite, SWT.NONE);
-		label.setText(PDEUIMessages.ImportWizard_FirstPage_source_label); 
-		gd = new GridData();
-		gd.horizontalSpan = 2;
-		label.setLayoutData(gd);
-		
-		Button sourceLocations = new Button(composite, SWT.PUSH);
-		sourceLocations.setText(PDEUIMessages.ImportWizard_FirstPage_codeLocations); 
-		sourceLocations.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-		sourceLocations.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleSourceLocations();
-			}
-		});
-		SWTUtil.setButtonDimensionHint(sourceLocations);
-		sourceLocations.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-		
-		label = new Label(composite, SWT.WRAP);
-		label.setText(PDEUIMessages.ImportWizard_FirstPage_variables); 
-		gd = new GridData();
-		gd.horizontalSpan = 2;
-		label.setLayoutData(gd);
-
-		Button envButton = new Button(composite, SWT.PUSH);
-		envButton.setText(PDEUIMessages.ImportWizard_FirstPage_env); 
-		envButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END| GridData.FILL_HORIZONTAL));
-		envButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleEnvChange();
-			}
-		});
-		SWTUtil.setButtonDimensionHint(envButton);
-		envButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-		
-	}
-	
-	
-	private IPath chooseDropLocation() {
-		DirectoryDialog dialog = new DirectoryDialog(getShell());
-		dialog.setFilterPath(dropLocation.getText());
-		dialog.setText(PDEUIMessages.ImportWizard_messages_folder_title); 
-		dialog.setMessage(PDEUIMessages.ImportWizard_messages_folder_message); 
-		String res = dialog.open();
-		if (res != null) {
-			return new Path(res);
-		}
-		return null;
-	}
-	
-	private void handleChangeTargetPlatform() {
-		IPreferenceNode targetNode = new TargetPlatformPreferenceNode();
-		if (PDEPreferencesUtil.showPreferencePage(targetNode))
-			dropLocation.setText(ExternalModelManager.getEclipseHome().toOSString());
-	}
-	
-	private void handleSourceLocations() {
-		PDEPreferencesUtil.showPreferencePage(new SourceCodeLocationsPreferenceNode());
-	}
-	
-	private void handleEnvChange() {
-		PDEPreferencesUtil.showPreferencePage(new TargetEnvironmentPreferenceNode());
-	}
-
-	private String getTargetHome() {
-		Preferences preferences = PDECore.getDefault().getPluginPreferences();
-		return preferences.getString(ICoreConstants.PLATFORM_PATH);
-	}
-	
-	public boolean getScanAllPlugins() {
-		return scanButton.getSelection();
-	}
-	
-	public int getImportType() {
-		if (binaryButton.getSelection()) {
-			return PluginImportOperation.IMPORT_BINARY;
-		}
-		
-		if (binaryWithLinksButton.getSelection()) {
-			return PluginImportOperation.IMPORT_BINARY_WITH_LINKS;
-		}
-		
-		return PluginImportOperation.IMPORT_WITH_SOURCE;
-	}
-	
-	public String getDropLocation() {
-		return runtimeLocationButton.getSelection()
-			? TARGET_PLATFORM
-			: dropLocation.getText().trim();
-	}
-	
-	public void storeSettings() {
-		IDialogSettings settings = getDialogSettings();
-		boolean other = !runtimeLocationButton.getSelection();
-		if (dropLocation.getText().length() > 0 && other) {
-			settings.put(
-				SETTINGS_DROPLOCATION + String.valueOf(0),
-				dropLocation.getText().trim());
-			String[] items = dropLocation.getItems();
-			int nEntries = Math.min(items.length, 5);
-			for (int i = 0; i < nEntries; i++) {
-				settings.put(SETTINGS_DROPLOCATION + String.valueOf(i + 1), items[i]);
-			}
-		}
-		settings.put(SETTINGS_DOOTHER, other);
-		settings.put(SETTINGS_IMPORTTYPE, getImportType());
-		settings.put(SETTINGS_SCAN_ALL, getScanAllPlugins());
-	}
-	
-	public void dispose() {
-		PDEPlugin.getDefault().getLabelProvider().disconnect(this);
-	}
-	
-	private void validateDropLocation() {
-		if (!runtimeLocationButton.getSelection()) {
-			IPath curr = new Path(dropLocation.getText());
-			if (curr.segmentCount() == 0 && curr.getDevice() == null) {
-				setErrorMessage(PDEUIMessages.ImportWizard_errors_locationMissing); 
-				setPageComplete(false);
-				return;
-			}
-			if (!Path.ROOT.isValidPath(dropLocation.getText())) {
-				setErrorMessage(PDEUIMessages.ImportWizard_errors_buildFolderInvalid); 
-				setPageComplete(false);
-				return;
-			}
-
-			if (!curr.toFile().isDirectory()) {
-				setErrorMessage(PDEUIMessages.ImportWizard_errors_buildFolderMissing); 
-				setPageComplete(false);
-				return;
-			}
-			if (!curr.equals(new Path(getTargetHome()))) {
-				setErrorMessage(null);
-				setMessage(PDEUIMessages.ImportWizard_FirstPage_warning, DialogPage.WARNING); 
-				setPageComplete(true);
-				return;
-			}
-		}
-		setErrorMessage(null);
-		setPageComplete(true);
-		setMessage(PDEUIMessages.ImportWizard_FirstPage_desc); 
-	}
-	
-	private void resolveTargetPlatform() {
-		IRunnableWithProgress op = new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor) {
-				models = PDECore.getDefault().getModelManager().getExternalModels();
-				monitor.done();
-			}
-		};
-		try {
-			getContainer().run(true, false, op);
-		} catch (InvocationTargetException e) {
-			PDEPlugin.log(e);
-		} catch (InterruptedException e) {
-		}
-	}
-	
-	private void resolveArbitraryLocation(final String location) {
-		IRunnableWithProgress op = new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor) {
-				File[] files = new File[2];
-				files[0] = new File(location);
-				files[1] = new File(location, "plugins"); //$NON-NLS-1$
-				URL[] urls = PluginPathFinder.scanLocations(files);
-				URL[] all = new URL[urls.length + 1];
-				try {
-					all[0] = new URL("file:" + files[0].getAbsolutePath()); //$NON-NLS-1$
-					System.arraycopy(urls, 0, all, 1, urls.length);
-				} catch (MalformedURLException e) {
-					all = urls; 
-				}
-				PDEState state = new PDEState(all, false, monitor);
-				models = state.getModels();
-				monitor.done();
-			}
-		};
-		try {
-			getContainer().run(true, false, op);
-		} catch (InvocationTargetException e) {
-			PDEPlugin.log(e);
-		} catch (InterruptedException e) {
-		}
-	}
-		
-
-	public IPluginModelBase[] getModels() {
-		String dropLocation = getDropLocation();
-		if (dropLocation.equals(TARGET_PLATFORM)) {
-			resolveTargetPlatform();
-		} else {
-			resolveArbitraryLocation(dropLocation);
-		}
-		return models;
-	}
-	
-	public boolean isCurrentPage() {
-		return super.isCurrentPage();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/AbstractFieldData.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/AbstractFieldData.java
deleted file mode 100644
index a0de2e8..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/AbstractFieldData.java
+++ /dev/null

@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.plugin;
-
-import org.eclipse.pde.ui.IFieldData;
-
-public abstract class AbstractFieldData implements IFieldData {
-	
-	private String fId;
-	private String fVersion;
-	private String fName;
-	private String fProvider;
-	private boolean fLegacy;
-	private String fLibraryName;
-	private String fSourceFolderName;
-	private String fOutputFolderName;
-	private boolean fHasBundleStructure;
-	private boolean fSimple;
-	private String fTargetVersion = "3.1"; //$NON-NLS-1$
-	private String fFramework;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.IFieldData2#getId()
-	 */
-	public String getId() {
-		return fId;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.IFieldData2#getVersion()
-	 */
-	public String getVersion() {
-		return fVersion;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.IFieldData2#getName()
-	 */
-	public String getName() {
-		return fName;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.IFieldData2#getProvider()
-	 */
-	public String getProvider() {
-		return fProvider;
-	}
-	
-	public boolean isLegacy() {
-		return fLegacy;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.IFieldData2#getLibraryName()
-	 */
-	public String getLibraryName() {
-		return fLibraryName;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.IFieldData2#getSourceFolderName()
-	 */
-	public String getSourceFolderName() {
-		return fSourceFolderName;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.IFieldData2#getOutputFolderName()
-	 */
-	public String getOutputFolderName() {
-		return fOutputFolderName;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.IFieldData2#hasBundleStructure()
-	 */
-	public boolean hasBundleStructure() {
-		return fHasBundleStructure;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.IFieldData2#isSimple()
-	 */
-	public boolean isSimple() {
-		return fSimple;
-	}
-	
-	public void setId(String id) {
-		fId = id;
-	}
-	
-	public void setName(String name) {
-		fName = name;
-	}
-	
-	public void setProvider(String provider) {
-		fProvider = provider;
-	}
-	
-	public void setVersion(String version) {
-		fVersion = version;
-	}
-	
-	public void setLegacy(boolean isLegacy) {
-		fLegacy = isLegacy;
-	}
-	
-	public void setLibraryName(String name) {
-		fLibraryName = name;
-	}
-	
-	public void setSourceFolderName(String name) {
-		fSourceFolderName = name;
-	}
-	
-	public void setOutputFolderName(String name) {
-		fOutputFolderName = name;
-	}
-	
-	public void setHasBundleStructure(boolean isBundle) {
-		fHasBundleStructure = isBundle;
-	}
-	
-	public void setSimple(boolean simple) {
-		fSimple = simple;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.IFieldData#getTargetVersion()
-	 */
-	public String getTargetVersion() {
-		return fTargetVersion;
-	}
-	
-	public void setTargetVersion(String version) {
-		fTargetVersion = version;
-	}
-	
-	public String getOSGiFramework() {
-		return fFramework;
-	}
-	
-	public void setOSGiFramework(String framework) {
-		fFramework = framework;
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/ClasspathComputer.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/ClasspathComputer.java
deleted file mode 100644
index 8609d46..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/ClasspathComputer.java
+++ /dev/null

@@ -1,253 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.plugin;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IAccessRule;
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaModelStatus;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaConventions;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.osgi.service.resolver.BundleDescription;
-import org.eclipse.pde.core.build.IBuild;
-import org.eclipse.pde.core.build.IBuildEntry;
-import org.eclipse.pde.core.build.IBuildModel;
-import org.eclipse.pde.core.plugin.IPluginLibrary;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.ClasspathUtilCore;
-import org.eclipse.pde.internal.core.JavadocLocationManager;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;
-import org.eclipse.pde.internal.core.util.CoreUtility;
-import org.eclipse.pde.internal.ui.launcher.VMHelper;
-import org.eclipse.team.core.RepositoryProvider;
-
-public class ClasspathComputer {
-	
-	public static void setClasspath(IProject project, IPluginModelBase model) throws CoreException {
-		IClasspathEntry[] entries = getClasspath(project, model, false);
-		JavaCore.create(project).setRawClasspath(entries, null);
-	}
-	
-	public static IClasspathEntry[] getClasspath(IProject project, IPluginModelBase model, boolean clear) throws CoreException {
-
-		ArrayList result = new ArrayList();
-				
-		// add own libraries/source
-		addSourceAndLibraries(project, model, clear, result);
-	
-		// add JRE
-		result.add(createJREEntry(getCompliance(model.getBundleDescription())));
-
-		// add pde container
-		result.add(createContainerEntry());
-
-		IClasspathEntry[] entries = (IClasspathEntry[]) result.toArray(new IClasspathEntry[result.size()]);
-		IJavaProject javaProject = JavaCore.create(project);
-		IJavaModelStatus validation = 
-			JavaConventions.validateClasspath(
-								javaProject, 
-								entries, 
-								javaProject.getOutputLocation());
-		if (!validation.isOK()) {
-			PDECore.logErrorMessage(validation.getMessage());
-			throw new CoreException(validation);
-		}
-		return (IClasspathEntry[])result.toArray(new IClasspathEntry[result.size()]);
-	}
-
-	public static void addSourceAndLibraries(IProject project, IPluginModelBase model, boolean clear, 
-			ArrayList result) throws CoreException {
-		
-		HashSet paths = new HashSet();
-
-		// keep existing source folders
-		if (!clear) {
-			IClasspathEntry[] entries = JavaCore.create(project).getRawClasspath();
-			for (int i = 0; i < entries.length; i++) {
-				IClasspathEntry entry = entries[i];
-				if (entry.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
-					if (paths.add(entry.getPath()))
-						result.add(entry);
-				}
-			}
-		}
-
-		IBuild build = getBuild(project);
-		IClasspathAttribute[] attrs = getClasspathAttributes(project, model);
-		IPluginLibrary[] libraries = model.getPluginBase().getLibraries();
-		for (int i = 0; i < libraries.length; i++) {
-			IBuildEntry buildEntry = build == null ? null : build.getEntry("source." + libraries[i].getName()); //$NON-NLS-1$
-			if (buildEntry != null) {
-				addSourceFolder(buildEntry, project, paths, result);
-			} else {
-				if (libraries[i].getName().equals(".")) //$NON-NLS-1$
-					addJARdPlugin(project, ClasspathUtilCore.getFilename(model), attrs, result);
-				else
-					addLibraryEntry(project, libraries[i], libraries[i].isExported(), attrs, result);
-			}
-		}
-		if (libraries.length == 0) {
-			if (build != null) {
-				IBuildEntry buildEntry = build == null ? null : build.getEntry("source.."); //$NON-NLS-1$
-				if (buildEntry != null) {
-					addSourceFolder(buildEntry, project, paths, result);
-				}
-			} else if (ClasspathUtilCore.isBundle(model)) {
-				addJARdPlugin(project, ClasspathUtilCore.getFilename(model), attrs, result);
-			}
-		}
-	}
-	
-	private static IClasspathAttribute[] getClasspathAttributes(IProject project, IPluginModelBase model) {
-		IClasspathAttribute[] attributes = new IClasspathAttribute[0];
-		if (!RepositoryProvider.isShared(project)) {			
-			JavadocLocationManager manager = PDECore.getDefault().getJavadocLocationManager();
-			String javadoc = manager.getJavadocLocation(model);
-			if (javadoc != null) {
-				attributes = new IClasspathAttribute[] 
-				   {JavaCore.newClasspathAttribute(IClasspathAttribute.JAVADOC_LOCATION_ATTRIBUTE_NAME, javadoc)};
-			}
-		}
-		return attributes;
-	}
-	
-	private static void addSourceFolder(IBuildEntry buildEntry, IProject project, HashSet paths, ArrayList result) throws CoreException {
-		String[] folders = buildEntry.getTokens();
-		for (int j = 0; j < folders.length; j++) {
-			String folder = folders[j];
-			IPath path = project.getFullPath().append(folder);
-			if (paths.add(path)) {
-				if (project.findMember(folder) == null) 
-					CoreUtility.createFolder(project.getFolder(folder));							
-				result.add(JavaCore.newSourceEntry(path));
-			} 
-		}	
-	}
-	
-	protected static IBuild getBuild(IProject project) throws CoreException {
-		IFile buildFile = project.getFile("build.properties"); //$NON-NLS-1$
-		IBuildModel buildModel = null;
-		if (buildFile.exists()) {
-			buildModel = new WorkspaceBuildModel(buildFile);
-			buildModel.load();
-		}
-		return (buildModel != null) ? buildModel.getBuild() : null;
-	}
-	
-	private static void addLibraryEntry(IProject project, IPluginLibrary library, boolean exported, IClasspathAttribute[] attrs, ArrayList result) {
-		String name = ClasspathUtilCore.expandLibraryName(library.getName());
-		IResource jarFile = project.findMember(name);
-		if (jarFile != null) {
-			IResource resource = project.findMember(getSourceZipName(name));
-			if (resource == null)
-				resource = project.findMember(new Path(getSourceZipName(name)).lastSegment());
-			IPath srcAttachment = resource != null ? resource.getFullPath() : null;
-			IClasspathEntry entry = JavaCore.newLibraryEntry(jarFile.getFullPath(), srcAttachment, null, new IAccessRule[0], attrs, exported);
-			if (!result.contains(entry))
-				result.add(entry);
-		}
-	}
-
-	private static void addJARdPlugin(IProject project, String filename, IClasspathAttribute[] attrs, ArrayList result) {		
-		String name = ClasspathUtilCore.expandLibraryName(filename);
-		IResource jarFile = project.findMember(name);
-		if (jarFile != null) {
-			IResource resource = project.findMember(getSourceZipName(name));
-			IPath srcAttachment = resource != null ? resource.getFullPath() : jarFile.getFullPath();
-			IClasspathEntry entry =
-				JavaCore.newLibraryEntry(jarFile.getFullPath(), srcAttachment, null, new IAccessRule[0], attrs, true);
-			if (!result.contains(entry))
-				result.add(entry);
-		}
-	}
-
-	public static String getSourceZipName(String libraryName) {
-		int dot = libraryName.lastIndexOf('.');
-		return (dot != -1) ? libraryName.substring(0, dot) + "src.zip" : libraryName;	 //$NON-NLS-1$
-	}
-	
-	public static void setComplianceOptions(Map map, String compliance) {
-		if (JavaCore.VERSION_1_5.equals(compliance)) {
-			map.put(JavaCore.COMPILER_COMPLIANCE, JavaCore.VERSION_1_5);
-			map.put(JavaCore.COMPILER_SOURCE, JavaCore.VERSION_1_5);
-			map.put(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, JavaCore.VERSION_1_5);
-			map.put(JavaCore.COMPILER_PB_ASSERT_IDENTIFIER, JavaCore.ERROR);
-			map.put(JavaCore.COMPILER_PB_ENUM_IDENTIFIER, JavaCore.ERROR);
-		} else if (JavaCore.VERSION_1_4.equals(compliance)) {
-			map.put(JavaCore.COMPILER_COMPLIANCE, JavaCore.VERSION_1_4);
-			map.put(JavaCore.COMPILER_SOURCE, JavaCore.VERSION_1_3);
-			map.put(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, JavaCore.VERSION_1_2);
-			map.put(JavaCore.COMPILER_PB_ASSERT_IDENTIFIER, JavaCore.WARNING);
-			map.put(JavaCore.COMPILER_PB_ENUM_IDENTIFIER, JavaCore.WARNING);
-		} else if (JavaCore.VERSION_1_3.equals(compliance)) {
-			map.put(JavaCore.COMPILER_COMPLIANCE, JavaCore.VERSION_1_3);
-			map.put(JavaCore.COMPILER_SOURCE, JavaCore.VERSION_1_3);
-			map.put(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, JavaCore.VERSION_1_1);
-			map.put(JavaCore.COMPILER_PB_ASSERT_IDENTIFIER, JavaCore.IGNORE);
-			map.put(JavaCore.COMPILER_PB_ENUM_IDENTIFIER, JavaCore.IGNORE);
-		} else {
-			throw new IllegalArgumentException("Unsupported compliance: " + compliance); //$NON-NLS-1$
-		}
-	}
-	
-	public static String getCompliance(BundleDescription desc) {
-		if (desc == null)
-			return null;
-		
-		String[] env = desc.getExecutionEnvironments();
-		if (env.length == 0)
-			return null;
-		
-		double compliance = Double.MAX_VALUE;
-		for (int i = 0; i < env.length; i++) {
-			compliance = Math.min(getComplianceLevel(env[i]), compliance);
-		}
-		return Double.toString(compliance);
-	}
-	
-	private static double getComplianceLevel(String env) {
-		if ("J2SE-1.5".equals(env)) //$NON-NLS-1$
-			return Double.parseDouble(JavaCore.VERSION_1_5);
-		if ("J2SE-1.4".equals(env)) //$NON-NLS-1$
-			return Double.parseDouble(JavaCore.VERSION_1_4);
-		return Double.parseDouble(JavaCore.VERSION_1_3);
-	}
-	
-	public static IClasspathEntry createJREEntry(String compliance) {
-		IPath path = new Path(JavaRuntime.JRE_CONTAINER);		
-		if (compliance != null && !VMHelper.hasMatchingCompliance(JavaRuntime.getDefaultVMInstall(), compliance)) {
-			IVMInstall inst = VMHelper.findMatchingJREInstall(compliance);
-			if (inst != null) {
-				path = path.append(inst.getVMInstallType().getId()).append(inst.getName());
-			}
-		}
-		return JavaCore.newContainerEntry(path);
-	}
-	
-	public static IClasspathEntry createContainerEntry() {
-		return JavaCore.newContainerEntry(new Path(PDECore.CLASSPATH_CONTAINER_ID));
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/ContentPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/ContentPage.java
deleted file mode 100644
index 9548bc0..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/ContentPage.java
+++ /dev/null

@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.wizards.plugin;
-
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.pde.internal.core.util.IdUtil;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.wizards.*;
-import org.eclipse.pde.ui.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-public abstract class ContentPage extends WizardPage {
-
-	protected boolean fInitialized = false;
-	protected Text fIdText;
-	protected Text fVersionText;
-	protected Text fNameText;
-	protected Text fProviderText;
-	protected Label fLibraryLabel;
-	protected Text fLibraryText;
-
-	protected NewProjectCreationPage fMainPage;
-	protected AbstractFieldData fData;
-	protected IProjectProvider fProjectProvider;
-
-	protected final static int PROPERTIES_GROUP = 1;
-	
-	protected int fChangedGroups = 0;
-	
-	protected ModifyListener propertiesListener = new ModifyListener() {
-		public void modifyText(ModifyEvent e) {
-			if (fInitialized)
-				fChangedGroups |= PROPERTIES_GROUP;
-			validatePage();
-		}
-	};
-	public ContentPage(String pageName, IProjectProvider provider,
-			NewProjectCreationPage page, AbstractFieldData data) {
-		super(pageName);
-		fMainPage = page;
-		fProjectProvider = provider;
-		fData = data;
-	}
-
-	protected Text createText(Composite parent, ModifyListener listener) {
-		Text text = new Text(parent, SWT.BORDER | SWT.SINGLE);
-		text.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		text.addModifyListener(listener);
-		return text;
-	}
-	
-	protected abstract void validatePage();
-
-	protected String validateProperties() {
-		if (!fInitialized) {
-			if (!fIdText.getText().trim().equals(fProjectProvider.getProjectName())) 
-				setMessage(PDEUIMessages.ContentPage_illegalCharactersInID, INFORMATION);
-			else
-				setMessage(null);
-			return null;
-		}
-		
-		setMessage(null);
-		String errorMessage = validateId();
-		if (errorMessage != null)
-			return errorMessage;
-		
-		if (fVersionText.getText().trim().length() == 0) {
-			errorMessage = PDEUIMessages.ContentPage_noversion; 
-		} else if (!isVersionValid(fVersionText.getText().trim())) {
-			errorMessage = PDEUIMessages.ContentPage_badversion; 
-		} else if (fNameText.getText().trim().length() == 0) {
-			errorMessage = PDEUIMessages.ContentPage_noname; 
-		}
-		
-		return errorMessage;
-	}
-
-	private String validateId() {
-		String id = fIdText.getText().trim();
-		if (id.length() == 0)
-			return PDEUIMessages.ContentPage_noid; 
-
-		if (!IdUtil.isValidPluginId(id)) {
-			return PDEUIMessages.ContentPage_invalidId; 
-		}
-		return null;
-	}
-
-	protected boolean isVersionValid(String version) {
-		try {
-			new PluginVersionIdentifier(version);
-		} catch (Exception e) {
-			return false;
-		}
-		return true;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.WizardPage#getNextPage()
-	 */
-	public IWizardPage getNextPage() {
-		updateData();
-		return super.getNextPage();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.dialogs.IDialogPage#setVisible(boolean)
-	 */
-	public void setVisible(boolean visible) {
-		if (visible) {		
-			// update the library field/label enabled state
-			fLibraryLabel.setEnabled(!fData.isSimple());
-			fLibraryText.setEnabled(!fData.isSimple());
-
-			String id = computeId();
-			// properties group
-			if ((fChangedGroups & PROPERTIES_GROUP) == 0) {
-				int oldfChanged = fChangedGroups;				
-				fIdText.setText(id);
-				fVersionText.setText("1.0.0"); //$NON-NLS-1$
-				presetNameField(id);
-				presetProviderField(id);
-				presetLibraryField(id);
-				fChangedGroups = oldfChanged;
-			}
-			if (fInitialized)
-				validatePage();
-			else
-				fInitialized = true;
-		} 
-		super.setVisible(visible);
-	}
-	
-	protected String computeId() {
-		return fProjectProvider.getProjectName().replaceAll("[^a-zA-Z0-9\\._]", "_"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	private void presetLibraryField(String id){
-		double version = Double.parseDouble(fData.getTargetVersion());
-		if (version >= 3.1) {
-			fLibraryText.setText(""); //$NON-NLS-1$
-			return;
-		}
-		
-		StringTokenizer tok = new StringTokenizer(id, "."); //$NON-NLS-1$
-		while (tok.hasMoreTokens()) {
-			String token = tok.nextToken();
-			if (!tok.hasMoreTokens())
-				fLibraryText.setText(token + ".jar"); //$NON-NLS-1$
-		}
-	}
-	private void presetNameField(String id) {
-		StringTokenizer tok = new StringTokenizer(id, "."); //$NON-NLS-1$
-		while (tok.hasMoreTokens()) {
-			String token = tok.nextToken();
-			if (!tok.hasMoreTokens()) {
-				fNameText.setText(Character.toUpperCase(token.charAt(0))
-								+ ((token.length() > 1) ? token.substring(1) : "") //$NON-NLS-1$
-								+ " " + getNameFieldQualifier()); //$NON-NLS-1$
-			}
-		}
-	}
-	
-	protected abstract String getNameFieldQualifier();
-
-	private void presetProviderField(String id) {
-		StringTokenizer tok = new StringTokenizer(id, "."); //$NON-NLS-1$
-		int count = tok.countTokens();
-		if (count > 2 && tok.nextToken().equals("com")) //$NON-NLS-1$
-			fProviderText.setText(tok.nextToken().toUpperCase());
-	}
-
-	public void updateData() {
-		fData.setId(fIdText.getText().trim());
-		fData.setVersion(fVersionText.getText().trim());
-		fData.setName(fNameText.getText().trim());
-		fData.setProvider(fProviderText.getText().trim());
-		if (!fData.isSimple()) {
-			String library = fLibraryText.getText().trim();
-			if (library.length() > 0) {			
-				if (!library.endsWith(".jar") &&!library.endsWith("/") && !library.equals(".")) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					library += "/"; //$NON-NLS-1$
-				fData.setLibraryName(library);
-			} else {
-				fData.setLibraryName(null);
-			}
-		}
-	}
-
-	public IFieldData getData() {
-		return fData;
-	}
-
-	public String getId() {
-		return fIdText.getText().trim();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/FragmentContentPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/FragmentContentPage.java
deleted file mode 100644
index c43ec7d..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/FragmentContentPage.java
+++ /dev/null

@@ -1,222 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.wizards.plugin;
-
-import org.eclipse.core.runtime.PluginVersionIdentifier;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.pde.core.plugin.IPlugin;
-import org.eclipse.pde.core.plugin.IPluginModel;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.util.SWTUtil;
-import org.eclipse.pde.internal.ui.wizards.IProjectProvider;
-import org.eclipse.pde.internal.ui.wizards.PluginSelectionDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-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.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-
-public class FragmentContentPage extends ContentPage {
-
-	private Text fPluginIdText;
-	private Text fPluginVersion;
-	private Combo fMatchCombo;
-
-	protected ModifyListener listener = new ModifyListener() {
-		public void modifyText(ModifyEvent e) {
-			validatePage();
-		}
-	};
-	
-	public FragmentContentPage(String pageName, IProjectProvider provider,
-			NewProjectCreationPage page, AbstractFieldData data) {
-		super(pageName, provider, page, data);
-		setTitle(PDEUIMessages.ContentPage_ftitle); 
-		setDescription(PDEUIMessages.ContentPage_fdesc); 
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.plugin.ContentPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.verticalSpacing = 15;
-		container.setLayout(layout);
-		
-		createFragmentPropertiesGroup(container);
-		createParentPluginGroup(container);
-
-		Dialog.applyDialogFont(container);
-		setControl(container);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IHelpContextIds.NEW_FRAGMENT_REQUIRED_DATA);
-	}
-
-	public void createFragmentPropertiesGroup(Composite container) {
-		Group propertiesGroup = new Group(container, SWT.NONE);
-		propertiesGroup.setLayout(new GridLayout(2, false));
-		propertiesGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		propertiesGroup.setText(PDEUIMessages.ContentPage_fGroup); 
-
-		Label label = new Label(propertiesGroup, SWT.NONE);
-		label.setText(PDEUIMessages.ContentPage_fid); 
-		fIdText = createText(propertiesGroup, propertiesListener);
-
-		label = new Label(propertiesGroup, SWT.NONE);
-		label.setText(PDEUIMessages.ContentPage_fversion); 
-		fVersionText = createText(propertiesGroup, propertiesListener);
-
-		label = new Label(propertiesGroup, SWT.NONE);
-		label.setText(PDEUIMessages.ContentPage_fname); 
-		fNameText = createText(propertiesGroup, propertiesListener);
-
-		label = new Label(propertiesGroup, SWT.NONE);
-		label.setText(PDEUIMessages.ContentPage_fprovider); 
-		fProviderText = createText(propertiesGroup, propertiesListener);
-
-		fLibraryLabel = new Label(propertiesGroup, SWT.NONE);
-		fLibraryLabel.setText(PDEUIMessages.ProjectStructurePage_library); 
-		fLibraryText = createText(propertiesGroup, propertiesListener);
-	}
-
-	private void createParentPluginGroup(Composite container) {
-		Group parentGroup = new Group(container, SWT.NONE);
-		parentGroup.setLayout(new GridLayout(2, false));
-		parentGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		parentGroup.setText(PDEUIMessages.ContentPage_parentPluginGroup); 
-
-		Label label = new Label(parentGroup, SWT.NONE);
-		label.setText(PDEUIMessages.FragmentContentPage_pid); 
-		createPluginIdContainer(parentGroup);
-		
-		label = new Label(parentGroup, SWT.NONE);
-		label.setText(PDEUIMessages.FragmentContentPage_pversion); 
-		fPluginVersion = createText(parentGroup, listener);
-		
-		label = new Label(parentGroup, SWT.NONE);
-		label.setText(PDEUIMessages.ContentPage_matchRule); 
-		
-		fMatchCombo = new Combo(parentGroup, SWT.READ_ONLY | SWT.BORDER);
-		fMatchCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fMatchCombo.setItems(new String[]{"", //$NON-NLS-1$
-				PDEUIMessages.ManifestEditor_MatchSection_equivalent,
-				PDEUIMessages.ManifestEditor_MatchSection_compatible,
-				PDEUIMessages.ManifestEditor_MatchSection_perfect,
-				PDEUIMessages.ManifestEditor_MatchSection_greater});
-		fMatchCombo.setText(fMatchCombo.getItem(0));
-	}
-
-	private void createPluginIdContainer(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout(2, false);
-		layout.marginHeight = layout.marginWidth = 0;
-		container.setLayout(layout);
-		container.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		fPluginIdText = createText(container, listener);
-
-		Button browse = new Button(container, SWT.PUSH);
-		browse.setText(PDEUIMessages.ContentPage_browse); 
-		browse.setLayoutData(new GridData());
-		browse.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				BusyIndicator.showWhile(fPluginIdText.getDisplay(), new Runnable() {
-					public void run() {
-						PluginSelectionDialog dialog = new PluginSelectionDialog(
-								fPluginIdText.getShell(), false, false);
-						dialog.create();
-						if (dialog.open() == PluginSelectionDialog.OK) {
-							IPluginModel model = (IPluginModel) dialog.getFirstResult();
-							IPlugin plugin = model.getPlugin();
-							fPluginIdText.setText(plugin.getId());
-							fPluginVersion
-											.setText(computeInitialPluginVersion(plugin
-													.getVersion()));
-						}
-					}
-				});
-			}
-		});
-		SWTUtil.setButtonDimensionHint(browse);
-	}
-	
-	private String computeInitialPluginVersion(String pluginVersion) {
-		if (pluginVersion != null
-				&& PluginVersionIdentifier.validateVersion(pluginVersion)
-						.isOK()) {
-			PluginVersionIdentifier pvi = new PluginVersionIdentifier(
-					pluginVersion);
-			if ("qualifier".equals(pvi.getQualifierComponent())) { //$NON-NLS-1$
-				return pvi.getMajorComponent() + "." + pvi.getMinorComponent() //$NON-NLS-1$
-						+ "." + pvi.getServiceComponent(); //$NON-NLS-1$
-			}
-		}
-		return pluginVersion;
-	}
-
-	public void updateData() {
-		super.updateData();
-		((FragmentFieldData) fData).setPluginId(fPluginIdText.getText().trim());
-		((FragmentFieldData) fData).setPluginVersion(fPluginVersion.getText().trim());
-		((FragmentFieldData) fData).setMatch(fMatchCombo.getSelectionIndex());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.plugin.ContentPage#validatePage()
-	 */
-	protected void validatePage() {
-		String errorMessage = validateProperties();
-		if (errorMessage == null) {
-			String pluginID = fPluginIdText.getText().trim();
-			if (pluginID.length() == 0) {
-				errorMessage = PDEUIMessages.ContentPage_nopid; 
-			} else if (PDECore.getDefault().getModelManager().findEntry(pluginID) == null) {
-				errorMessage = PDEUIMessages.ContentPage_pluginNotFound; 
-			} else if (fPluginVersion.getText().trim().length() == 0) {
-				errorMessage = PDEUIMessages.ContentPage_nopversion; 
-			} else if (!isVersionValid(fPluginVersion.getText().trim())) {
-				errorMessage = PDEUIMessages.ContentPage_badpversion; 
-			}
-		}
-		if (fInitialized)
-			setErrorMessage(errorMessage);
-		setPageComplete(errorMessage == null);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.plugin.ContentPage#getNameFieldQualifier()
-	 */
-	protected String getNameFieldQualifier() {
-		return PDEUIMessages.ContentPage_fragment; 
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.plugin.ContentPage#setVisible(boolean)
-	 */
-	public void setVisible(boolean visible) {
-		if (visible)
-			fMainPage.updateData();
-		super.setVisible(visible);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/FragmentFieldData.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/FragmentFieldData.java
deleted file mode 100644
index eb84998..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/FragmentFieldData.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.plugin;
-
-import org.eclipse.pde.ui.*;
-
-public class FragmentFieldData extends AbstractFieldData implements IFragmentFieldData {
-
-	private String fPluginId;
-	private String fPluginVersion;
-	private int fMatch;
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.IFragmentFieldData#getPluginId()
-	 */
-	public String getPluginId() {
-		return fPluginId;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.IFragmentFieldData#getPluginVersion()
-	 */
-	public String getPluginVersion() {
-		return fPluginVersion;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.IFragmentFieldData#getMatch()
-	 */
-	public int getMatch() {
-		return fMatch;
-	}
-	
-	public void setPluginId(String id) {
-		fPluginId = id;
-	}
-	
-	public void setPluginVersion(String version) {
-		fPluginVersion = version;
-	}
-	
-	public void setMatch(int match) {
-		fMatch = match;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/LibraryPluginFieldData.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/LibraryPluginFieldData.java
deleted file mode 100644
index a01ab72..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/LibraryPluginFieldData.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.plugin;
-
-public class LibraryPluginFieldData extends PluginFieldData {
-	private String[] fLibraryPaths;
-
-	private boolean fUnzipLibraries = false;
-
-	public String[] getLibraryPaths() {
-		return fLibraryPaths;
-	}
-
-	public void setLibraryPaths(String[] libraryPaths) {
-		fLibraryPaths = libraryPaths;
-	}
-
-	public boolean isUnzipLibraries() {
-		return fUnzipLibraries;
-	}
-
-	public void setUnzipLibraries(boolean jarred) {
-		fUnzipLibraries = jarred;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/LibraryPluginJarsPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/LibraryPluginJarsPage.java
deleted file mode 100644
index d88e986..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/LibraryPluginJarsPage.java
+++ /dev/null

@@ -1,273 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.plugin;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.elements.DefaultTableProvider;
-import org.eclipse.pde.internal.ui.util.FileExtensionFilter;
-import org.eclipse.pde.internal.ui.util.FileValidator;
-import org.eclipse.pde.internal.ui.util.SWTUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-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.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-public class LibraryPluginJarsPage extends WizardPage {
-
-	protected LibraryPluginFieldData fData;
-
-	/**
-	 * List of IFile and File of workspace and external Jars.
-	 */
-	protected ArrayList fJarPaths = new ArrayList();
-
-	protected Button fRemove;
-
-	protected TableViewer fTableViewer;
-
-	public LibraryPluginJarsPage(String pageName, LibraryPluginFieldData data) {
-		super(pageName);
-		fData = data;
-		setTitle(PDEUIMessages.LibraryPluginJarsPage_title); 
-		setDescription(PDEUIMessages.LibraryPluginJarsPage_desc); 
-	}
-
-	private void chooseFile() {
-		FileDialog dialog = new FileDialog(getShell(), SWT.OPEN | SWT.MULTI);
-		dialog.setFilterExtensions(new String[] { "*.jar" }); //$NON-NLS-1$
-		String res = dialog.open();
-		if (res != null) {
-			String path = new File(res).getParent();
-			String[] fileNames = dialog.getFileNames();
-			for (int i = 0; i < fileNames.length; i++) {
-				File newJarFile = new File(path, fileNames[i]);
-				removeJar(fileNames[i]);
-				fJarPaths.add(newJarFile);
-				fTableViewer.add(newJarFile);
-			}
-			fRemove.setEnabled(fJarPaths.size() > 0);
-			setPageComplete(fJarPaths.size() > 0);
-		}
-	}
-
-	private void chooseWorkspaceFile() {
-		ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(
-				getShell(), new WorkbenchLabelProvider(),
-				new WorkbenchContentProvider());
-
-		dialog.setValidator(new FileValidator());
-		dialog.setAllowMultiple(true);
-		dialog
-				.setTitle(PDEUIMessages.LibraryPluginJarsPage_SelectionDialog_title); 
-		dialog
-				.setMessage(PDEUIMessages.LibraryPluginJarsPage_SelectionDialog_message); 
-		dialog.addFilter(new FileExtensionFilter("jar")); //$NON-NLS-1$
-		dialog.setInput(PDEPlugin.getWorkspace().getRoot());
-
-		if (dialog.open() == Window.OK) {
-			Object[] files = dialog.getResult();
-			for (int i = 0; i < files.length; i++) {
-				IFile newJarFile = (IFile) files[i];
-				removeJar(newJarFile.getName());
-				fJarPaths.add(newJarFile);
-				fTableViewer.add(newJarFile);
-			}
-			fRemove.setEnabled(fJarPaths.size() > 0);
-			setPageComplete(fJarPaths.size() > 0);
-		}
-	}
-
-	public void createControl(Composite parent) {
-		Composite control = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		// layout.verticalSpacing = 10;
-		control.setLayout(layout);
-
-		Label l = new Label(control, SWT.WRAP);
-		l.setText(PDEUIMessages.LibraryPluginJarsPage_label); 
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = 2;
-		l.setLayoutData(data);
-		fTableViewer = new TableViewer(control, SWT.MULTI | SWT.BORDER);
-		fTableViewer.setContentProvider(new DefaultTableProvider() {
-			public Object[] getElements(Object inputElement) {
-				return fJarPaths.toArray();
-			}
-		});
-		fTableViewer.setLabelProvider(new LabelProvider() {
-			public String getText(Object obj) {
-				String name;
-				String location;
-				if (obj instanceof IFile) {
-					IFile jarFile = (IFile) obj;
-					name = jarFile.getName();
-					location = jarFile.getParent().getFullPath().toString()
-							.substring(1);
-				} else {
-					File jarFile = (File) obj;
-					name = jarFile.getName();
-					location = jarFile.getParent();
-				}
-				return name + " - " + location; //$NON-NLS-1$
-
-			}
-
-			public Image getImage(Object obj) {
-				if (obj instanceof IFile) {
-					return PDEPlugin.getDefault().getLabelProvider().get(
-							PDEPluginImages.DESC_JAR_OBJ);
-				}
-				return PDEPlugin.getDefault().getLabelProvider().get(
-						PDEPluginImages.DESC_JAR_LIB_OBJ);
-			}
-		});
-		// should not sort, bug 98401
-		//fTableViewer.setSorter(new ViewerSorter()); 
-		data = new GridData(GridData.FILL_BOTH);
-		fTableViewer.getControl().setLayoutData(data);
-		fTableViewer.setInput(fJarPaths);
-		fTableViewer.getTable().addKeyListener(new KeyAdapter() {
-			public void keyPressed(KeyEvent event) {
-				if (event.character == SWT.DEL && event.stateMask == 0) {
-					handleRemove();
-				}
-			}
-		});
-
-		Composite buttons = new Composite(control, SWT.NONE);
-		layout = new GridLayout();
-		layout.verticalSpacing = 5;
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		buttons.setLayout(layout);
-		data = new GridData(GridData.FILL_VERTICAL);
-		data.grabExcessVerticalSpace = true;
-		buttons.setLayoutData(data);
-
-		Button browseWorkspace = new Button(buttons, SWT.PUSH);
-		browseWorkspace.setText(PDEUIMessages.LibraryPluginJarsPage_add); 
-		browseWorkspace.setLayoutData(new GridData(
-				GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL));
-		SWTUtil.setButtonDimensionHint(browseWorkspace);
-		browseWorkspace.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				chooseWorkspaceFile(); 
-			}
-		});
-
-		Button browseFile = new Button(buttons, SWT.PUSH);
-		browseFile.setText(PDEUIMessages.LibraryPluginJarsPage_addExternal); 
-		browseFile.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		SWTUtil.setButtonDimensionHint(browseFile);
-		browseFile.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				chooseFile(); 
-			}
-		});
-
-		fRemove = new Button(buttons, SWT.PUSH);
-		fRemove.setText(PDEUIMessages.LibraryPluginJarsPage_remove); 
-		fRemove.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		SWTUtil.setButtonDimensionHint(fRemove);
-		fRemove.setEnabled(fJarPaths.size() > 0);
-		setPageComplete(fJarPaths.size() > 0);
-		fRemove.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleRemove();
-			}
-		});
-
-		Dialog.applyDialogFont(control);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(control,
-				IHelpContextIds.NEW_LIBRARY_PROJECT_JAR_PAGE);
-		setControl(control);
-		
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(control, IHelpContextIds.LIBRARY_PLUGIN_JARS);
-	}
-
-	private void handleRemove() {
-		IStructuredSelection selection = (IStructuredSelection) fTableViewer
-				.getSelection();
-		if (!selection.isEmpty()) {
-			for (Iterator it = selection.iterator(); it.hasNext();) {
-				Object file = it.next();
-				fJarPaths.remove(file);
-				fTableViewer.remove(file);
-			}
-			fRemove.setEnabled(fJarPaths.size() > 0);
-			setPageComplete(fJarPaths.size() > 0);
-		}
-	}
-
-	public boolean isPageComplete() {
-		return fJarPaths.size() > 0;
-	}
-
-	private void removeJar(String fileName) {
-		for (int i = 0; i < fJarPaths.size(); i++) {
-			String name;
-			if (fJarPaths.get(i) instanceof IFile) {
-				IFile jarFile = (IFile) fJarPaths.get(i);
-				name = jarFile.getName();
-			} else {
-				File jarFile = (File) fJarPaths.get(i);
-				name = jarFile.getName();
-			}
-			if (name.equals(fileName)) {
-				Object jarPath = fJarPaths.get(i);
-				fJarPaths.remove(jarPath);
-				fTableViewer.remove(jarPath);
-			}
-		}
-	}
-
-	public void updateData() {
-		String[] jarPaths = new String[fJarPaths.size()];
-		for (int i = 0; i < fJarPaths.size(); i++) {
-			if (fJarPaths.get(i) instanceof IFile) {
-				IFile jarFile = (IFile) fJarPaths.get(i);
-				jarPaths[i] = jarFile.getLocation().toString();
-			} else {
-				File jarFile = (File) fJarPaths.get(i);
-				jarPaths[i] = jarFile.toString();
-
-			}
-		}
-		fData.setLibraryPaths(jarPaths);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewFragmentProjectWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewFragmentProjectWizard.java
deleted file mode 100644
index 8a8023a..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewFragmentProjectWizard.java
+++ /dev/null

@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.plugin;
-
-import java.lang.reflect.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.wizards.*;
-import org.eclipse.ui.wizards.newresource.*;
-
-public class NewFragmentProjectWizard extends NewWizard implements IExecutableExtension {
-
-	private NewProjectCreationPage fMainPage;
-	private ContentPage fContentPage;
-	private FragmentFieldData fFragmentData;
-	private IProjectProvider fProjectProvider;
-	private IConfigurationElement fConfig;
-	
-	public NewFragmentProjectWizard() {
-		setDefaultPageImageDescriptor(PDEPluginImages.DESC_NEWFRAGPRJ_WIZ);
-		setWindowTitle(PDEUIMessages.NewFragmentProjectWizard_title); 
-		setNeedsProgressMonitor(true);
-		PDEPlugin.getDefault().getLabelProvider().connect(this);
-		fFragmentData = new FragmentFieldData();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.Wizard#addPages()
-	 */
-	public void addPages() {
-		fMainPage = new NewProjectCreationPage("main", fFragmentData, true); //$NON-NLS-1$
-		fMainPage.setTitle(PDEUIMessages.NewProjectWizard_MainPage_ftitle); 
-		fMainPage.setDescription(PDEUIMessages.NewProjectWizard_MainPage_fdesc); 
-		addPage(fMainPage);
-		
-		fProjectProvider = new IProjectProvider() {
-			public String getProjectName() {
-				return fMainPage.getProjectName();
-			}
-			public IProject getProject() {
-				return fMainPage.getProjectHandle();
-			}
-			public IPath getLocationPath() {
-				return fMainPage.getLocationPath();
-			}
-		};
-		fContentPage = new FragmentContentPage("page2", fProjectProvider,  fMainPage, fFragmentData); //$NON-NLS-1$
-		addPage(fContentPage);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.Wizard#canFinish()
-	 */
-	public boolean canFinish() {
-		IWizardPage page = getContainer().getCurrentPage();
-		return (page.isPageComplete() && page!=fMainPage);
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.wizards.NewWizard#performFinish()
-	 */
-	public boolean performFinish() {
-		try {
-			fMainPage.updateData();
-			fContentPage.updateData();
-			BasicNewProjectResourceWizard.updatePerspective(fConfig);
-			getContainer().run(false, true,
-					new NewProjectCreationOperation(fFragmentData, fProjectProvider, null));
-			return true;
-		} catch (InvocationTargetException e) {
-			PDEPlugin.logException(e);
-		} catch (InterruptedException e) {
-		}
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.Wizard#dispose()
-	 */
-	public void dispose() {
-		super.dispose();
-		PDEPlugin.getDefault().getLabelProvider().disconnect(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)
-	 */
-	public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {
-		fConfig = config;
-	}
-	
-	public String getFragmentId() {
-		return fFragmentData.getId();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginCreationOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginCreationOperation.java
deleted file mode 100644
index 7b0c7ab..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginCreationOperation.java
+++ /dev/null

@@ -1,325 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.plugin;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-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.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.core.build.IBuildEntry;
-import org.eclipse.pde.core.build.IBuildModelFactory;
-import org.eclipse.pde.core.plugin.IPluginLibrary;
-import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;
-import org.eclipse.pde.internal.core.plugin.PluginBase;
-import org.eclipse.pde.internal.core.plugin.WorkspacePluginModelBase;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.model.bundle.Bundle;
-import org.eclipse.pde.internal.ui.model.bundle.BundleModel;
-import org.eclipse.pde.internal.ui.model.bundle.ExportPackageHeader;
-import org.eclipse.pde.internal.ui.model.bundle.ExportPackageObject;
-import org.eclipse.pde.internal.ui.wizards.IProjectProvider;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.IPluginContentWizard;
-import org.eclipse.text.edits.ReplaceEdit;
-import org.eclipse.text.edits.TextEdit;
-import org.eclipse.ui.dialogs.IOverwriteQuery;
-import org.eclipse.ui.wizards.datatransfer.ImportOperation;
-import org.eclipse.ui.wizards.datatransfer.ZipFileStructureProvider;
-import org.osgi.framework.Constants;
-
-public class NewLibraryPluginCreationOperation extends
-		NewProjectCreationOperation {
-
-	private LibraryPluginFieldData fData;
-
-	public NewLibraryPluginCreationOperation(LibraryPluginFieldData data,
-			IProjectProvider provider, IPluginContentWizard contentWizard) {
-		super(data, provider, contentWizard);
-		fData = data;
-	}
-
-	private void addJar(File jarFile, IProject project, IProgressMonitor monitor)
-			throws CoreException {
-		String jarName = jarFile.getName();
-		IFile file = project.getFile(jarName);
-		monitor.subTask(NLS.bind(
-				PDEUIMessages.NewProjectCreationOperation_copyingJar, jarName)); 
-		InputStream in = null;
-		try {
-			in = new FileInputStream(jarFile);
-			file.create(in, true, monitor);
-		} catch (FileNotFoundException fnfe) {
-		} finally {
-			if (in != null) {
-				try {
-					in.close();
-				} catch (IOException ioe) {
-				}
-			}
-		}
-	}
-
-	private void adjustExportRoot(IProgressMonitor monitor, IProject project)
-			throws CoreException {
-		IResource[] resources = project.members(false);
-		for (int j = 0; j < resources.length; j++) {
-			if (resources[j] instanceof IFile) {
-				if (".project".equals(resources[j].getName()) //$NON-NLS-1$
-						|| ".classpath".equals(resources[j] //$NON-NLS-1$
-								.getName()) || "plugin.xml".equals(resources[j] //$NON-NLS-1$
-								.getName())
-						|| "build.properties".equals(resources[j] //$NON-NLS-1$
-								.getName())) {
-					continue;
-				}
-				// resource at the root, export root
-				return;
-			}
-		}
-		removeExportRoot(project.getFile("META-INF/MANIFEST.MF"), monitor); //$NON-NLS-1$
-	}
-
-	protected void adjustManifests(IProgressMonitor monitor, IProject project)
-			throws CoreException {
-		super.adjustManifests(monitor, project);
-		if (fData.hasBundleStructure() && fData.isUnzipLibraries()) {
-			adjustExportRoot(monitor, project);
-		}
-	}
-
-	protected void createContents(IProgressMonitor monitor, IProject project)
-			throws CoreException, JavaModelException,
-			InvocationTargetException, InterruptedException {
-		// copy jars
-		String[] paths = fData.getLibraryPaths();
-		for (int i = paths.length - 1; i >= 0; i--) {
-			File jarFile = new File(paths[i]);
-			if (fData.isUnzipLibraries()) {
-				importJar(jarFile, project, monitor);
-			} else {
-				addJar(jarFile, project, monitor);
-			}
-			monitor.worked(1);
-		}
-		if (!fData.hasBundleStructure()) {
-			// delete manifest.mf imported from libraries
-			IFile importedManifest = project.getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$
-			if (importedManifest.exists()) {
-				importedManifest.delete(true, false, monitor);
-				if (!fData.hasBundleStructure()) {
-					IFolder meta_inf = project.getFolder("META-INF"); //$NON-NLS-1$
-					if (meta_inf.members().length == 0) {
-						meta_inf.delete(true, false, monitor);
-					}
-				}
-			}
-		}
-	}
-
-	protected void fillBinIncludes(IProject project, IBuildEntry binEntry)
-			throws CoreException {
-		if (fData.hasBundleStructure())
-			binEntry.addToken("META-INF/"); //$NON-NLS-1$
-		else
-			binEntry.addToken("plugin.xml"); //$NON-NLS-1$
-
-		if (fData.isUnzipLibraries()) {
-			IResource[] resources = project.members(false);
-			for (int j = 0; j < resources.length; j++) {
-				if (resources[j] instanceof IFolder) {
-					if (!binEntry.contains(resources[j].getName() + "/")) //$NON-NLS-1$
-						binEntry.addToken(resources[j].getName() + "/"); //$NON-NLS-1$
-				} else {
-					if (".project".equals(resources[j].getName()) //$NON-NLS-1$
-							|| ".classpath".equals(resources[j] //$NON-NLS-1$
-									.getName())
-							|| "build.properties".equals(resources[j] //$NON-NLS-1$
-									.getName())) {
-						continue;
-					}
-					if (!binEntry.contains(resources[j].getName()))
-						binEntry.addToken(resources[j].getName());
-				}
-			}
-		} else {
-			String[] libraryPaths = fData.getLibraryPaths();
-			for (int j = 0; j < libraryPaths.length; j++) {
-				File jarFile = new File(libraryPaths[j]);
-				String name = jarFile.getName();
-				if (!binEntry.contains(name))
-					binEntry.addToken(name);
-			}
-		}
-	}
-
-	protected IClasspathEntry[] getInternalClassPathEntries(IProject project,
-			IFieldData data) {
-		String[] libraryPaths;
-		if (fData.isUnzipLibraries()) {
-			libraryPaths = new String[] { "" }; //$NON-NLS-1$
-		} else {
-			libraryPaths = fData.getLibraryPaths();
-		}
-		IClasspathEntry[] entries = new IClasspathEntry[libraryPaths.length];
-		for (int j = 0; j < libraryPaths.length; j++) {
-			File jarFile = new File(libraryPaths[j]);
-			String jarName = jarFile.getName();
-			IPath path = project.getFullPath().append(jarName);
-			entries[j] = JavaCore.newLibraryEntry(path, null, null, true);
-		}
-		return entries;
-	}
-
-	protected int getNumberOfWorkUnits() {
-		int numUnits = super.getNumberOfWorkUnits();
-		numUnits += fData.getLibraryPaths().length;
-		return numUnits;
-	}
-
-	private void importJar(File jar, IResource destination,
-			IProgressMonitor monitor) throws CoreException,
-			InvocationTargetException, InterruptedException {
-		ZipFile input = null;
-		try {
-			try {
-				input = new ZipFile(jar);
-				ZipFileStructureProvider provider = new ZipFileStructureProvider(
-						input);
-				ImportOperation op = new ImportOperation(destination
-						.getFullPath(), provider.getRoot(), provider,
-						new IOverwriteQuery() {
-							public String queryOverwrite(String pathString) {
-								return IOverwriteQuery.ALL;
-							}
-						});
-				op.run(monitor);
-			} finally {
-				if (input != null)
-					input.close();
-			}
-		} catch (IOException e) {
-			throw new CoreException(
-					new Status(
-							IStatus.ERROR,
-							PDEPlugin.PLUGIN_ID,
-							IStatus.OK,
-							NLS
-									.bind(
-											PDEUIMessages.NewProjectCreationOperation_errorImportingJar,
-											jar), e));
-		}
-	}
-
-	private void removeExportRoot(IFile file, IProgressMonitor monitor)
-			throws CoreException {
-		if (!file.exists())
-			return;
-		ITextFileBufferManager manager = FileBuffers.getTextFileBufferManager();
-		try {
-			manager.connect(file.getFullPath(), monitor);
-			ITextFileBuffer buffer = manager.getTextFileBuffer(file
-					.getFullPath());
-
-			IDocument document = buffer.getDocument();
-			BundleModel model = new BundleModel(document, false);
-			model.load();
-			TextEdit edit = removeRootExportPackage(model);
-			if (edit != null) {
-				try {
-					edit.apply(document);
-				} catch (BadLocationException e) {
-					PDEPlugin.logException(e);
-				}
-				buffer.commit(monitor, true);
-			}
-		} finally {
-			manager.disconnect(file.getFullPath(), monitor);
-		}
-
-	}
-
-	private TextEdit removeRootExportPackage(BundleModel model) {
-		Bundle bundle = (Bundle) model.getBundle();
-		ExportPackageHeader header = (ExportPackageHeader) bundle
-				.getManifestHeader(Constants.EXPORT_PACKAGE);
-		ExportPackageObject[] packages = header.getPackages();
-		for (int i = 0; i < packages.length; i++) {
-			if (".".equals(packages[i].getName())) { //$NON-NLS-1$
-				header.removePackage(packages[i]);
-				return new ReplaceEdit(header.getOffset(), header.getLength(),
-						header.write()); 
-			}
-		}
-		return null;
-	}
-
-	protected void setPluginLibraries(WorkspacePluginModelBase model)
-			throws CoreException {
-		PluginBase pluginBase = (PluginBase) model.getPluginBase();
-		if (fData.isUnzipLibraries()) {
-			IPluginLibrary library = model.getPluginFactory().createLibrary();
-			library.setName("."); //$NON-NLS-1$
-			library.setExported(true);
-			pluginBase.add(library);
-
-		} else {
-			String[] paths = fData.getLibraryPaths();
-			for (int i = 0; i < paths.length; i++) {
-				File jarFile = new File(paths[i]);
-				IPluginLibrary library = model.getPluginFactory()
-						.createLibrary();
-				library.setName(jarFile.getName());
-				library.setExported(true);
-				pluginBase.add(library);
-			}
-		}
-	}
-
-	protected void createSourceOutputBuildEntries(WorkspaceBuildModel model,
-			IBuildModelFactory factory) throws CoreException {
-		if (fData.isUnzipLibraries()) {
-			// SOURCE.<LIBRARY_NAME>
-			IBuildEntry entry = factory.createEntry(IBuildEntry.JAR_PREFIX
-					+ "."); //$NON-NLS-1$
-			entry.addToken("."); //$NON-NLS-1$
-			model.getBuild().add(entry);
-
-			// OUTPUT.<LIBRARY_NAME>
-			entry = factory.createEntry(IBuildEntry.OUTPUT_PREFIX + "."); //$NON-NLS-1$
-			entry.addToken("."); //$NON-NLS-1$
-			model.getBuild().add(entry);
-		}
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginCreationPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginCreationPage.java
deleted file mode 100644
index bdc5d4d..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginCreationPage.java
+++ /dev/null

@@ -1,314 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.plugin;
-
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.PluginVersionIdentifier;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.pde.internal.core.ICoreConstants;
-import org.eclipse.pde.internal.core.TargetPlatform;
-import org.eclipse.pde.internal.core.util.IdUtil;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.wizards.IProjectProvider;
-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.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
-
-public class NewLibraryPluginCreationPage extends WizardNewProjectCreationPage {
-
-	class PropertiesListener implements ModifyListener {
-		private boolean fBlocked = false;
-
-		private boolean fChanged = false;
-
-		public boolean isChanged() {
-			return fChanged;
-		}
-
-		public void modifyText(ModifyEvent e) {
-			if (!fBlocked) {
-				fChanged = true;
-				validatePage();
-			}
-		}
-
-		public void setBlocked(boolean blocked) {
-			this.fBlocked = blocked;
-		}
-	}
-
-	private LibraryPluginFieldData fData;
-	protected NewLibraryPluginCreationPage fMainPage;
-	protected IProjectProvider fProjectProvider;
-	protected PropertiesListener fPropertiesListener = new PropertiesListener();
-	protected Text fIdText;
-	protected Text fNameText;
-	protected Text fProviderText;
-	protected Text fVersionText;
-	private Button fEclipseButton;
-	private Button fOSGIButton;
-	private Combo fOSGiCombo;
-	private Combo fTargetCombo;
-	protected Button fJarredCheck;
-
-	public NewLibraryPluginCreationPage(String pageName, LibraryPluginFieldData data) {
-		super(pageName);
-		fData = data;
-		setTitle(PDEUIMessages.NewLibraryPluginCreationPage_title); 
-		setDescription(PDEUIMessages.NewLibraryPluginCreationPage_desc); 
-	}
-
-	protected String computeId() {
-		return getProjectName().replaceAll("[^a-zA-Z0-9\\._]", "_"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public void createControl(Composite parent) {
-		super.createControl(parent);
-		Composite control = (Composite) getControl();
-		GridLayout layout = new GridLayout();
-		layout.verticalSpacing = 10;
-		control.setLayout(layout);
-
-		createPluginPropertiesGroup(control);
-
-		createFormatGroup(control);
-		
-		updateRuntimeDependency();
-
-		Dialog.applyDialogFont(control);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(control,
-				IHelpContextIds.NEW_LIBRARY_PROJECT_STRUCTURE_PAGE);
-		setControl(control);
-	}
-
-	private void createFormatGroup(Composite container) {
-		Group group = new Group(container, SWT.NONE);
-		group.setText(PDEUIMessages.NewProjectCreationPage_target);
-		group.setLayout(new GridLayout(2, false));
-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		Label label = new Label(group, SWT.NONE);
-		label.setText(PDEUIMessages.NewProjectCreationPage_ptarget);			
-		GridData gd = new GridData();
-		gd.horizontalSpan = 2;
-		label.setLayoutData(gd);
-		    
-		fEclipseButton = createButton(group, SWT.RADIO, 1, 30);
-    	fEclipseButton.setText(PDEUIMessages.NewProjectCreationPage_pDependsOnRuntime);	    
-	    fEclipseButton.setSelection(fData.getOSGiFramework() == null);
-	    fEclipseButton.addSelectionListener(new SelectionAdapter(){
-			public void widgetSelected(SelectionEvent e) {
-				updateRuntimeDependency();
-			}
-		});
-		
-		fTargetCombo = new Combo(group, SWT.READ_ONLY|SWT.SINGLE);
-		fTargetCombo.setItems(new String[] {ICoreConstants.TARGET32, ICoreConstants.TARGET31, ICoreConstants.TARGET30, ICoreConstants.TARGET21});
-		fTargetCombo.setText(TargetPlatform.getTargetVersionString());
-		
-	    fOSGIButton = createButton(group, SWT.RADIO, 1, 30);
-    	fOSGIButton.setText(PDEUIMessages.NewProjectCreationPage_pPureOSGi); 	   
-	    fOSGIButton.setSelection(fData.getOSGiFramework() != null);
-	    
-		fOSGiCombo = new Combo(group, SWT.READ_ONLY|SWT.SINGLE);
-		fOSGiCombo.setItems(new String[] {ICoreConstants.EQUINOX, PDEUIMessages.NewProjectCreationPage_standard}); 
-		fOSGiCombo.setText(ICoreConstants.EQUINOX);	
-		
-		fJarredCheck = new Button(group, SWT.CHECK);
-		fJarredCheck.setText(PDEUIMessages.NewLibraryPluginCreationPage_jarred); 
-		gd = new GridData();
-		gd.horizontalSpan = 2;
-		fJarredCheck.setLayoutData(gd);
-		updateBundleCheck();
-	}
-	
-	private void createPluginPropertiesGroup(Composite container) {
-		Group propertiesGroup = new Group(container, SWT.NONE);
-		propertiesGroup.setLayout(new GridLayout(2, false));
-		propertiesGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		propertiesGroup.setText(PDEUIMessages.NewLibraryPluginCreationPage_pGroup); 
-
-		Label label = new Label(propertiesGroup, SWT.NONE);
-		label.setText(PDEUIMessages.NewLibraryPluginCreationPage_pid); 
-		fIdText = createText(propertiesGroup, fPropertiesListener);
-
-		label = new Label(propertiesGroup, SWT.NONE);
-		label.setText(PDEUIMessages.NewLibraryPluginCreationPage_pversion); 
-		fVersionText = createText(propertiesGroup, fPropertiesListener);
-		fPropertiesListener.setBlocked(true);
-		fVersionText.setText("1.0.0"); //$NON-NLS-1$
-		fPropertiesListener.setBlocked(false);
-
-		label = new Label(propertiesGroup, SWT.NONE);
-		label.setText(PDEUIMessages.NewLibraryPluginCreationPage_pname); 
-		fNameText = createText(propertiesGroup, fPropertiesListener);
-
-		label = new Label(propertiesGroup, SWT.NONE);
-		label.setText(PDEUIMessages.NewLibraryPluginCreationPage_pprovider); 
-		fProviderText = createText(propertiesGroup, fPropertiesListener);
-
-	}
-
-	protected Text createText(Composite parent, ModifyListener listener) {
-		Text text = new Text(parent, SWT.BORDER | SWT.SINGLE);
-		text.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		text.addModifyListener(listener);
-		return text;
-	}
-
-	protected String getNameFieldQualifier() {
-		return PDEUIMessages.NewLibraryPluginCreationPage_plugin; 
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.wizard.WizardPage#getNextPage()
-	 */
-	public IWizardPage getNextPage() {
-		updateData();
-		return super.getNextPage();
-	}
-
-	protected boolean isVersionValid(String version) {
-		try {
-			new PluginVersionIdentifier(version);
-		} catch (Exception e) {
-			return false;
-		}
-		return true;
-	}
-
-	private void presetNameField(String id) {
-		StringTokenizer tok = new StringTokenizer(id, "."); //$NON-NLS-1$
-		if (!tok.hasMoreTokens()) {
-			fNameText.setText(""); //$NON-NLS-1$
-			return;
-		}
-		while (tok.hasMoreTokens()) {
-			String token = tok.nextToken();
-			if (!tok.hasMoreTokens()) {
-				fNameText.setText(Character.toUpperCase(token.charAt(0))
-						+ ((token.length() > 1) ? token.substring(1) : "") //$NON-NLS-1$
-						+ " " + getNameFieldQualifier()); //$NON-NLS-1$
-			}
-		}
-	}
-
-	private void updateBundleCheck() {
-		boolean legacy = fTargetCombo.getText().equals(ICoreConstants.TARGET21);
-		fJarredCheck.setEnabled(!legacy);
-		double target = Double.parseDouble(fTargetCombo.getText());
-		fJarredCheck.setSelection(target >= 3.1);
-	}
-
-	public void updateData() {
-		fData.setSimple(false);
-		fData.setSourceFolderName(null);
-		fData.setOutputFolderName(null);
-		fData.setLegacy(fTargetCombo.getText().equals(ICoreConstants.TARGET21));
-		fData.setTargetVersion(fTargetCombo.getText());
-
-		fData.setId(fIdText.getText().trim());
-		fData.setVersion(fVersionText.getText().trim());
-		fData.setName(fNameText.getText().trim());
-		fData.setProvider(fProviderText.getText().trim());
-		fData.setLibraryName(null);
-		fData.setHasBundleStructure(fOSGIButton.getSelection() || Double.parseDouble(fTargetCombo.getText()) >= 3.1);	
-		fData.setOSGiFramework(fOSGIButton.getSelection() ? fOSGiCombo.getText() : null);
-		fData.setUnzipLibraries(fJarredCheck.isEnabled()
-				&& fJarredCheck.getSelection());
-		
-		PluginFieldData data = fData;
-		data.setClassname(null);
-		data.setUIPlugin(false);
-		data.setDoGenerateClass(false);
-		data.setRCPApplicationPlugin(false);
-	}
-
-	private String validateId() {
-		String id = fIdText.getText().trim();
-		if (id.length() == 0)
-			return PDEUIMessages.NewLibraryPluginCreationPage_noid; 
-
-		if (!IdUtil.isValidPluginId(id)) { 
-			return PDEUIMessages.NewLibraryPluginCreationPage_invalidId; 
-		}
-		return null;
-	}
-
-	protected boolean validatePage() {
-		String id = computeId();
-		// properties group
-		if (!fPropertiesListener.isChanged() && fIdText != null) {
-			fPropertiesListener.setBlocked(true);
-			fIdText.setText(id);
-			presetNameField(id);
-			fPropertiesListener.setBlocked(false);
-		}
-
-		if (!super.validatePage())
-			return false;
-		setMessage(null);
-		String errorMessage = validateProperties();
-		setErrorMessage(errorMessage);
-		return errorMessage == null;
-	}
-
-	protected String validateProperties() {
-		String errorMessage = validateId();
-		if (errorMessage != null)
-			return errorMessage;
-
-		if (fVersionText.getText().trim().length() == 0) {
-			errorMessage = PDEUIMessages.NewLibraryPluginCreationPage_noversion; 
-		} else if (!isVersionValid(fVersionText.getText().trim())) {
-			errorMessage = PDEUIMessages.ContentPage_badversion; 
-		} else if (fNameText.getText().trim().length() == 0) {
-			errorMessage = PDEUIMessages.NewLibraryPluginCreationPage_noname; 
-		}
-
-		if (errorMessage != null)
-			return errorMessage;
-
-		return errorMessage;
-	}
-	
-	private void updateRuntimeDependency() {
-		boolean depends = fEclipseButton.getSelection();
-		fTargetCombo.setEnabled(depends);
-		fOSGiCombo.setEnabled(!depends);
-	}
-	
-	private Button createButton(Composite container, int style, int span, int indent) {
-		Button button = new Button(container, style);
-		GridData gd = new GridData();
-		gd.horizontalSpan = span;
-		gd.horizontalIndent = indent;
-		button.setLayoutData(gd);
-		return button;		
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginProjectWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginProjectWizard.java
deleted file mode 100644
index 7c81853..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginProjectWizard.java
+++ /dev/null

@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.plugin;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IProject;
-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.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.wizards.IProjectProvider;
-import org.eclipse.pde.internal.ui.wizards.NewWizard;
-import org.eclipse.pde.internal.ui.wizards.WizardElement;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
-
-public class NewLibraryPluginProjectWizard extends NewWizard implements
-		IExecutableExtension {
-	public static final String DEF_PROJECT_NAME = "project_name"; //$NON-NLS-1$
-
-	public static final String DEF_TEMPLATE_ID = "template-id"; //$NON-NLS-1$
-
-	public static final String PLUGIN_POINT = "pluginContent"; //$NON-NLS-1$
-
-	public static final String TAG_WIZARD = "wizard"; //$NON-NLS-1$
-
-	private IConfigurationElement fConfig;
-
-	private LibraryPluginJarsPage fJarsPage;
-
-	private NewLibraryPluginCreationPage fMainPage;
-
-	private LibraryPluginFieldData fPluginData;
-
-	private IProjectProvider fProjectProvider;
-
-	public NewLibraryPluginProjectWizard() {
-		setDefaultPageImageDescriptor(PDEPluginImages.DESC_JAR_TO_PLUGIN_WIZ);
-		setDialogSettings(PDEPlugin.getDefault().getDialogSettings());
-		setWindowTitle(PDEUIMessages.NewLibraryPluginProjectWizard_title); 
-		setNeedsProgressMonitor(true);
-		PDEPlugin.getDefault().getLabelProvider().connect(this);
-		fPluginData = new LibraryPluginFieldData();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.wizard.Wizard#addPages()
-	 */
-	public void addPages() {
-		fJarsPage = new LibraryPluginJarsPage("jars", fPluginData); //$NON-NLS-1$ 
-		addPage(fJarsPage);
-		fMainPage = new NewLibraryPluginCreationPage("main", fPluginData); //$NON-NLS-1$
-		String pname = getDefaultValue(DEF_PROJECT_NAME);
-		if (pname != null)
-			fMainPage.setInitialProjectName(pname);
-
-		fProjectProvider = new IProjectProvider() {
-			public IPath getLocationPath() {
-				return fMainPage.getLocationPath();
-			}
-
-			public IProject getProject() {
-				return fMainPage.getProjectHandle();
-			}
-
-			public String getProjectName() {
-				return fMainPage.getProjectName();
-			}
-		};
-
-		addPage(fMainPage);
-	}
-
-	protected WizardElement createWizardElement(IConfigurationElement config) {
-		String name = config.getAttribute(WizardElement.ATT_NAME);
-		String id = config.getAttribute(WizardElement.ATT_ID);
-		String className = config.getAttribute(WizardElement.ATT_CLASS);
-		if (name == null || id == null || className == null)
-			return null;
-		WizardElement element = new WizardElement(config);
-		String imageName = config.getAttribute(WizardElement.ATT_ICON);
-		if (imageName != null) {
-			String pluginID = config.getNamespace();
-			Image image = PDEPlugin.getDefault().getLabelProvider()
-					.getImageFromPlugin(pluginID, imageName);
-			element.setImage(image);
-		}
-		return element;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.wizard.Wizard#dispose()
-	 */
-	public void dispose() {
-		super.dispose();
-		PDEPlugin.getDefault().getLabelProvider().disconnect(this);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.wizards.NewWizard#performFinish()
-	 */
-	public boolean performFinish() {
-		try {
-			fJarsPage.updateData();
-			fMainPage.updateData();
-			BasicNewProjectResourceWizard.updatePerspective(fConfig);
-			getContainer().run(
-					false,
-					true,
-					new NewLibraryPluginCreationOperation(fPluginData,
-							fProjectProvider, null));
-			return true;
-		} catch (InvocationTargetException e) {
-			PDEPlugin.logException(e);
-		} catch (InterruptedException e) {
-		}
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement,
-	 *      java.lang.String, java.lang.Object)
-	 */
-	public void setInitializationData(IConfigurationElement config,
-			String propertyName, Object data) throws CoreException {
-		fConfig = config;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewPluginProjectWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewPluginProjectWizard.java
deleted file mode 100644
index f2c37a5..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewPluginProjectWizard.java
+++ /dev/null

@@ -1,177 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.plugin;
-
-
-import java.lang.reflect.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.elements.*;
-import org.eclipse.pde.internal.ui.wizards.*;
-import org.eclipse.pde.ui.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.ui.wizards.newresource.*;
-
-public class NewPluginProjectWizard extends NewWizard implements IExecutableExtension {
-	public static final String PLUGIN_POINT = "pluginContent"; //$NON-NLS-1$
-	public static final String TAG_WIZARD = "wizard"; //$NON-NLS-1$
-	public static final String DEF_PROJECT_NAME = "project_name"; //$NON-NLS-1$
-	public static final String DEF_TEMPLATE_ID = "template-id"; //$NON-NLS-1$
-
-	private IConfigurationElement fConfig;
-	private PluginFieldData fPluginData;
-	private IProjectProvider fProjectProvider;
-	private NewProjectCreationPage fMainPage;
-	private ContentPage fContentPage;
-	private TemplateListSelectionPage fWizardListPage;
-	private boolean fPureOSGi;
-
-	public NewPluginProjectWizard() {
-		setDefaultPageImageDescriptor(PDEPluginImages.DESC_NEWPPRJ_WIZ);
-		setDialogSettings(PDEPlugin.getDefault().getDialogSettings());
-		setWindowTitle(PDEUIMessages.NewProjectWizard_title); 
-		setNeedsProgressMonitor(true);
-		PDEPlugin.getDefault().getLabelProvider().connect(this);
-		fPluginData = new PluginFieldData();
-	}
-	
-	public NewPluginProjectWizard(String osgiFramework) {
-		this();
-		fPluginData.setOSGiFramework(osgiFramework);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.Wizard#addPages()
-	 */
-	public void addPages() {
-		fMainPage = new NewProjectCreationPage("main", fPluginData, fPureOSGi); //$NON-NLS-1$
-		fMainPage.setTitle(PDEUIMessages.NewProjectWizard_MainPage_title); 
-		fMainPage.setDescription(PDEUIMessages.NewProjectWizard_MainPage_desc); 
-		String pname = getDefaultValue(DEF_PROJECT_NAME);
-		if (pname!=null)
-			fMainPage.setInitialProjectName(pname);
-		addPage(fMainPage);
-		
-		fProjectProvider = new IProjectProvider() {
-			public String getProjectName() {
-				return fMainPage.getProjectName();
-			}
-			public IProject getProject() {
-				return fMainPage.getProjectHandle();
-			}
-			public IPath getLocationPath() {
-				return fMainPage.getLocationPath();
-			}
-		};
-		
-		fContentPage = new PluginContentPage("page2", fProjectProvider, fMainPage, fPluginData); //$NON-NLS-1$
-        
-		fWizardListPage = new TemplateListSelectionPage(getAvailableCodegenWizards(), fContentPage, PDEUIMessages.WizardListSelectionPage_templates); 
-		String tid = getDefaultValue(DEF_TEMPLATE_ID);
-		if (tid!=null)
-			fWizardListPage.setInitialTemplateId(tid);
-
-		addPage(fContentPage);
-		addPage(fWizardListPage);
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.Wizard#canFinish()
-	 */
-	public boolean canFinish() {
-		IWizardPage page = getContainer().getCurrentPage();
-		return super.canFinish() && page != fMainPage;
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.wizards.NewWizard#performFinish()
-	 */
-	public boolean performFinish() {
-		try {
-			fMainPage.updateData();
-			fContentPage.updateData();
-			BasicNewProjectResourceWizard.updatePerspective(fConfig);
-			IPluginContentWizard contentWizard = fWizardListPage.getSelectedWizard();
-			getContainer().run(false, true,
-					new NewProjectCreationOperation(fPluginData, fProjectProvider, contentWizard));
-			return true;
-		} catch (InvocationTargetException e) {
-			PDEPlugin.logException(e);
-		} catch (InterruptedException e) {
-		}
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.Wizard#dispose()
-	 */
-	public void dispose() {
-		super.dispose();
-		PDEPlugin.getDefault().getLabelProvider().disconnect(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)
-	 */
-	public void setInitializationData(IConfigurationElement config,
-			String propertyName, Object data) throws CoreException {
-		fConfig = config;
-	}
-	
-	protected WizardElement createWizardElement(IConfigurationElement config) {
-		String name = config.getAttribute(WizardElement.ATT_NAME);
-		String id = config.getAttribute(WizardElement.ATT_ID);
-		String className = config.getAttribute(WizardElement.ATT_CLASS);
-		if (name == null || id == null || className == null)
-			return null;
-		WizardElement element = new WizardElement(config);
-		String imageName = config.getAttribute(WizardElement.ATT_ICON);
-		if (imageName != null) {
-			String pluginID = config.getNamespace();
-			Image image =
-				PDEPlugin.getDefault().getLabelProvider().getImageFromPlugin(pluginID, imageName);
-			element.setImage(image);
-		}
-		return element;
-	}
-
-	public ElementList getAvailableCodegenWizards() {
-		ElementList wizards = new ElementList("CodegenWizards"); //$NON-NLS-1$
-		IExtensionRegistry registry = Platform.getExtensionRegistry();
-		IExtensionPoint point = registry.getExtensionPoint(PDEPlugin.getPluginId(), PLUGIN_POINT);
-		if (point == null)
-			return wizards;
-		IExtension[] extensions = point.getExtensions();
-		for (int i = 0; i < extensions.length; i++) {
-			IConfigurationElement[] elements =
-				extensions[i].getConfigurationElements();
-			for (int j = 0; j < elements.length; j++) {
-				if (elements[j].getName().equals(TAG_WIZARD)) {
-					WizardElement element = createWizardElement(elements[j]);
-					if (element != null) {
-						wizards.add(element);
-					}
-				}
-			}
-		}
-		return wizards;
-	}
-	
-	public String getPluginId() {
-		return fPluginData.getId();
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationOperation.java
deleted file mode 100644
index 87bf460..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationOperation.java
+++ /dev/null

@@ -1,477 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.plugin;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Set;
-import java.util.TreeSet;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ProjectScope;
-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.core.runtime.SubProgressMonitor;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.pde.core.build.IBuildEntry;
-import org.eclipse.pde.core.build.IBuildModelFactory;
-import org.eclipse.pde.core.plugin.IFragment;
-import org.eclipse.pde.core.plugin.IPlugin;
-import org.eclipse.pde.core.plugin.IPluginBase;
-import org.eclipse.pde.core.plugin.IPluginImport;
-import org.eclipse.pde.core.plugin.IPluginLibrary;
-import org.eclipse.pde.core.plugin.IPluginReference;
-import org.eclipse.pde.internal.PDE;
-import org.eclipse.pde.internal.core.ICoreConstants;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.PDEPluginConverter;
-import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;
-import org.eclipse.pde.internal.core.plugin.PluginBase;
-import org.eclipse.pde.internal.core.plugin.WorkspaceFragmentModel;
-import org.eclipse.pde.internal.core.plugin.WorkspacePluginModel;
-import org.eclipse.pde.internal.core.plugin.WorkspacePluginModelBase;
-import org.eclipse.pde.internal.core.util.CoreUtility;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.wizards.IProjectProvider;
-import org.eclipse.pde.ui.IBundleContentWizard;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.IFragmentFieldData;
-import org.eclipse.pde.ui.IPluginContentWizard;
-import org.eclipse.pde.ui.IPluginFieldData;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.part.ISetSelectionTarget;
-import org.osgi.service.prefs.BackingStoreException;
-
-public class NewProjectCreationOperation extends WorkspaceModifyOperation {
-	private IPluginContentWizard fContentWizard;
-
-	private IFieldData fData;
-
-	private PluginClassCodeGenerator fGenerator;
-
-	private WorkspacePluginModelBase fModel;
-
-	private IProjectProvider fProjectProvider;
-
-	private boolean fResult;
-
-	public NewProjectCreationOperation(IFieldData data,
-			IProjectProvider provider, IPluginContentWizard contentWizard) {
-		fData = data;
-		fProjectProvider = provider;
-		fContentWizard = contentWizard;
-	}
-
-	protected void adjustManifests(IProgressMonitor monitor, IProject project)
-			throws CoreException {
-		String framework = fData instanceof AbstractFieldData 
-								? ((AbstractFieldData)fData).getOSGiFramework()
-								: null;
-
-		if (framework != null) {
-			PDEPluginConverter.createBundleForFramework(project, 
-								getImportPackagesSet(), 
-								new SubProgressMonitor(monitor, 1));
-		} else {
-			PDEPluginConverter.convertToOSGIFormat(project,
-					((AbstractFieldData) fData).getTargetVersion(), null,
-					new SubProgressMonitor(monitor, 1));
-		}
-		if (fModel.getPluginBase().getExtensions().length == 0) {
-			project.getFile(fData instanceof IPluginFieldData ? "plugin.xml" : "fragment.xml").delete(true, null); //$NON-NLS-1$ //$NON-NLS-2$
-		} else {
-			trimModel(fModel.getPluginBase());
-			fModel.save();
-		}
-	}
-	
-	private void createBuildPropertiesFile(IProject project)
-			throws CoreException {
-		IFile file = project.getFile("build.properties"); //$NON-NLS-1$
-		if (!file.exists()) {
-			WorkspaceBuildModel model = new WorkspaceBuildModel(file);
-			IBuildModelFactory factory = model.getFactory();
-
-			// BIN.INCLUDES
-			IBuildEntry binEntry = factory.createEntry(IBuildEntry.BIN_INCLUDES);
-			fillBinIncludes(project, binEntry);
-			createSourceOutputBuildEntries(model, factory);
-			model.getBuild().add(binEntry);
-			model.save();
-		}
-	}
-
-	protected void createSourceOutputBuildEntries(WorkspaceBuildModel model,
-			IBuildModelFactory factory) throws CoreException {
-		String srcFolder = fData.getSourceFolderName();
-		if (!fData.isSimple() && srcFolder != null) {
-			String libraryName = fData.getLibraryName();
-			if (libraryName == null)
-				libraryName = "."; //$NON-NLS-1$
-			// SOURCE.<LIBRARY_NAME>
-			IBuildEntry entry = factory.createEntry(IBuildEntry.JAR_PREFIX
-					+ libraryName);
-			if (srcFolder.length() > 0)
-				entry.addToken(new Path(srcFolder).addTrailingSeparator().toString());
-			else
-				entry.addToken("."); //$NON-NLS-1$
-			model.getBuild().add(entry);
-
-			// OUTPUT.<LIBRARY_NAME>
-			entry = factory.createEntry(IBuildEntry.OUTPUT_PREFIX + libraryName);
-			String outputFolder = fData.getOutputFolderName().trim();
-			if (outputFolder.length() > 0)
-				entry.addToken(new Path(outputFolder).addTrailingSeparator().toString());
-			else
-				entry.addToken("."); //$NON-NLS-1$
-			model.getBuild().add(entry);
-		}
-	}
-
-	protected void createContents(IProgressMonitor monitor, IProject project)
-			throws CoreException, JavaModelException,
-			InvocationTargetException, InterruptedException {
-	}
-
-	private void createManifest(IProject project) throws CoreException {
-		if (fData instanceof IFragmentFieldData) {
-			fModel = new WorkspaceFragmentModel(project.getFile("fragment.xml"), false); //$NON-NLS-1$
-		} else {
-			fModel = new WorkspacePluginModel(project.getFile("plugin.xml"), false); //$NON-NLS-1$
-		}
-		PluginBase pluginBase = (PluginBase) fModel.getPluginBase();
-		if (!fData.isLegacy())
-			pluginBase.setSchemaVersion("3.0"); //$NON-NLS-1$
-		pluginBase.setId(fData.getId());
-		pluginBase.setVersion(fData.getVersion());
-		pluginBase.setName(fData.getName());
-		pluginBase.setProviderName(fData.getProvider());
-		pluginBase.setTargetVersion(((AbstractFieldData) fData)
-				.getTargetVersion());
-		if (pluginBase instanceof IFragment) {
-			IFragment fragment = (IFragment) pluginBase;
-			FragmentFieldData data = (FragmentFieldData) fData;
-			fragment.setPluginId(data.getPluginId());
-			fragment.setPluginVersion(data.getPluginVersion());
-			fragment.setRule(data.getMatch());
-		} else {
-			if (((IPluginFieldData) fData).doGenerateClass())
-				((IPlugin) pluginBase).setClassName(((IPluginFieldData) fData).getClassname());
-		}
-		if (!fData.isSimple()) {
-			setPluginLibraries(fModel);
-		}
-
-		IPluginReference[] dependencies = getDependencies();
-		for (int i = 0; i < dependencies.length; i++) {
-			IPluginReference ref = dependencies[i];
-			IPluginImport iimport = fModel.getPluginFactory().createImport();
-			iimport.setId(ref.getId());
-			iimport.setVersion(ref.getVersion());
-			iimport.setMatch(ref.getMatch());
-			pluginBase.add(iimport);
-		}
-	}
-
-	private IProject createProject() throws CoreException {
-		IProject project = fProjectProvider.getProject();
-		if (!project.exists()) {
-			CoreUtility.createProject(project, fProjectProvider
-					.getLocationPath(), null);
-			project.open(null);
-		}
-		if (!project.hasNature(PDE.PLUGIN_NATURE))
-			CoreUtility.addNatureToProject(project, PDE.PLUGIN_NATURE, null);
-		if (!fData.isSimple() && !project.hasNature(JavaCore.NATURE_ID))
-			CoreUtility.addNatureToProject(project, JavaCore.NATURE_ID, null);
-		if (!fData.isSimple() && fData.getSourceFolderName() != null
-				&& fData.getSourceFolderName().trim().length() > 0) {
-			IFolder folder = project.getFolder(fData.getSourceFolderName());
-			if (!folder.exists())
-				CoreUtility.createFolder(folder);
-		}
-		return project;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.actions.WorkspaceModifyOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void execute(IProgressMonitor monitor) throws CoreException,
-			InvocationTargetException, InterruptedException {
-
-		// start task
-		monitor.beginTask(PDEUIMessages.NewProjectCreationOperation_creating,
-				getNumberOfWorkUnits()); 
-		monitor.subTask(PDEUIMessages.NewProjectCreationOperation_project); 
-
-		// create project
-		IProject project = createProject();
-		monitor.worked(1);
-		createContents(monitor, project);
-		// set classpath if project has a Java nature
-		if (project.hasNature(JavaCore.NATURE_ID)) {
-			monitor.subTask(PDEUIMessages.NewProjectCreationOperation_setClasspath); 
-			setClasspath(project, fData);
-			monitor.worked(1);
-		}
-
-		if (fData instanceof PluginFieldData) {
-			PluginFieldData data = (PluginFieldData) fData;
-
-			// generate top-level Java class if that option is selected
-			if (data.doGenerateClass()) {
-				generateTopLevelPluginClass(project, new SubProgressMonitor(
-						monitor, 1));
-			}
-		}
-		// generate the manifest file
-		monitor.subTask(PDEUIMessages.NewProjectCreationOperation_manifestFile); 
-		createManifest(project);
-		monitor.worked(1);
-
-		// generate the build.properties file
-		monitor.subTask(PDEUIMessages.NewProjectCreationOperation_buildPropertiesFile); 
-		createBuildPropertiesFile(project);
-		monitor.worked(1);
-
-		// generate content contributed by template wizards
-		boolean contentWizardResult = true;
-		if (fContentWizard != null) {
-			contentWizardResult = fContentWizard.performFinish(project, fModel,
-					new SubProgressMonitor(monitor, 1));
-		}
-
-		if (fData instanceof AbstractFieldData) {
-			String framework = ((AbstractFieldData)fData).getOSGiFramework();
-			if (framework != null) {
-				IEclipsePreferences pref = new ProjectScope(project).getNode(PDECore.PLUGIN_ID);
-				if (pref != null) {
-					pref.putBoolean(ICoreConstants.EXTENSIONS_PROPERTY, false);
-					if (!ICoreConstants.EQUINOX.equals(framework))
-						pref.putBoolean(ICoreConstants.EQUINOX_PROPERTY, false);
-					try {
-						pref.flush();
-					} catch (BackingStoreException e) {
-						PDEPlugin.logException(e);
-					}	
-				}				
-			}
-		}
-		
-		fModel.save();
-
-		if (fData.hasBundleStructure())
-			adjustManifests(monitor, project);
-		if (fData.hasBundleStructure()) {
-			openFile(project.getFile("META-INF/MANIFEST.MF")); //$NON-NLS-1$
-		} else {
-			openFile((IFile) fModel.getUnderlyingResource());
-		}
-		monitor.worked(1);
-
-		fResult = contentWizardResult;
-	}
-	
-	private Set getImportPackagesSet() {
-		TreeSet set = new TreeSet();
-		if (fGenerator != null) {
-			String[] packages = fGenerator.getImportPackages();
-			for (int i = 0; i < packages.length; i++) {
-				set.add(packages[i]);
-			}
-		}
-		if (fContentWizard instanceof IBundleContentWizard) {
-			String[] packages = ((IBundleContentWizard)fContentWizard).getImportPackages();
-			for (int i = 0; i < packages.length; i++) {
-				set.add(packages[i]);
-			}
-		}
-		return set;
-	}
-
-	protected void fillBinIncludes(IProject project, IBuildEntry binEntry)
-			throws CoreException {
-		if (!fData.hasBundleStructure() || fContentWizard != null)
-			binEntry.addToken(fData instanceof IFragmentFieldData ? "fragment.xml" //$NON-NLS-1$
-							: "plugin.xml"); //$NON-NLS-1$
-		if (fData.hasBundleStructure())
-			binEntry.addToken("META-INF/"); //$NON-NLS-1$
-		if (!fData.isSimple()) {
-			String libraryName = fData.getLibraryName();
-			binEntry.addToken(libraryName == null ? "." : libraryName); //$NON-NLS-1$
-		}
-		if (fContentWizard != null) {
-			String[] files = fContentWizard.getNewFiles();
-			for (int j = 0; j < files.length; j++) {
-				if (!binEntry.contains(files[j]))
-					binEntry.addToken(files[j]);
-			}
-		}
-	}
-
-	private void generateTopLevelPluginClass(IProject project,
-			IProgressMonitor monitor) throws CoreException {
-		PluginFieldData data = (PluginFieldData) fData;
-		fGenerator = new PluginClassCodeGenerator(project, data.getClassname(), data);
-		fGenerator.generate(monitor);
-		monitor.done();
-	}
-
-	private IClasspathEntry[] getClassPathEntries(IProject project,
-			IFieldData data) {
-		IClasspathEntry[] internalClassPathEntries = getInternalClassPathEntries(
-				project, data);
-		IClasspathEntry[] entries = new IClasspathEntry[internalClassPathEntries.length + 2];
-		System.arraycopy(internalClassPathEntries, 0, entries, 0, internalClassPathEntries.length);
-		entries[entries.length - 2] = ClasspathComputer.createJREEntry(null);
-		entries[entries.length - 1] = ClasspathComputer.createContainerEntry();
-		return entries;
-	}
-
-	private IPluginReference[] getDependencies() {
-		ArrayList result = new ArrayList();
-		if (fGenerator != null) {
-			IPluginReference[] refs = fGenerator.getDependencies();
-			for (int i = 0; i < refs.length; i++) {
-				result.add(refs[i]);
-			}
-		}
-
-		if (fContentWizard != null) {
-			IPluginReference[] refs = fContentWizard.getDependencies(fData
-					.isLegacy() ? null : "3.0"); //$NON-NLS-1$
-			for (int j = 0; j < refs.length; j++) {
-				if (!result.contains(refs[j]))
-					result.add(refs[j]);
-			}
-		}
-		return (IPluginReference[]) result.toArray(new IPluginReference[result
-				.size()]);
-	}
-
-	protected IClasspathEntry[] getInternalClassPathEntries(IProject project,
-			IFieldData data) {
-		if (data.getSourceFolderName() == null) {
-			return new IClasspathEntry[0];
-		}
-		IClasspathEntry[] entries = new IClasspathEntry[1];
-		IPath path = project.getFullPath().append(data.getSourceFolderName());
-		entries[0] = JavaCore.newSourceEntry(path);
-		return entries;
-	}
-
-	protected int getNumberOfWorkUnits() {
-		int numUnits = 4;
-		if (fData.hasBundleStructure())
-			numUnits++;
-		if (fData instanceof IPluginFieldData) {
-			IPluginFieldData data = (IPluginFieldData) fData;
-			if (data.doGenerateClass())
-				numUnits++;
-			if (fContentWizard != null)
-				numUnits++;
-		}
-		return numUnits;
-	}
-
-	public boolean getResult() {
-		return fResult;
-	}
-
-	private void openFile(final IFile file) {
-		final IWorkbenchWindow ww = PDEPlugin.getActiveWorkbenchWindow();
-		final IWorkbenchPage page = ww.getActivePage();
-		if (page == null)
-			return;
-		final IWorkbenchPart focusPart = page.getActivePart();
-		ww.getShell().getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				if (focusPart instanceof ISetSelectionTarget) {
-					ISelection selection = new StructuredSelection(file);
-					((ISetSelectionTarget) focusPart).selectReveal(selection);
-				}
-				try {
-					IDE.openEditor(page, file, true);
-				} catch (PartInitException e) {
-				}
-			}
-		});
-	}
-
-	private void setClasspath(IProject project, IFieldData data)
-			throws JavaModelException, CoreException {
-		IJavaProject javaProject = JavaCore.create(project);
-		// Set output folder
-		if (data.getOutputFolderName() != null) {
-			IPath path = project.getFullPath().append(
-					data.getOutputFolderName());
-			javaProject.setOutputLocation(path, null);
-		}
-		IClasspathEntry[] entries = getClassPathEntries(project, data);
-		javaProject.setRawClasspath(entries, null);
-	}
-
-	protected void setPluginLibraries(WorkspacePluginModelBase model)
-			throws CoreException {
-		PluginBase pluginBase = (PluginBase) fModel.getPluginBase();
-		String libraryName = fData.getLibraryName();
-		if (libraryName == null && !fData.hasBundleStructure()) {
-			libraryName = "."; //$NON-NLS-1$
-		}
-		if (libraryName != null) {
-			IPluginLibrary library = model.getPluginFactory().createLibrary();
-			library.setName(libraryName);
-			library.setExported(!fData.hasBundleStructure());
-			pluginBase.add(library);
-		}
-	}
-
-	private void trimModel(IPluginBase base) throws CoreException {
-		base.setId(null);
-		base.setVersion(null);
-		base.setName(null);
-		base.setProviderName(null);
-		if (base instanceof IFragment) {
-			((IFragment) base).setPluginId(null);
-			((IFragment) base).setPluginVersion(null);
-			((IFragment) base).setRule(0);
-		} else {
-			((IPlugin) base).setClassName(null);
-		}
-		IPluginImport[] imports = base.getImports();
-		for (int i = 0; i < imports.length; i++) {
-			base.remove(imports[i]);
-		}
-		IPluginLibrary[] libraries = base.getLibraries();
-		for (int i = 0; i < libraries.length; i++) {
-			base.remove(libraries[i]);
-		}
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationPage.java
deleted file mode 100644
index cf64aef..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationPage.java
+++ /dev/null

@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.plugin;
-
-import org.eclipse.jdt.ui.PreferenceConstants;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.pde.internal.core.ICoreConstants;
-import org.eclipse.pde.internal.core.TargetPlatform;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-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.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
-
-
-public class NewProjectCreationPage extends WizardNewProjectCreationPage {
-	protected Button fJavaButton;
-	protected boolean fFragment;
-	private Label fSourceLabel;
-	private Text fSourceText;
-	private Label fOutputlabel;
-	private Text fOutputText;
-	private AbstractFieldData fData;
-	private Button fEclipseButton;
-	private Combo fTargetCombo;
-	private Combo fOSGiCombo;
-	private Button fOSGIButton;
-	
-	public NewProjectCreationPage(String pageName, AbstractFieldData data, boolean fragment){
-		super(pageName);
-		fFragment = fragment;
-		fData = data;
-	}
-	
-	public void createControl(Composite parent) {
-		super.createControl(parent);
-		Composite control = (Composite)getControl();
-		GridLayout layout = new GridLayout();
-		control.setLayout(layout);
-
-		createProjectTypeGroup(control);
-		createFormatGroup(control);
-		
-		updateRuntimeDependency();
-
-		Dialog.applyDialogFont(control);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(control,
-				fFragment ? IHelpContextIds.NEW_FRAGMENT_STRUCTURE_PAGE
-							: IHelpContextIds.NEW_PROJECT_STRUCTURE_PAGE);
-		setControl(control);
-	}
-	
-	private void createProjectTypeGroup(Composite container) {
-		Group group = new Group(container, SWT.NONE);
-		group.setText(PDEUIMessages.ProjectStructurePage_settings); 
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		group.setLayout(layout);
-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-	
-		fJavaButton = createButton(group, SWT.CHECK, 2, 0);
-		fJavaButton.setText(PDEUIMessages.ProjectStructurePage_java); 
-		fJavaButton.setSelection(true);
-		fJavaButton.addSelectionListener(new SelectionAdapter(){
-			public void widgetSelected(SelectionEvent e) {
-				boolean enabled = fJavaButton.getSelection();
-				fSourceLabel.setEnabled(enabled);
-				fSourceText.setEnabled(enabled);
-				fOutputlabel.setEnabled(enabled);
-				fOutputText.setEnabled(enabled);
-				validatePage();
-			}
-		});
-		
-		fSourceLabel = createLabel(group, PDEUIMessages.ProjectStructurePage_source); 
-		fSourceText = createText(group);
-		IPreferenceStore store = PreferenceConstants.getPreferenceStore();
-		fSourceText.setText(store.getString(PreferenceConstants.SRCBIN_SRCNAME));
-		
-		fOutputlabel = createLabel(group, PDEUIMessages.ProjectStructurePage_output); 
-		fOutputText = createText(group);		
-		fOutputText.setText(store.getString(PreferenceConstants.SRCBIN_BINNAME));
-	}
-	
-	private void createFormatGroup(Composite container) {
-		Group group = new Group(container, SWT.NONE);
-		group.setText(PDEUIMessages.NewProjectCreationPage_target);
-		group.setLayout(new GridLayout(2, false));
-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		Label label = new Label(group, SWT.NONE);
-		if (fFragment)
-			label.setText(PDEUIMessages.NewProjectCreationPage_ftarget);
-		else
-			label.setText(PDEUIMessages.NewProjectCreationPage_ptarget);			
-		GridData gd = new GridData();
-		gd.horizontalSpan = 2;
-		label.setLayoutData(gd);
-		    
-		fEclipseButton = createButton(group, SWT.RADIO, 1, 30);
-    	fEclipseButton.setText(PDEUIMessages.NewProjectCreationPage_pDependsOnRuntime);	    
-	    fEclipseButton.setSelection(fData.getOSGiFramework() == null);
-	    fEclipseButton.addSelectionListener(new SelectionAdapter(){
-			public void widgetSelected(SelectionEvent e) {
-				updateRuntimeDependency();
-			}
-		});
-		
-		fTargetCombo = new Combo(group, SWT.READ_ONLY|SWT.SINGLE);
-		fTargetCombo.setItems(new String[] {ICoreConstants.TARGET32, ICoreConstants.TARGET31, ICoreConstants.TARGET30, ICoreConstants.TARGET21});
-		fTargetCombo.setText(TargetPlatform.getTargetVersionString());
-		
-	    fOSGIButton = createButton(group, SWT.RADIO, 1, 30);
-    	fOSGIButton.setText(PDEUIMessages.NewProjectCreationPage_pPureOSGi); 	   
-	    fOSGIButton.setSelection(fData.getOSGiFramework() != null);
-	    
-		fOSGiCombo = new Combo(group, SWT.READ_ONLY|SWT.SINGLE);
-		fOSGiCombo.setItems(new String[] {ICoreConstants.EQUINOX, PDEUIMessages.NewProjectCreationPage_standard}); 
-		fOSGiCombo.setText(ICoreConstants.EQUINOX);	
-		
-	}
-	
-	private void updateRuntimeDependency() {
-		boolean depends = fEclipseButton.getSelection();
-		fTargetCombo.setEnabled(depends);
-		fOSGiCombo.setEnabled(!depends);
-	}
-	
-	private Button createButton(Composite container, int style, int span, int indent) {
-		Button button = new Button(container, style);
-		GridData gd = new GridData();
-		gd.horizontalSpan = span;
-		gd.horizontalIndent = indent;
-		button.setLayoutData(gd);
-		return button;		
-	}
-	
-	private Label createLabel(Composite container, String text) {
-		Label label = new Label(container, SWT.NONE);
-		label.setText(text);
-		GridData gd = new GridData();
-		gd.horizontalIndent = 30;
-		label.setLayoutData(gd);
-		return label;
-	}
-	
-	private Text createText(Composite container) {
-		Text text = new Text(container, SWT.BORDER | SWT.SINGLE);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.widthHint = 300;
-		text.setLayoutData(gd);
-		text.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				validatePage();
-			}
-		});
-		return text;
-	}
-	
-	public void updateData() {
-		fData.setSimple(!fJavaButton.getSelection());
-		fData.setSourceFolderName(fSourceText.getText().trim());
-		fData.setOutputFolderName(fOutputText.getText().trim());
-		fData.setLegacy(fTargetCombo.getText().equals("2.1")); //$NON-NLS-1$
-		fData.setTargetVersion(fTargetCombo.getText());
-		fData.setHasBundleStructure(fOSGIButton.getSelection() || Double.parseDouble(fTargetCombo.getText()) >= 3.1);	
-		fData.setOSGiFramework(fOSGIButton.getSelection() ? fOSGiCombo.getText() : null);
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/OpenProjectWizardAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/OpenProjectWizardAction.java
deleted file mode 100644
index f105766..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/OpenProjectWizardAction.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.plugin;
-
-import java.util.Hashtable;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.util.SWTUtil;
-import org.eclipse.ui.*;
-import org.eclipse.ui.cheatsheets.*;
-
-public class OpenProjectWizardAction extends Action implements ICheatSheetAction {
-	/**
-	 * @param text
-	 */
-	public OpenProjectWizardAction() {
-		super("OpenProject"); //$NON-NLS-1$
-	}
-	
-	/**
-	 * @see IActionDelegate#run(IAction)
-	 */
-	public void run() {
-		run(new String [] {}, null);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.cheatsheets.ICheatSheetAction#run(java.lang.String[], org.eclipse.ui.cheatsheets.ICheatSheetManager)
-	 */
-	public void run(String[] params, ICheatSheetManager manager) {
-		Hashtable defValues = new Hashtable();
-		if (params.length>0)
-			defValues.put(NewPluginProjectWizard.DEF_PROJECT_NAME, params[0]);
-		if (params.length>1)
-			defValues.put(NewPluginProjectWizard.DEF_TEMPLATE_ID, params[1]);
-		NewPluginProjectWizard wizard = new NewPluginProjectWizard();
-		wizard.init(PlatformUI.getWorkbench(), new StructuredSelection());
-		wizard.init(defValues);
-		WizardDialog dialog = new WizardDialog(PDEPlugin.getActiveWorkbenchShell(), wizard);
-		dialog.create();
-		SWTUtil.setDialogSize(dialog, 500, 500);
-		dialog.getShell().setText(wizard.getWindowTitle());
-		int result = dialog.open();
-		notifyResult(result==WizardDialog.OK);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/PluginClassCodeGenerator.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/PluginClassCodeGenerator.java
deleted file mode 100644
index 5ecc5a1..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/PluginClassCodeGenerator.java
+++ /dev/null

@@ -1,250 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.plugin;
-import java.io.*;
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-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.pde.core.plugin.IPluginReference;
-import org.eclipse.pde.internal.core.util.CoreUtility;
-import org.eclipse.pde.internal.ui.wizards.templates.PluginReference;
-
-public class PluginClassCodeGenerator {
-	private PluginFieldData fPluginData;
-	private IProject fProject;
-	private String fQualifiedClassName;
-
-	public PluginClassCodeGenerator(IProject project, String qualifiedClassName,
-			PluginFieldData data) {
-		this.fProject = project;
-		this.fQualifiedClassName = qualifiedClassName;
-		fPluginData = data;
-	}
-
-	public IFile generate(IProgressMonitor monitor) throws CoreException {
-		int nameloc = fQualifiedClassName.lastIndexOf('.');
-		String packageName = (nameloc == -1)
-				? "" : fQualifiedClassName.substring(0, nameloc); //$NON-NLS-1$
-		String className = fQualifiedClassName.substring(nameloc + 1);
-
-		IPath path = new Path(packageName.replace('.', '/'));
-		if (fPluginData.getSourceFolderName().trim().length() > 0)
-			path = new Path(fPluginData.getSourceFolderName()).append(path);
-
-		CoreUtility.createFolder(fProject.getFolder(path));
-
-		IFile file = fProject.getFile(path.append(className + ".java")); //$NON-NLS-1$
-		StringWriter swriter = new StringWriter();
-		PrintWriter writer = new PrintWriter(swriter);
-		if (fPluginData.isLegacy()) {
-			generateLegacyPluginClass(packageName, className, writer);
-		} else if (fPluginData.getOSGiFramework() != null){ 
-			generateActivatorClass(packageName, className, writer);
-		} else {
-			generatePluginClass(packageName, className, writer);
-		}
-		writer.flush();
-		try {
-			swriter.close();
-			ByteArrayInputStream stream = new ByteArrayInputStream(swriter.toString()
-					.getBytes(fProject.getDefaultCharset()));
-			if (file.exists())
-				file.setContents(stream, false, true, monitor);
-			else
-				file.create(stream, false, monitor);
-			stream.close();
-		} catch (IOException e) {
-
-		}
-		return file;
-	}
-
-	private void generatePluginClass(String packageName, String className,
-			PrintWriter writer) {
-		if (!packageName.equals("")) { //$NON-NLS-1$
-			writer.println("package " + packageName + ";"); //$NON-NLS-1$ //$NON-NLS-2$
-			writer.println();
-		}
-		if (fPluginData.isUIPlugin()) {
-			writer.println("import org.eclipse.ui.plugin.*;"); //$NON-NLS-1$
-			writer.println("import org.eclipse.jface.resource.ImageDescriptor;"); //$NON-NLS-1$
-		} else {
-			writer.println("import org.eclipse.core.runtime.Plugin;"); //$NON-NLS-1$
-		}
-		writer.println("import org.osgi.framework.BundleContext;"); //$NON-NLS-1$
-		writer.println();
-		writer.println("/**"); //$NON-NLS-1$
-		writer.println(" * The main plugin class to be used in the desktop."); //$NON-NLS-1$
-		writer.println(" */"); //$NON-NLS-1$
-		if (fPluginData.isUIPlugin())
-			writer.println("public class " + className + " extends AbstractUIPlugin {"); //$NON-NLS-1$ //$NON-NLS-2$
-		else
-			writer.println("public class " + className + " extends Plugin {"); //$NON-NLS-1$ //$NON-NLS-2$
-		writer.println();
-		writer.println("\t//The shared instance."); //$NON-NLS-1$
-		writer.println("\tprivate static " + className + " plugin;"); //$NON-NLS-1$ //$NON-NLS-2$
-		writer.println("\t"); //$NON-NLS-1$
-		writer.println("\t/**"); //$NON-NLS-1$
-		writer.println("\t * The constructor."); //$NON-NLS-1$
-		writer.println("\t */"); //$NON-NLS-1$
-		writer.println("\tpublic " + className + "() {"); //$NON-NLS-1$ //$NON-NLS-2$
-		writer.println("\t\tplugin = this;"); //$NON-NLS-1$
-		writer.println("\t}"); //$NON-NLS-1$
-		writer.println();
-
-		writer.println("\t/**"); //$NON-NLS-1$
-		writer.println("\t * This method is called upon plug-in activation"); //$NON-NLS-1$
-		writer.println("\t */"); //$NON-NLS-1$
-		writer.println("\tpublic void start(BundleContext context) throws Exception {"); //$NON-NLS-1$
-		writer.println("\t\tsuper.start(context);"); //$NON-NLS-1$
-		writer.println("\t}"); //$NON-NLS-1$
-		writer.println();
-
-		writer.println("\t/**"); //$NON-NLS-1$
-		writer.println("\t * This method is called when the plug-in is stopped"); //$NON-NLS-1$
-		writer.println("\t */"); //$NON-NLS-1$
-		writer.println("\tpublic void stop(BundleContext context) throws Exception {"); //$NON-NLS-1$
-		writer.println("\t\tsuper.stop(context);"); //$NON-NLS-1$
-		writer.println("\t\tplugin = null;"); //$NON-NLS-1$
-		writer.println("\t}"); //$NON-NLS-1$
-		writer.println();
-
-		writer.println("\t/**"); //$NON-NLS-1$
-		writer.println("\t * Returns the shared instance."); //$NON-NLS-1$
-		writer.println("\t */"); //$NON-NLS-1$
-		writer.println("\tpublic static " + className + " getDefault() {"); //$NON-NLS-1$ //$NON-NLS-2$
-		writer.println("\t\treturn plugin;"); //$NON-NLS-1$
-		writer.println("\t}"); //$NON-NLS-1$
-		writer.println();
-		if (fPluginData.isUIPlugin()) {
-			writer.println("\t/**"); //$NON-NLS-1$
-		    writer.println("\t * Returns an image descriptor for the image file at the given"); //$NON-NLS-1$
-		    writer.println("\t * plug-in relative path."); //$NON-NLS-1$
-		    writer.println("\t *"); //$NON-NLS-1$
-		    writer.println("\t * @param path the path"); //$NON-NLS-1$
-		    writer.println("\t * @return the image descriptor"); //$NON-NLS-1$
-		    writer.println("\t */"); //$NON-NLS-1$
-		    writer.println("\tpublic static ImageDescriptor getImageDescriptor(String path) {"); //$NON-NLS-1$
-		    writer.println("\t\treturn AbstractUIPlugin.imageDescriptorFromPlugin(\"" + fPluginData.getId() + "\", path);"); //$NON-NLS-1$ //$NON-NLS-2$
-		    writer.println("\t}"); //$NON-NLS-1$
-		}
-		writer.println("}"); //$NON-NLS-1$
-	}
-	private void generateLegacyPluginClass(String packageName, String className,
-			PrintWriter writer) {
-		if (!packageName.equals("")) { //$NON-NLS-1$
-			writer.println("package " + packageName + ";"); //$NON-NLS-1$ //$NON-NLS-2$
-			writer.println();
-		}
-		if (fPluginData.isUIPlugin())
-			writer.println("import org.eclipse.ui.plugin.*;"); //$NON-NLS-1$
-		writer.println("import org.eclipse.core.runtime.*;"); //$NON-NLS-1$
-		writer.println("import java.util.*;"); //$NON-NLS-1$
-		writer.println();
-		writer.println("/**"); //$NON-NLS-1$
-		writer.println(" * The main plugin class to be used in the desktop."); //$NON-NLS-1$
-		writer.println(" */"); //$NON-NLS-1$
-		if (fPluginData.isUIPlugin())
-			writer.println("public class " + className + " extends AbstractUIPlugin {"); //$NON-NLS-1$ //$NON-NLS-2$
-		else
-			writer.println("public class " + className + " extends Plugin {"); //$NON-NLS-1$ //$NON-NLS-2$
-		writer.println("\t//The shared instance."); //$NON-NLS-1$
-		writer.println("\tprivate static " + className + " plugin;"); //$NON-NLS-1$ //$NON-NLS-2$
-		writer.println("\t//Resource bundle."); //$NON-NLS-1$
-		writer.println("\tprivate ResourceBundle resourceBundle;"); //$NON-NLS-1$
-		writer.println("\t"); //$NON-NLS-1$
-		writer.println("\t/**"); //$NON-NLS-1$
-		writer.println("\t * The constructor."); //$NON-NLS-1$
-		writer.println("\t */"); //$NON-NLS-1$
-		writer.println("\tpublic " + className //$NON-NLS-1$
-				+ "(IPluginDescriptor descriptor) {"); //$NON-NLS-1$
-		writer.println("\t\tsuper(descriptor);"); //$NON-NLS-1$
-		writer.println("\t\tplugin = this;"); //$NON-NLS-1$
-		writer.println("\t}"); //$NON-NLS-1$
-		writer.println();
-		writer.println("\t/**"); //$NON-NLS-1$
-		writer.println("\t * Returns the shared instance."); //$NON-NLS-1$
-		writer.println("\t */"); //$NON-NLS-1$
-		writer.println("\tpublic static " + className + " getDefault() {"); //$NON-NLS-1$ //$NON-NLS-2$
-		writer.println("\t\treturn plugin;"); //$NON-NLS-1$
-		writer.println("\t}"); //$NON-NLS-1$
-		writer.println();
-		writer.println("\t/**"); //$NON-NLS-1$
-		writer.println("\t * Returns the string from the plugin's resource bundle,"); //$NON-NLS-1$
-		writer.println("\t * or 'key' if not found."); //$NON-NLS-1$
-		writer.println("\t */"); //$NON-NLS-1$
-		writer.println("\tpublic static String getResourceString(String key) {"); //$NON-NLS-1$
-		writer.println("\t\tResourceBundle bundle = " + className //$NON-NLS-1$
-				+ ".getDefault().getResourceBundle();"); //$NON-NLS-1$
-		writer.println("\t\ttry {"); //$NON-NLS-1$
-		writer.println("\t\t\treturn (bundle != null) ? bundle.getString(key) : key;"); //$NON-NLS-1$
-		writer.println("\t\t} catch (MissingResourceException e) {"); //$NON-NLS-1$
-		writer.println("\t\t\treturn key;"); //$NON-NLS-1$
-		writer.println("\t\t}"); //$NON-NLS-1$
-		writer.println("\t}"); //$NON-NLS-1$
-		writer.println();
-		writer.println("\t/**"); //$NON-NLS-1$
-		writer.println("\t * Returns the plugin's resource bundle,"); //$NON-NLS-1$
-		writer.println("\t */"); //$NON-NLS-1$
-		writer.println("\tpublic ResourceBundle getResourceBundle() {"); //$NON-NLS-1$
-		writer.println("\t\ttry {"); //$NON-NLS-1$
-		writer.println("\t\t\tif (resourceBundle == null)"); //$NON-NLS-1$
-		writer.println("\t\t\t\tresourceBundle   = ResourceBundle.getBundle(\"" //$NON-NLS-1$
-				+ packageName + "." + className + "Resources\");"); //$NON-NLS-1$ //$NON-NLS-2$
-		writer.println("\t\t} catch (MissingResourceException x) {"); //$NON-NLS-1$
-		writer.println("\t\t\tresourceBundle = null;"); //$NON-NLS-1$
-		writer.println("\t\t}"); //$NON-NLS-1$
-		writer.println("\t\treturn resourceBundle;"); //$NON-NLS-1$
-		writer.println("\t}"); //$NON-NLS-1$
-		writer.println("}"); //$NON-NLS-1$
-	}
-	
-	private void generateActivatorClass(String packageName, String className,
-			PrintWriter writer) {
-		if (!packageName.equals("")) { //$NON-NLS-1$
-			writer.println("package " + packageName + ";"); //$NON-NLS-1$ //$NON-NLS-2$
-			writer.println();
-		}
-		writer.println("import org.osgi.framework.BundleActivator;"); //$NON-NLS-1$
-		writer.println("import org.osgi.framework.BundleContext;"); //$NON-NLS-1$
-		writer.println();
-		writer.println("public class " + className + " implements BundleActivator {"); //$NON-NLS-1$ //$NON-NLS-2$
-		writer.println();
-		writer.println("\tpublic void start(BundleContext context) throws Exception {"); //$NON-NLS-1$
-		writer.println("\t}"); //$NON-NLS-1$
-		writer.println();
-		writer.println("\tpublic void stop(BundleContext context) throws Exception {"); //$NON-NLS-1$
-		writer.println("\t}"); //$NON-NLS-1$
-		writer.println();
-		writer.println("}"); //$NON-NLS-1$		
-	}
-
-	public IPluginReference[] getDependencies() {
-		ArrayList result = new ArrayList();
-		if (fPluginData.isUIPlugin())
-			result.add(new PluginReference("org.eclipse.ui", null, 0)); //$NON-NLS-1$
-		if (!fPluginData.isLegacy() && fPluginData.getOSGiFramework() == null)
-			result.add(new PluginReference("org.eclipse.core.runtime", null, 0)); //$NON-NLS-1$
-		return (IPluginReference[]) result.toArray(new IPluginReference[result.size()]);
-	}
-	
-	public String[] getImportPackages() {
-		return fPluginData.getOSGiFramework() != null 
-					? new String[] {"org.osgi.framework;version=\"1.3.0\""}  //$NON-NLS-1$
-					: new String[0]; 
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/PluginContentPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/PluginContentPage.java
deleted file mode 100644
index 8e7dbe8..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/PluginContentPage.java
+++ /dev/null

@@ -1,269 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.wizards.plugin;
-
-import java.util.Locale;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.JavaConventions;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.DialogPage;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.pde.internal.core.ICoreConstants;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.wizards.IProjectProvider;
-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.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-
-public class PluginContentPage extends ContentPage {
-	protected final static int P_CLASS_GROUP = 2;
-
-	private Text fClassText;
-	private Button fGenerateClass;
-	private Button fUIPlugin;
-	private Label fClassLabel;
-
-	private Label fLabel;
-    private Button fYesButton;
-    private Button fNoButton;
-    
-	private ModifyListener classListener = new ModifyListener() {
-		public void modifyText(ModifyEvent e) {
-			if (fInitialized)
-				fChangedGroups |= P_CLASS_GROUP;
-			validatePage();
-		}
-	};
-	
-	private Group fRCPGroup;
-
-	public PluginContentPage(String pageName, IProjectProvider provider,
-			NewProjectCreationPage page,AbstractFieldData data) {
-		super(pageName, provider, page, data);
-		setTitle(PDEUIMessages.ContentPage_title); 
-		setDescription(PDEUIMessages.ContentPage_desc); 
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.plugin.ContentPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		container.setLayout(new GridLayout());
-		
-		createPluginPropertiesGroup(container);
-		createPluginClassGroup(container);
-		createRCPGroup(container);
-		
-		Dialog.applyDialogFont(container);
-		setControl(container);	
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IHelpContextIds.NEW_PROJECT_REQUIRED_DATA);
-	}
-
-	private void createPluginPropertiesGroup(Composite container) {
-		Group propertiesGroup = new Group(container, SWT.NONE);
-		propertiesGroup.setLayout(new GridLayout(2, false));
-		propertiesGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		propertiesGroup.setText(PDEUIMessages.ContentPage_pGroup); 
-
-		Label label = new Label(propertiesGroup, SWT.NONE);
-		label.setText(PDEUIMessages.ContentPage_pid); 
-		fIdText = createText(propertiesGroup, propertiesListener);
-
-		label = new Label(propertiesGroup, SWT.NONE);
-		label.setText(PDEUIMessages.ContentPage_pversion); 
-		fVersionText = createText(propertiesGroup, propertiesListener);
-
-		label = new Label(propertiesGroup, SWT.NONE);
-		label.setText(PDEUIMessages.ContentPage_pname); 
-		fNameText = createText(propertiesGroup, propertiesListener);
-
-		label = new Label(propertiesGroup, SWT.NONE);
-		label.setText(PDEUIMessages.ContentPage_pprovider); 
-		fProviderText = createText(propertiesGroup, propertiesListener);
-
-		fLibraryLabel = new Label(propertiesGroup, SWT.NONE);
-		fLibraryLabel.setText(PDEUIMessages.ProjectStructurePage_library); 
-		fLibraryText = createText(propertiesGroup, propertiesListener);
-	}
-
-	private void createPluginClassGroup(Composite container) {
-		Group classGroup = new Group(container, SWT.NONE);
-		classGroup.setLayout(new GridLayout(2, false));
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		classGroup.setLayoutData(gd);
-		classGroup.setText(PDEUIMessages.ContentPage_pClassGroup); 
-
-		fGenerateClass = new Button(classGroup, SWT.CHECK);
-		fGenerateClass.setText(PDEUIMessages.ContentPage_generate); 
-		fGenerateClass.setSelection(true);
-		gd = new GridData();
-		gd.horizontalSpan = 2;
-		fGenerateClass.setLayoutData(gd);
-		fGenerateClass.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				fClassLabel.setEnabled(fGenerateClass.getSelection());
-				fClassText.setEnabled(fGenerateClass.getSelection());
-				updateData();
-				validatePage();
-			}
-		});
-
-		fClassLabel = new Label(classGroup, SWT.NONE);
-		fClassLabel.setText(PDEUIMessages.ContentPage_classname); 
-		gd = new GridData();
-		gd.horizontalIndent = 20;
-		fClassLabel.setLayoutData(gd);
-		fClassText = createText(classGroup, classListener);
-
-		fUIPlugin = new Button(classGroup, SWT.CHECK);
-		fUIPlugin.setText(PDEUIMessages.ContentPage_uicontribution); 
-		fUIPlugin.setSelection(true);
-		gd = new GridData();
-		gd.horizontalSpan = 2;
-		fUIPlugin.setLayoutData(gd);
-		fUIPlugin.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				updateData();
-				validatePage();
-			}
-		});
-	}
-
-	public void updateData() {
-		super.updateData();
-		PluginFieldData data = (PluginFieldData)fData;
-		data.setClassname(fClassText.getText().trim());
-		data.setUIPlugin(fUIPlugin.getSelection());
-		data.setDoGenerateClass(fGenerateClass.isEnabled() && fGenerateClass.getSelection());
-		data.setRCPApplicationPlugin(!fData.isSimple()
-						&& !fData.isLegacy()
-						&& fYesButton.getSelection());
-	}
-	
-	private void createRCPGroup(Composite container){
-	    fRCPGroup = new Group(container, SWT.NONE);
-	    fRCPGroup.setLayout(new GridLayout(2, false));
-	    fRCPGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-	    fRCPGroup.setText(PDEUIMessages.PluginContentPage_rcpGroup); 
-	    
-	    createRCPQuestion(fRCPGroup, 2);
-	}
-	
-	private void createRCPQuestion(Composite parent, int horizontalSpan) {
-	    Composite comp = new Composite(parent, SWT.NONE);
-	    GridLayout layout = new GridLayout(3, false);
-	    layout.marginHeight = layout.marginWidth = 0;
-	    comp.setLayout(layout);
-	    GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-	    gd.horizontalSpan = horizontalSpan;
-	    comp.setLayoutData(gd);
-	    
-	    fLabel = new Label(comp, SWT.NONE);
-	    fLabel.setText(PDEUIMessages.PluginContentPage_appQuestion); 
-	    fLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-	    
-	    fYesButton = new Button(comp, SWT.RADIO);
-	    fYesButton.setText(PDEUIMessages.PluginContentPage_yes); 
-	    fYesButton.setSelection(false);
-	    gd = new GridData();
-	    gd.widthHint = getButtonWidthHint(fYesButton);
-	    fYesButton.setLayoutData(gd);
-	    fYesButton.addSelectionListener(new SelectionAdapter() {
-	    	public void widgetSelected(SelectionEvent e) {
-	    		updateData();
-	    		getContainer().updateButtons();
-	    	}
-	    });
-	    
-	    fNoButton = new Button(comp, SWT.RADIO);
-	    fNoButton.setText(PDEUIMessages.PluginContentPage_no); 
-	    fNoButton.setSelection(true);
-	    gd = new GridData();
-	    gd.widthHint = getButtonWidthHint(fNoButton);
-	    fNoButton.setLayoutData(gd);		
-	}
-	
-    /* (non-Javadoc)
-     * @see org.eclipse.pde.internal.ui.wizards.plugin.ContentPage#setVisible(boolean)
-     */
-    public void setVisible(boolean visible) {
-    	if (visible) {
-    		fMainPage.updateData();
-    		boolean pureOSGi = ((PluginFieldData)fData).getOSGiFramework() != null;
-			fGenerateClass.setEnabled(!fData.isSimple());
-			fClassLabel.setEnabled(!fData.isSimple() && fGenerateClass.getSelection());
-			fClassText.setEnabled(!fData.isSimple() && fGenerateClass.getSelection());
-			fUIPlugin.setEnabled(!fData.isSimple() && !pureOSGi);
-			if (pureOSGi)
-				fUIPlugin.setSelection(false);
-
-			// plugin class group
-			if (((fChangedGroups & P_CLASS_GROUP) == 0)){
-				int oldfChanged = fChangedGroups;
-				fClassText.setText(computeId().toLowerCase(Locale.ENGLISH) + ".Activator"); //$NON-NLS-1$
-				fChangedGroups = oldfChanged;
-			}		
-			fRCPGroup.setVisible(!fData.isLegacy() && !fData.isSimple() && !pureOSGi);
-    	}
-        super.setVisible(visible);
-    }
-    
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.plugin.ContentPage#validatePage()
-	 */
-	protected void validatePage() {
-		String errorMessage = validateProperties();
-		if (errorMessage == null && !fData.isSimple()) {
-			if (fLibraryText.getText().trim().length() == 0 && fData.getTargetVersion().equals(ICoreConstants.TARGET21)) {
-				errorMessage = PDEUIMessages.PluginContentPage_noLibrary; 
-			}	
-		}
-		if (errorMessage == null && fGenerateClass.isEnabled() && fGenerateClass.getSelection()) {
-			IStatus status = JavaConventions.validateJavaTypeName(fClassText.getText().trim());
-			if (status.getSeverity() == IStatus.ERROR) {
-				errorMessage = status.getMessage();
-			} else if (status.getSeverity() == IStatus.WARNING) {
-				setMessage(status.getMessage(), DialogPage.WARNING);
-			}
-		}
-		setErrorMessage(errorMessage);
-		setPageComplete(errorMessage == null);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.plugin.ContentPage#getNameFieldQualifier()
-	 */
-	protected String getNameFieldQualifier() {
-		return PDEUIMessages.ContentPage_plugin; 
-	}
-	
-	private static int getButtonWidthHint(Button button) {
-		if (button.getFont().equals(JFaceResources.getDefaultFont()))
-			button.setFont(JFaceResources.getDialogFont());
-		return Math.max(50,
-				button.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/PluginFieldData.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/PluginFieldData.java
deleted file mode 100644
index 4d1c395..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/PluginFieldData.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.plugin;
-
-import java.util.*;
-
-import org.eclipse.pde.ui.*;
-import org.eclipse.pde.ui.templates.*;
-
-public class PluginFieldData extends AbstractFieldData implements IPluginFieldData {
-	
-	private String fClassname;	
-	private boolean fIsUIPlugin = true;
-	private boolean fDoGenerateClass = true;
-	private boolean fRCPAppPlugin = false;
-	private ArrayList templates = new ArrayList();
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.IPluginFieldData#getClassname()
-	 */
-	public String getClassname() {
-		return fClassname;
-	}
-	
-	public void setClassname(String classname) {
-		fClassname = classname;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.IPluginFieldData#isUIPlugin()
-	 */
-	public boolean isUIPlugin() {
-		return fIsUIPlugin;
-	}
-	
-	public void setUIPlugin(boolean isUIPlugin) {
-		fIsUIPlugin = isUIPlugin;
-	}
-	
-	public void addTemplate(ITemplateSection section) {
-		if (!templates.contains(section))
-			templates.add(section);
-	}
-	
-	public ITemplateSection[] getTemplateSections() {
-		return (ITemplateSection[]) templates.toArray(new ITemplateSection[templates.size()]);
-	}
-	
-	public void setDoGenerateClass(boolean doGenerate) {
-		fDoGenerateClass = doGenerate;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.IPluginFieldData#doGenerateClass()
-	 */
-	public boolean doGenerateClass() {
-		return fDoGenerateClass;
-	}
-	
-	public void setRCPApplicationPlugin(boolean isRCPAppPlugin){
-	    fRCPAppPlugin = isRCPAppPlugin;
-	}
-	
-	public boolean isRCPApplicationPlugin(){
-	    return fRCPAppPlugin;
-	}
-	
-
-
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/TemplateListSelectionPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/TemplateListSelectionPage.java
deleted file mode 100644
index 252a003..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/TemplateListSelectionPage.java
+++ /dev/null

@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.plugin;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.wizard.IWizardNode;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.elements.ElementList;
-import org.eclipse.pde.internal.ui.wizards.WizardElement;
-import org.eclipse.pde.internal.ui.wizards.WizardListSelectionPage;
-import org.eclipse.pde.internal.ui.wizards.WizardNode;
-import org.eclipse.pde.ui.IBasePluginWizard;
-import org.eclipse.pde.ui.IPluginContentWizard;
-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.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-
-
-public class TemplateListSelectionPage extends WizardListSelectionPage
-		implements ISelectionChangedListener, IExecutableExtension {
-	private ContentPage fContentPage;
-	private Button fUseTemplate;
-	private String fInitialTemplateId;
-	
-	class WizardFilter extends ViewerFilter {
-		public boolean select(Viewer viewer, Object parentElement,
-				Object element) {
-			PluginFieldData data = (PluginFieldData) fContentPage.getData();
-			boolean simple = data.isSimple();
-			boolean generate = data.doGenerateClass();
-			boolean ui = data.isUIPlugin();
-			boolean rcp = data.isRCPApplicationPlugin();
-			boolean osgi = data.getOSGiFramework() != null;
-			WizardElement welement = (WizardElement)element;
-			IConfigurationElement config = welement.getConfigurationElement();
-			boolean uiFlag = getFlag(config, "ui-content", true); //$NON-NLS-1$
-			boolean javaFlag = getFlag(config, "java", true); //$NON-NLS-1$
-			boolean rcpFlag = getFlag(config, "rcp", false); //$NON-NLS-1$
-			boolean osgiFlag = getFlag(config, "pureOSGi", false); //$NON-NLS-1$
-			boolean activatorFlag = getFlag(config, "requiresActivator", false); //$NON-NLS-1$
-			
-			//filter out java wizards for simple projects
-			if (simple && javaFlag) return false;
-			//filter out ui wizards for non-ui plug-ins
-			if (uiFlag && (simple || (generate && !ui))) return false;
-			//filter out wizards that require an activator when the user specifies not to generate a class
-			if (activatorFlag && !generate) return false;
-			//filter out non-RCP wizard if RCP option is selected
-			if (!osgi && (rcp != rcpFlag)) return false;
-			//filter out non-UI wizards if UI option is selected
-			return (osgi == osgiFlag && ui == uiFlag);
-		}
-		private boolean getFlag(IConfigurationElement config, String name, boolean defaultValue) {
-			String value = config.getAttribute(name);
-			if (value==null) return defaultValue;
-			return value.equalsIgnoreCase("true"); //$NON-NLS-1$
-		}
-}
-	
-	public TemplateListSelectionPage(ElementList wizardElements, ContentPage page, String message) {
-		super(wizardElements, message);
-		fContentPage = page;
-		setTitle(PDEUIMessages.WizardListSelectionPage_title); 
-		setDescription(PDEUIMessages.WizardListSelectionPage_desc); 
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.WizardListSelectionPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		super.createControl(parent);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IHelpContextIds.NEW_PROJECT_CODE_GEN_PAGE);
-	}
-	
-	public void createAbove(Composite container, int span) {
-		fUseTemplate = new Button(container, SWT.CHECK);
-		fUseTemplate.setText(PDEUIMessages.WizardListSelectionPage_label); 
-		GridData gd = new GridData();
-		gd.horizontalSpan = span;
-		fUseTemplate.setLayoutData(gd);
-		fUseTemplate.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				wizardSelectionViewer.getControl().setEnabled(fUseTemplate.getSelection());
-				if (!fUseTemplate.getSelection())
-					setDescription(""); //$NON-NLS-1$
-				setDescriptionEnabled(fUseTemplate.getSelection());				
-				getContainer().updateButtons();
-			}
-		});
-		fUseTemplate.setSelection(true);
-	}
-	
-	protected void initializeViewer() {
-		wizardSelectionViewer.addFilter(new WizardFilter());
-		if (getInitialTemplateId() != null) 
-			selectInitialTemplate();
-	}
-	
-	private void selectInitialTemplate() {
-		Object [] children = wizardElements.getChildren();
-		for (int i=0; i<children.length; i++) {
-			WizardElement welement = (WizardElement)children[i];
-			if (welement.getID().equals(getInitialTemplateId())) {
-				wizardSelectionViewer.setSelection(new StructuredSelection(welement), true);
-				setSelectedNode(createWizardNode(welement));
-				setDescriptionText(welement.getDescription());	
-				break;
-			}
-		}
-	}
-	
-	protected IWizardNode createWizardNode(WizardElement element) {
-		return new WizardNode(this, element) {
-			public IBasePluginWizard createWizard() throws CoreException {
-				IPluginContentWizard wizard =
-					(IPluginContentWizard) wizardElement.createExecutableExtension();
-				wizard.init(fContentPage.getData());
-				return wizard;
-			}
-		};
-	}
-	
-	public IPluginContentWizard getSelectedWizard() {
-		if (fUseTemplate.getSelection()) 
-			return super.getSelectedWizard();
-		return null;
-	}
-	
-	public boolean isPageComplete() {
-		PluginFieldData data = (PluginFieldData)fContentPage.getData();
-		boolean rcp = data.isRCPApplicationPlugin();
-		
-		return !rcp || (fUseTemplate.getSelection() && rcp && getSelectedNode() != null);
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.WizardSelectionPage#canFlipToNextPage()
-	 */
-	public boolean canFlipToNextPage() {
-		IStructuredSelection ssel = (IStructuredSelection)wizardSelectionViewer.getSelection();
-		return fUseTemplate.getSelection() && ssel != null && !ssel.isEmpty();
-	}
-	/**
-	 * @return Returns the fInitialTemplateId.
-	 */
-	public String getInitialTemplateId() {
-		return fInitialTemplateId;
-	}
-	/**
-	 * @param initialTemplateId The fInitialTemplateId to set.
-	 */
-	public void setInitialTemplateId(String initialTemplateId) {
-		fInitialTemplateId = initialTemplateId;
-	}
-	public void setVisible(boolean visible) {
-		if (visible) {
-			fContentPage.updateData();
-			wizardSelectionViewer.refresh();
-		}
-		super.setVisible(visible);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/BaseProductCreationOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/BaseProductCreationOperation.java
deleted file mode 100644
index c8ede74..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/BaseProductCreationOperation.java
+++ /dev/null

@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.product;
-
-import java.lang.reflect.*;
-import java.util.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.core.iproduct.*;
-import org.eclipse.pde.internal.core.product.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.actions.*;
-import org.eclipse.ui.branding.*;
-import org.eclipse.ui.part.*;
-
-
-public class BaseProductCreationOperation extends WorkspaceModifyOperation {
-
-	private IFile fFile;
-	
-	public BaseProductCreationOperation(IFile file) {
-		fFile = file;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.actions.WorkspaceModifyOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void execute(IProgressMonitor monitor) throws CoreException,
-			InvocationTargetException, InterruptedException {
-		monitor.beginTask(PDEUIMessages.BaseProductCreationOperation_taskName, 2); 
-		createContent();
-		monitor.worked(1);
-        openFile();
-        monitor.done();
-	}
-	
-	private void createContent() {
-        WorkspaceProductModel model = new WorkspaceProductModel(fFile, false);
-        IProduct product = model.getProduct();
-        initializeProduct(product);
-        model.save();
-        model.dispose();
-	}
-	
-	protected void initializeProduct(IProduct product) {
-		IProductModelFactory factory = product.getModel().getFactory();
-		IConfigurationFileInfo info = factory.createConfigFileInfo();
-		info.setUse("default"); //$NON-NLS-1$
-		product.setConfigurationFileInfo(info);
-	}
-	
-	private Properties getProductProperties(IPluginElement element) {
-		Properties prop = new Properties();
-		IPluginObject[] children = element.getChildren();
-		for (int i = 0; i < children.length; i++) {
-			IPluginElement child = (IPluginElement)children[i];
-			if (child.getName().equals("property")) { //$NON-NLS-1$
-				String name = null;
-				String value = null;
-				IPluginAttribute attr = child.getAttribute("name"); //$NON-NLS-1$
-				if (attr != null)
-					name = attr.getValue();
-				attr = child.getAttribute("value"); //$NON-NLS-1$
-				if (attr != null)
-					value = attr.getValue();
-				if (name != null && value != null)
-					prop.put(name, value);
-			}
-		}
-		return prop;
-	}
-	
-	protected IPluginElement getProductExtension(String productId) {
-		int lastDot = productId.lastIndexOf('.');
-		if (lastDot == -1)
-			return null;
-		String pluginId = productId.substring(0, lastDot);
-		IPluginModelBase model = PDECore.getDefault().getModelManager().findModel(pluginId);
-		if (model != null) {
-			IPluginExtension[] extensions = model.getPluginBase().getExtensions();
-			for (int i = 0; i < extensions.length; i++) {
-				if ("org.eclipse.core.runtime.products".equals(extensions[i].getPoint())  //$NON-NLS-1$
-						&& productId.substring(lastDot+1).equals(extensions[i].getId())) {
-					IPluginObject[] children = extensions[i].getChildren();
-					if (children.length > 0) {
-						IPluginElement object = (IPluginElement)children[0];
-						if (object.getName().equals("product")) //$NON-NLS-1$
-							return object;
-					}
-				}
-			}
-		}
-		return null;
-	}
-	
-	protected void initializeProductInfo(IProductModelFactory factory, IProduct product, String id) {
-		product.setId(id);
-		IPluginElement element = getProductExtension(id);
-		if (element != null) {
-			IPluginAttribute attr = element.getAttribute("application"); //$NON-NLS-1$
-			if (attr != null)
-				product.setApplication(attr.getValue());
-			attr = element.getAttribute("name"); //$NON-NLS-1$
-			if (attr != null)
-				product.setName(attr.getValue());
-			Properties prop = getProductProperties(element);
-			String aboutText = prop.getProperty(IProductConstants.ABOUT_TEXT);
-			String aboutImage = prop.getProperty(IProductConstants.ABOUT_IMAGE);
-			if (aboutText != null || aboutImage != null) {
-				IAboutInfo info = factory.createAboutInfo();
-				info.setText(aboutText);
-				info.setImagePath(aboutImage);
-				product.setAboutInfo(info);
-			}
-			IWindowImages winImages = factory.createWindowImages();
-			String path = prop.getProperty(IProductConstants.WINDOW_IMAGES);
-			if (path != null) {
-				StringTokenizer tokenizer = new StringTokenizer(path, ",", true); //$NON-NLS-1$
-				int size = 0;
-				while (tokenizer.hasMoreTokens()) {
-					String token = tokenizer.nextToken();
-					if (token.equals(",")) //$NON-NLS-1$
-						size++;
-					else
-						winImages.setImagePath(token, size);
-				}
-			}
-			product.setWindowImages(winImages);
-		}
-	}
-	
-	protected void addPlugins(IProductModelFactory factory, IProduct product, IPluginModelBase[] plugins) {
-		for (int i = 0; i < plugins.length; i++) {
-			String id = plugins[i].getPluginBase().getId();
-			if (id != null && id.length() > 0) {
-				IProductPlugin plugin = factory.createPlugin();
-				plugin.setId(id);
-				product.addPlugin(plugin);
-			}
-		}		
-	}
-	
-	private void openFile() {
-		Display.getCurrent().asyncExec(new Runnable() {
-			public void run() {
-				IWorkbenchWindow ww = PDEPlugin.getActiveWorkbenchWindow();
-				if (ww == null) {
-					return;
-				}
-				IWorkbenchPage page = ww.getActivePage();
-				if (page == null || !fFile.exists())
-					return;
-				IWorkbenchPart focusPart = page.getActivePart();
-				if (focusPart instanceof ISetSelectionTarget) {
-					ISelection selection = new StructuredSelection(fFile);
-					((ISetSelectionTarget) focusPart).selectReveal(selection);
-				}
-				try {
-					page.openEditor(new FileEditorInput(fFile), PDEPlugin.PRODUCT_EDITOR_ID);
-				} catch (PartInitException e) {
-				}
-			}
-		});
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/NewProductFileAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/NewProductFileAction.java
deleted file mode 100644
index d15fa9a..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/NewProductFileAction.java
+++ /dev/null

@@ -1,39 +0,0 @@
-package org.eclipse.pde.internal.ui.wizards.product;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.util.SWTUtil;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.cheatsheets.ICheatSheetAction;
-import org.eclipse.ui.cheatsheets.ICheatSheetManager;
-
-public class NewProductFileAction extends Action implements ICheatSheetAction {
-	
-	public NewProductFileAction() {
-		super("NewProductFile");  //$NON-NLS-1$
-	}
-	
-	/**
-	 * @see IActionDelegate#run(IAction)
-	 */
-	public void run() {
-		run(new String [] {}, null);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.cheatsheets.ICheatSheetAction#run(java.lang.String[], org.eclipse.ui.cheatsheets.ICheatSheetManager)
-	 */
-	public void run(String[] params, ICheatSheetManager manager) {
-		NewProductFileWizard wizard = new NewProductFileWizard();
-		wizard.init(PlatformUI.getWorkbench(), new StructuredSelection());
-		WizardDialog dialog = new WizardDialog(PDEPlugin.getActiveWorkbenchShell(), wizard);
-		dialog.create();
-		SWTUtil.setDialogSize(dialog, 500, 500);
-		dialog.getShell().setText(wizard.getWindowTitle());
-		int result = dialog.open();
-		notifyResult(result==WizardDialog.OK);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/NewProductFileWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/NewProductFileWizard.java
deleted file mode 100644
index 92d47f2..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/NewProductFileWizard.java
+++ /dev/null

@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.product;
-
-import java.lang.reflect.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.jface.operation.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.wizards.newresource.*;
-
-
-public class NewProductFileWizard extends BasicNewResourceWizard {
-	
-	private ProductFileWizadPage fMainPage;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.Wizard#addPages()
-	 */
-	public void addPages() {
-		fMainPage = new ProductFileWizadPage("product", getSelection()); //$NON-NLS-1$
-		fMainPage.setTitle(PDEUIMessages.NewProductFileWizard_title); 
-		addPage(fMainPage);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.IWizard#performFinish()
-	 */
-	public boolean performFinish() {
-		try {
-			getContainer().run(false, true, getOperation());
-		} catch (InvocationTargetException e) {
-			PDEPlugin.logException(e);
-			return false;
-		} catch (InterruptedException e) {
-			return false;
-		}
-		return true;
-	}
-	
-	private IRunnableWithProgress getOperation() {
-        IFile file = fMainPage.createNewFile();
-		int option = fMainPage.getInitializationOption();
-		if (option == ProductFileWizadPage.USE_LAUNCH_CONFIG)
-			return new ProductFromConfigOperation(file, fMainPage.getSelectedLaunchConfiguration());
-		if (option == ProductFileWizadPage.USE_PRODUCT)
-			return new ProductFromExtensionOperation(file, fMainPage.getSelectedProduct());
-		return new BaseProductCreationOperation(file);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.wizards.newresource.BasicNewResourceWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection currentSelection) {
-		super.init(workbench, currentSelection);
-		setWindowTitle(PDEUIMessages.NewProductFileWizard_windowTitle); 
-		setNeedsProgressMonitor(true);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.wizards.newresource.BasicNewResourceWizard#initializeDefaultPageImageDescriptor()
-	 */
-	protected void initializeDefaultPageImageDescriptor() {
-		setDefaultPageImageDescriptor(PDEPluginImages.DESC_PRODUCT_WIZ);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductDefinitionOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductDefinitionOperation.java
deleted file mode 100644
index a2c39ef..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductDefinitionOperation.java
+++ /dev/null

@@ -1,432 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.product;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.util.Enumeration;
-
-import org.eclipse.core.filebuffers.*;
-import org.eclipse.core.resources.*;
-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.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.operation.*;
-import org.eclipse.jface.text.*;
-import org.eclipse.osgi.util.ManifestElement;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.core.iproduct.*;
-import org.eclipse.pde.internal.core.plugin.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.model.*;
-import org.eclipse.pde.internal.ui.model.bundle.Bundle;
-import org.eclipse.pde.internal.ui.model.bundle.ManifestHeader;
-import org.eclipse.pde.internal.ui.model.plugin.*;
-import org.eclipse.pde.internal.ui.refactoring.BundleManifestChange;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.text.edits.*;
-import org.eclipse.ui.branding.*;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.Constants;
-
-public class ProductDefinitionOperation implements IRunnableWithProgress {
-
-	protected String fPluginId;
-	private String fProductId;
-	private String fApplication;
-	private Shell fShell;
-	private IProduct fProduct;
-	private IDocument fDocument;
-
-	public ProductDefinitionOperation(IProduct product, String pluginId, String productId, String application, Shell shell) {
-		fPluginId = pluginId;
-		fProductId = productId;
-		fApplication = application;
-		fShell = shell;
-		fProduct = product;
-	}
-	
-	public void run(IProgressMonitor monitor) throws InvocationTargetException,
-			InterruptedException {
-		try {
-			IFile file = getFile();
-			if (!file.exists()) {
-				createNewFile(file);
-			} else {
-				modifyExistingFile(file, monitor);
-			}
-			updateManifest(monitor);
-		} catch (CoreException e) {
-			throw new InvocationTargetException(e);
-		} catch (IOException e) {
-			throw new InvocationTargetException(e);
-		} catch (MalformedTreeException e) {
-			throw new InvocationTargetException(e);
-		} catch (BadLocationException e) {
-			throw new InvocationTargetException(e);
-		}
-	}
-	
-	private void updateManifest(IProgressMonitor monitor) throws CoreException, MalformedTreeException, BadLocationException {
-		IFile file = PDECore.getDefault().getModelManager().findModel(fPluginId).getUnderlyingResource().getProject().getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$
-		if (file.exists()) {
-			IStatus status = PDEPlugin.getWorkspace().validateEdit(new IFile[] { file }, fShell);
-			if (status.getSeverity() != IStatus.OK)
-				throw new CoreException(new Status(IStatus.ERROR, "org.eclipse.pde.ui", IStatus.ERROR, NLS.bind(PDEUIMessages.ProductDefinitionOperation_readOnly, fPluginId), null)); //$NON-NLS-1$ 
-
-			ITextFileBufferManager manager = FileBuffers.getTextFileBufferManager();
-			try {
-				manager.connect(file.getFullPath(), monitor);
-				ITextFileBuffer buffer = manager.getTextFileBuffer(file.getFullPath());
-				
-				IDocument document = buffer.getDocument();
-				Bundle bundle = BundleManifestChange.getBundle(file, monitor);
-				if (bundle != null) {
-					ManifestHeader header = bundle.getManifestHeader(Constants.BUNDLE_SYMBOLICNAME);
-					ManifestElement[] elements = new ManifestElement[0];
-					if (header != null)
-						elements = ManifestElement.parseHeader(Constants.BUNDLE_SYMBOLICNAME, header.getValue());
-					if (elements.length != 0 && elements[0] != null) {
-						String replacement = getModifiedElementString(elements[0], 
-																	  Constants.SINGLETON_DIRECTIVE, 
-																	  "true", //$NON-NLS-1$
-																	  true); //$NON-NLS-1$
-						if (replacement != null) {
-							new ReplaceEdit(header.getOffset(), 
-											header.getLength() - 1,
-											header.getName() + ": " + replacement).apply(document); //$NON-NLS-1$
-							buffer.commit(monitor, true);
-						}
-					}
-				}
-			} catch (BundleException e) {
-			} finally {
-				manager.disconnect(file.getFullPath(), monitor);
-			}
-		}
-	}
-	
-	protected static String getModifiedElementString(ManifestElement element, String replacementKey, String replacementValue, boolean isDirective) {
-		String singleton = element.getDirective(replacementKey);
-		if (singleton == null || !(singleton.equals(replacementValue))) {
-			StringBuffer headBuffer = new StringBuffer(element.getValue());
-			// append all existing attributes and directives
-			// except for the replacement directive/attribute
-			Enumeration akeys = element.getKeys();
-			while (akeys != null && akeys.hasMoreElements()) {
-				String key = (String)akeys.nextElement();
-				if (!(!isDirective && key.equals(replacementKey))) {
-					headBuffer.append("; "); //$NON-NLS-1$
-					String[] values = element.getAttributes(key);
-					headBuffer.append(key);
-					headBuffer.append("=\""); //$NON-NLS-1$
-					for (int i = 0; i < values.length; i++) {
-						if (i != 0) headBuffer.append(", "); //$NON-NLS-1$
-						headBuffer.append(values[i]);
-					}
-					headBuffer.append("\""); //$NON-NLS-1$
-				}
-			}
-			Enumeration dkeys = element.getDirectiveKeys();
-			while(dkeys != null && dkeys.hasMoreElements()) {
-				String key = (String)dkeys.nextElement();
-				if (!(isDirective && key.equals(replacementKey))) {
-					headBuffer.append("; "); //$NON-NLS-1$
-					headBuffer.append(key);
-					headBuffer.append(":=\""); //$NON-NLS-1$
-					headBuffer.append(element.getDirective(key));
-					headBuffer.append("\""); //$NON-NLS-1$
-				}
-			}
-			headBuffer.append("; "); //$NON-NLS-1$
-			headBuffer.append(replacementKey);
-			headBuffer.append(isDirective ? ":=\"" : "=\""); //$NON-NLS-1$ //$NON-NLS-2$
-			headBuffer.append(replacementValue);
-			headBuffer.append("\""); //$NON-NLS-1$
-			return headBuffer.toString();
-		}		
-		return null;
-	}
-	
-	private IFile getFile() {
-		IPluginModelBase model = PDECore.getDefault().getModelManager().findModel(fPluginId);
-		IProject project = model.getUnderlyingResource().getProject();
-		String filename = model instanceof IFragmentModel ? "fragment.xml" : "plugin.xml"; //$NON-NLS-1$ //$NON-NLS-2$
-		return project.getFile(filename);	
-	}
-	
-	private IPluginModelBase getModel(IFile file) {
-		if ("plugin.xml".equals(file.getName())) //$NON-NLS-1$
-			return new WorkspacePluginModel(file, false);
-		return new WorkspaceFragmentModel(file, false);
-	}
-
-	private PluginModelBase getEditingModel(boolean isFragment) {
-		if (isFragment) 
-			return new FragmentModel(fDocument, false);
-		return new PluginModel(fDocument, false);
-	}
-
-	private void createNewFile(IFile file) throws CoreException {
-		WorkspacePluginModelBase model = (WorkspacePluginModelBase)getModel(file);
-		IPluginBase base = model.getPluginBase();
-		base.setSchemaVersion("3.0"); //$NON-NLS-1$
-		base.add(createExtension(model));
-		model.save();
-	}
-	
-	private IPluginExtension createExtension(IPluginModelBase model) throws CoreException{
-		IPluginExtension extension = model.getFactory().createExtension();
-		extension.setPoint("org.eclipse.core.runtime.products"); //$NON-NLS-1$
-		extension.setId(fProductId);
-		extension.add(createExtensionContent(extension));
-		return extension;
-	}
-	
-	private IPluginElement createExtensionContent(IPluginExtension extension) throws CoreException  {
-		IPluginElement element = extension.getModel().getFactory().createElement(extension);
-		element.setName("product"); //$NON-NLS-1$
-		element.setAttribute("name", fProduct.getName()); //$NON-NLS-1$
-		element.setAttribute("application", fApplication); //$NON-NLS-1$
-
-		IPluginElement child = createWindowImagesElement(element);
-		if (child != null)
-			element.add(child);
-		
-		child = createAboutTextElement(element);
-		if (child != null)
-			element.add(child);
-			
-		child = createAboutImageElement(element);
-		if (child != null)
-			element.add(child);		
-		
-		return element;
-	}
-	
-	private IPluginElement createAboutTextElement(IPluginElement parent) throws CoreException {
-		String value = getAboutText();
-		IPluginElement element = null;
-		if (value != null && value.length() > 0) {
-			element = parent.getModel().getFactory().createElement(parent);
-			element.setName("property"); //$NON-NLS-1$
-			element.setAttribute("name", IProductConstants.ABOUT_TEXT); //$NON-NLS-1$ 
-			element.setAttribute("value", value); //$NON-NLS-1$ 
-		}
-		return element;
-	}
-	
-	private IPluginElement createAboutImageElement(IPluginElement parent) throws CoreException {
-		String image = getAboutImage();
-		IPluginElement element = null;
-		if (image != null && image.length() > 0) {
-			element = parent.getModel().getFactory().createElement(parent);
-			element.setName("property"); //$NON-NLS-1$
-			element.setAttribute("name", IProductConstants.ABOUT_IMAGE); //$NON-NLS-1$ 
-			element.setAttribute("value", image); //$NON-NLS-1$ 
-		}
-		return element;
-	}
-	
-	private IPluginElement createWindowImagesElement(IPluginElement parent) throws CoreException {
-		IPluginElement element = null;
-		String value = getWindowImagesString();
-		if (value != null) {
-			element = parent.getModel().getFactory().createElement(parent);
-			element.setName("property"); //$NON-NLS-1$
-			element.setAttribute("name", IProductConstants.WINDOW_IMAGES); //$NON-NLS-1$ 
-			element.setAttribute("value", value); //$NON-NLS-1$ 
-		}
-		return element;
-	}
-	
-	private String getAboutText() {
-		IAboutInfo info = fProduct.getAboutInfo();
-		if (info != null) {
-			String text = info.getText();
-			return text == null || text.length() == 0 ? null : text;
-		}
-		return null;
-	}
-	
-	private String getAboutImage() {
-		IAboutInfo info = fProduct.getAboutInfo();
-		return info != null ? getURL(info.getImagePath()) : null;
-	}
-	
-	private String getURL(String location) {
-		if (location == null || location.trim().length() == 0)
-			return null;
-		IPath path = new Path(location);
-		if (!path.isAbsolute())
-			return location;
-		String projectName = path.segment(0);
-		IProject project = PDEPlugin.getWorkspace().getRoot().getProject(projectName);
-		if (project.exists()) {
-			IPluginModelBase model = PDECore.getDefault().getModelManager().findModel(project);
-			if (model != null) {
-				String id = model.getPluginBase().getId();
-				if (fPluginId.equals(id))
-					return path.removeFirstSegments(1).toString();
-				return "platform:/plugin/" + id + "/" + path.removeFirstSegments(1); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		}
-		return location;
-	}
-	
-	private String getWindowImagesString() {
-		IWindowImages images = fProduct.getWindowImages();
-		StringBuffer buffer = new StringBuffer();
-		if (images != null) {
-			String image16 = getURL(images.getImagePath(0));
-			if (image16 != null)
-				buffer.append(image16);
-			buffer.append(","); //$NON-NLS-1$
-			String image32 = getURL(images.getImagePath(1));
-			if (image32 != null) {	
-				buffer.append(image32);
-			}
-			buffer.append(","); //$NON-NLS-1$
-			String image48 = getURL(images.getImagePath(2));
-			if (image48 != null) {
-				buffer.append(image48);
-			}
-			buffer.append(","); //$NON-NLS-1$
-			String image64 = getURL(images.getImagePath(3));
-			if (image64 != null) {
-				buffer.append(image64);
-			}
-			buffer.append(","); //$NON-NLS-1$
-			String image128 = getURL(images.getImagePath(4));
-			if (image128 != null) {
-				buffer.append(image128);
-			}
-		}
-		return buffer.length() == 0 ? null : buffer.toString();
-	}
-	
-	private void modifyExistingFile(IFile file, IProgressMonitor monitor) throws CoreException, IOException, MalformedTreeException, BadLocationException {
-		IStatus status = PDEPlugin.getWorkspace().validateEdit(new IFile[] {file}, fShell);
-		if (status.getSeverity() != IStatus.OK)
-			throw new CoreException(new Status(IStatus.ERROR, "org.eclipse.pde.ui", IStatus.ERROR, NLS.bind(PDEUIMessages.ProductDefinitionOperation_readOnly, fPluginId), null)); //$NON-NLS-1$ 
-		
-		ITextFileBufferManager manager = FileBuffers.getTextFileBufferManager();
-		try {
-			manager.connect(file.getFullPath(), monitor);
-			ITextFileBuffer buffer = manager.getTextFileBuffer(file.getFullPath());
-			
-			fDocument = buffer.getDocument();
-			PluginModelBase model = getEditingModel("fragment.xml".equals(file.getName())); //$NON-NLS-1$
-			try {
-				model.load();
-				if (!model.isLoaded())
-					throw new CoreException(new Status(IStatus.ERROR, "org.eclipse.pde.ui", IStatus.ERROR, NLS.bind(PDEUIMessages.ProductDefinitionOperation_malformed, fPluginId), null)); //$NON-NLS-1$ 
-			} catch (CoreException e) {
-				throw e;
-			}
-			
-			IPluginExtension extension = findProductExtension(model);
-			TextEdit edit = null;
-			if (extension == null) {
-				edit = insertNewExtension(model);
-			} else {
-				edit = modifyExistingExtension(extension);
-			}
-			if (edit != null) {
-				edit.apply(fDocument);
-				buffer.commit(monitor, true);
-			}
-		} finally {
-			manager.disconnect(file.getFullPath(), monitor);
-		}	
-	}
-	
-	private IPluginExtension findProductExtension(IPluginModelBase model) {
-		IPluginExtension[] extensions = model.getPluginBase().getExtensions();
-		for (int i = 0; i < extensions.length; i++) {
-			String point = extensions[i].getPoint();
-			String id = extensions[i].getId();
-			if (fProductId.equals(id) && "org.eclipse.core.runtime.products".equals(point)) { //$NON-NLS-1$
-				return extensions[i];
-			}
-		}
-		return null;
-	}
-	
-	private TextEdit insertNewExtension(IPluginModelBase model) throws BadLocationException, CoreException {
-		IPluginExtension extension = createExtension(model);
-		model.getPluginBase().add(extension);
-		return TextEditUtilities.getInsertOperation((IDocumentNode)extension, fDocument);
-	}
-	
-	private TextEdit modifyExistingExtension(IPluginExtension extension) throws CoreException, MalformedTreeException, BadLocationException {
-		if (extension.getChildCount() == 0) 
-			return insertNewProductElement(extension);
-		
-		PluginElementNode element = (PluginElementNode)extension.getChildren()[0];
-		
-		if (!"product".equals(element.getName())) //$NON-NLS-1$
-			return insertNewProductElement(extension);
-		
-		element.setAttribute("application", fApplication); //$NON-NLS-1$
-		element.setAttribute("name", fProduct.getName()); //$NON-NLS-1$
-		
-		synchronizeChild(element, IProductConstants.ABOUT_IMAGE, getAboutImage());
-		synchronizeChild(element, IProductConstants.ABOUT_TEXT, getAboutText());
-		synchronizeChild(element, IProductConstants.WINDOW_IMAGES, getWindowImagesString());
-		
-		String oldText = fDocument.get(element.getOffset(), element.getLength());
-		String newText = element.write(false);
-		if (oldText.equals(newText))
-			return null;
-		return new ReplaceEdit(element.getOffset(), element.getLength(), newText);
-	}
-	
-	private void synchronizeChild(IPluginElement element, String propertyName, String value) throws CoreException {
-		IPluginElement child = null;
-		IPluginObject[] children = element.getChildren();
-		for (int i = 0; i < children.length; i++) {
-			IPluginElement candidate = (IPluginElement)children[i];
-			if (candidate.getName().equals("property")) { //$NON-NLS-1$
-				IPluginAttribute attr = candidate.getAttribute("name"); //$NON-NLS-1$
-				if (attr != null && attr.getValue().equals(propertyName)) {
-					child = candidate;
-					break;
-				}
-			}
-		}
-		if (child != null && value == null)
-			element.remove(child);
-		
-		if (value == null)
-			return;
-		
-		if (child == null) {
-			child = element.getModel().getFactory().createElement(element);
-			child.setName("property"); //$NON-NLS-1$
-			element.add(child);
-		}
-		child.setAttribute("value", value); //$NON-NLS-1$
-		child.setAttribute("name", propertyName); //$NON-NLS-1$
-	}
-	
-	private TextEdit insertNewProductElement(IPluginExtension extension) throws CoreException {
-		IPluginElement element = createExtensionContent(extension);
-		extension.add(element);
-		return TextEditUtilities.getInsertOperation((IDocumentNode)element, fDocument);
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductDefinitionWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductDefinitionWizard.java
deleted file mode 100644
index 4673a5e..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductDefinitionWizard.java
+++ /dev/null

@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.product;
-
-import java.lang.reflect.*;
-
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.pde.internal.core.iproduct.*;
-import org.eclipse.pde.internal.ui.*;
-
-public class ProductDefinitionWizard extends Wizard {
-
-	private ProductDefinitonWizardPage fMainPage;
-	private String fProductId;
-	private String fPluginId;
-	private String fApplication;
-	private IProduct fProduct;
-
-	public ProductDefinitionWizard(IProduct product) {
-		fProduct = product;
-		setDefaultPageImageDescriptor(PDEPluginImages.DESC_DEFCON_WIZ);
-		setNeedsProgressMonitor(true);
-		setWindowTitle(PDEUIMessages.ProductDefinitionWizard_title);  
-	}
-	
-	public void addPages() {
-		fMainPage = new ProductDefinitonWizardPage("product", fProduct); //$NON-NLS-1$
-		addPage(fMainPage);
-	}
-
-	public boolean performFinish() {
-		try {
-			fProductId = fMainPage.getProductId();
-			fPluginId = fMainPage.getDefiningPlugin();
-			fApplication = fMainPage.getApplication();
-			String newProductName = fMainPage.getProductName();
-			if (newProductName != null)
-				fProduct.setName(newProductName);
-			getContainer().run(
-					false,
-					true,
-					new ProductDefinitionOperation(fProduct,
-							fPluginId, fProductId, fApplication, 
-							getContainer().getShell()));
-		} catch (InvocationTargetException e) {
-			MessageDialog.openError(getContainer().getShell(), PDEUIMessages.ProductDefinitionWizard_error, e.getTargetException().getMessage()); 
-			return false;
-		} catch (InterruptedException e) {
-			return false;
-		}
-		return true;
-	}
-	
-	public String getProductId() {
-		return fPluginId + "." + fProductId; //$NON-NLS-1$
-	}
-	
-	public String getApplication() {
-		return fApplication;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductDefinitonWizardPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductDefinitonWizardPage.java
deleted file mode 100644
index f8d45ca..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductDefinitonWizardPage.java
+++ /dev/null

@@ -1,280 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.product;
-
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.pde.core.plugin.IPluginExtensionPoint;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.TargetPlatform;
-import org.eclipse.pde.internal.core.iproduct.IProduct;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.search.ShowDescriptionAction;
-import org.eclipse.pde.internal.ui.util.SWTUtil;
-import org.eclipse.pde.internal.ui.wizards.PluginSelectionDialog;
-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.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.FormText;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-public class ProductDefinitonWizardPage extends WizardPage implements IHyperlinkListener {
-
-	private Text fProductName;
-	private Text fPluginText;
-	private Text fProductText;
-	private Set fProductSet;
-	private Combo fApplicationCombo;
-	private IProduct fProduct;
-
-	private ModifyListener fListener = new ModifyListener() {
-		public void modifyText(ModifyEvent e) {
-			validatePage();
-		}
-	};
-	
-	public ProductDefinitonWizardPage(String pageName, IProduct product) {
-		super(pageName);
-		fProduct = product;
-		setTitle(PDEUIMessages.ProductDefinitonWizardPage_title);
-		if (productNameDefined())
-			setDescription(PDEUIMessages.ProductDefinitonWizardPage_desc);
-		else
-			setDescription(PDEUIMessages.ProductDefinitonWizardPage_descNoName);
-	}
-
-	public void createControl(Composite parent) {
-		Composite comp = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.verticalSpacing = 20;
-		comp.setLayout(layout);
-		
-		FormToolkit toolkit = new FormToolkit(parent.getDisplay());	
-		createProductGroup(toolkit, comp);		
-		createApplicationGroup(toolkit, comp);
-		toolkit.dispose();
-		setControl(comp);
-		setPageComplete(getPluginId() != null && productNameDefined());
-		Dialog.applyDialogFont(comp);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(comp, IHelpContextIds.PRODUCT_DEFINITIONS_WIZARD);
-	}
-
-	private void createFormText(FormToolkit toolkit, Composite parent, String content, int span) {
-		FormText text = toolkit.createFormText(parent, false);
-		text.setText(content, true, false);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = span;
-		gd.widthHint = 400;
-		text.setLayoutData(gd);
-		text.setBackground(null);
-		text.addHyperlinkListener(this);
-	}
-
-	private void createProductGroup(FormToolkit toolkit, Composite comp) {
-		Group group = new Group(comp, SWT.NONE);
-		group.setText(PDEUIMessages.ProductDefinitonWizardPage_productGroup); 
-		group.setLayout(new GridLayout(3, false));
-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		createFormText(toolkit, group, PDEUIMessages.ProductDefinitonWizardPage_productDefinition, 3); 
-		
-		Label label;
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		
-		if (!productNameDefined()) { //$NON-NLS-1$
-			label = new Label(group, SWT.NONE);
-			label.setText(PDEUIMessages.ProductDefinitonWizardPage_productName); 
-			
-			fProductName = new Text(group, SWT.SINGLE|SWT.BORDER);
-			fProductName.setLayoutData(gd);
-			fProductName.addModifyListener(fListener);
-		}
-		
-		label = new Label(group, SWT.NONE);
-		label.setText(PDEUIMessages.ProductDefinitonWizardPage_plugin); 
-		
-		fPluginText = new Text(group, SWT.SINGLE|SWT.BORDER);
-		fPluginText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		Button button = new Button(group, SWT.PUSH);
-		button.setText(PDEUIMessages.ProductDefinitonWizardPage_browse); 
-		SWTUtil.setButtonDimensionHint(button);
-		button.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleBrowse();
-			}
-		});
-		
-		label = new Label(group, SWT.NONE);
-		label.setText(PDEUIMessages.ProductDefinitonWizardPage_productId); 
-		
-		fProductText = new Text(group, SWT.SINGLE|SWT.BORDER);
-		fProductText.setLayoutData(gd);
-		
-		String pluginId = getPluginId();
-		if (pluginId != null) {
-			fPluginText.setText(pluginId);
-			String productId = "product"; //$NON-NLS-1$
-			String numString = ""; //$NON-NLS-1$
-			int idNum = 1;
-			while (getProductNameSet().contains(pluginId + "." + productId + numString)) { //$NON-NLS-1$
-				numString = Integer.toString(idNum++);
-			}
-			fProductText.setText(productId + numString);
-		}
-		fPluginText.addModifyListener(fListener);
-		fProductText.addModifyListener(fListener);
-		
-	}
-	
-	private void createApplicationGroup(FormToolkit toolkit, Composite comp) {
-		Group group = new Group(comp, SWT.NONE);
-		group.setText(PDEUIMessages.ProductDefinitonWizardPage_applicationGroup); 
-		group.setLayout(new GridLayout(2, false));
-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		createFormText(toolkit, group, PDEUIMessages.ProductDefinitonWizardPage_applicationDefinition, 2); 
-
-		Label label = new Label(group, SWT.NONE);
-		label.setText(PDEUIMessages.ProductDefinitonWizardPage_application); 
-		
-		fApplicationCombo = new Combo(group, SWT.SINGLE|SWT.READ_ONLY);
-		fApplicationCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fApplicationCombo.setItems(TargetPlatform.getApplicationNames());
-		if (fApplicationCombo.getItemCount() > 0)
-			fApplicationCombo.setText(fApplicationCombo.getItem(0));	
-	}
-	
-	public void setVisible(boolean visible) {
-		if (visible) {
-			if (fProductName != null)
-				fProductName.setFocus();
-			else
-				fPluginText.setFocus();
-		}
-		super.setVisible(visible);
-	}
-
-	private void validatePage() {
-		String error = null;
-		String productName = getProductName();
-		if (productName != null && productName.length() == 0) {
-			error = PDEUIMessages.ProductDefinitonWizardPage_noProductName;
-		}  
-		validateIdAndProduct(error);
-	}
-	
-	private void validateIdAndProduct(String error) {
-		if (error == null) {
-			String pluginId = getDefiningPlugin();
-			IPluginModelBase model = PDECore.getDefault().getModelManager().findModel(pluginId);
-			if (pluginId.length() == 0) {
-				error = PDEUIMessages.ProductDefinitonWizardPage_noPluginId; 
-			} else if (model == null){ 
-				error = PDEUIMessages.ProductDefinitonWizardPage_noPlugin; 
-			} else if (model.getUnderlyingResource() == null) {
-				error = PDEUIMessages.ProductDefinitonWizardPage_notInWorkspace; 
-			}
-			if (error == null)
-				error = validateId();
-			if (error == null && getProductNameSet().contains(pluginId + "." + fProductText.getText().trim())) { //$NON-NLS-1$
-				error = PDEUIMessages.ProductDefinitonWizardPage_productExists; 
-			}
-		}
-		setErrorMessage(error);
-		setPageComplete(error == null);
-	}
-	
-	private String validateId() {
-		String id = fProductText.getText().trim();
-		if (id.length() == 0)
-			return PDEUIMessages.ProductDefinitonWizardPage_noProductID; 
-
-		for (int i = 0; i<id.length(); i++){
-			if (!id.substring(i,i+1).matches("[a-zA-Z0-9_]")) //$NON-NLS-1$
-				return PDEUIMessages.ProductDefinitonWizardPage_invalidId; 
-		}
-		return null;
-	}
-
-	public void linkEntered(HyperlinkEvent e) {
-	}
-
-	public void linkExited(HyperlinkEvent e) {
-	}
-
-	public void linkActivated(HyperlinkEvent e) {
-		String extPoint = Platform.PI_RUNTIME + "." + e.getHref().toString(); //$NON-NLS-1$
-		IPluginExtensionPoint point = PDECore.getDefault().findExtensionPoint(extPoint);
-		if (point != null)
-			new ShowDescriptionAction(point, true).run();
-	}
-
-	private void handleBrowse() {
-		PluginSelectionDialog dialog = new PluginSelectionDialog(getShell(), PDECore.getDefault().getModelManager().getWorkspaceModels(), false);
-		if (dialog.open() == PluginSelectionDialog.OK) {
-			IPluginModelBase model = (IPluginModelBase)dialog.getFirstResult();
-			fPluginText.setText(model.getPluginBase().getId());
-		}
-	}
-	
-	private Set getProductNameSet() {
-		if (fProductSet == null)
-			fProductSet = TargetPlatform.getProductNameSet();
-		return fProductSet;
-	}
-	
-	public String getDefiningPlugin() {
-		return fPluginText.getText().trim();
-	}
-	
-	public String getProductId() {
-		return fProductText.getText().trim();
-	}
-	
-	public String getApplication() {
-		return fApplicationCombo.getText();
-	}
-	
-	public String getProductName() {
-		return (fProductName == null) ? null : fProductName.getText().trim();
-	}
-	
-	private boolean productNameDefined() {
-		return (fProduct.getName() != null && !fProduct.getName().equals("")); //$NON-NLS-1$
-	}
-	
-	private String getPluginId() {
-		IProject project = fProduct.getModel().getUnderlyingResource().getProject();
-		IPluginModelBase model = PDECore.getDefault().getModelManager().findModel(project);
-		return (model == null) ? null : model.getPluginBase().getId();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductFileWizadPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductFileWizadPage.java
deleted file mode 100644
index 32b76d7..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductFileWizadPage.java
+++ /dev/null

@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.product;
-
-import java.util.*;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.*;
-import org.eclipse.debug.core.*;
-import org.eclipse.debug.ui.*;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.pde.core.plugin.IPluginExtension;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.swt.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.dialogs.*;
-
-public class ProductFileWizadPage extends WizardNewFileCreationPage {
-	
-	public final static int USE_DEFAULT = 0;
-	public final static int USE_PRODUCT = 1;
-	public final static int USE_LAUNCH_CONFIG = 2;
-	
-	private Button fBasicButton;
-	private Button fProductButton;
-	private Combo fProductCombo;
-	private Button fLaunchConfigButton;
-	private Combo fLaunchConfigCombo;
-	private Group fGroup;
-	
-	private IPluginModelBase fModel;
-	
-	public ProductFileWizadPage(String pageName, IStructuredSelection selection) {
-		super(pageName, selection);
-		setDescription(PDEUIMessages.ProductFileWizadPage_title);
-		initializeModel(selection);
-	}
-	
-	private void initializeModel(IStructuredSelection selection) {
-		Object selected = selection.getFirstElement();
-		if (selected instanceof IAdaptable) {
-			IResource resource = (IResource)((IAdaptable)selected).getAdapter(IResource.class);
-			if (resource != null) {
-				IProject project = resource.getProject();
-				fModel = PDECore.getDefault().getModelManager().findModel(project);
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.dialogs.WizardNewFileCreationPage#createAdvancedControls(org.eclipse.swt.widgets.Composite)
-	 */
-	protected void createAdvancedControls(Composite parent) {
-		fGroup = new Group(parent, SWT.NONE);
-		fGroup.setText(PDEUIMessages.ProductFileWizadPage_groupTitle); 
-		fGroup.setLayout(new GridLayout(2, false));
-		fGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		fBasicButton = new Button(fGroup, SWT.RADIO);
-		GridData gd = new GridData();
-		gd.horizontalSpan = 2;
-		fBasicButton.setLayoutData(gd);
-		fBasicButton.setText(PDEUIMessages.ProductFileWizadPage_basic); 
-		
-		fProductButton = new Button(fGroup, SWT.RADIO);
-		fProductButton.setText(PDEUIMessages.ProductFileWizadPage_existingProduct); 
-		fProductButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				fProductCombo.setEnabled(fProductButton.getSelection());
-			}
-		});
-		
-		fProductCombo = new Combo(fGroup, SWT.SINGLE|SWT.READ_ONLY);
-		fProductCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fProductCombo.setItems(TargetPlatform.getProductNames());
-		
-		fLaunchConfigButton = new Button(fGroup, SWT.RADIO);
-		fLaunchConfigButton.setText(PDEUIMessages.ProductFileWizadPage_existingLaunchConfig); 
-		fLaunchConfigButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				fLaunchConfigCombo.setEnabled(fLaunchConfigButton.getSelection());
-			}
-		});
-		
-		fLaunchConfigCombo = new Combo(fGroup, SWT.SINGLE|SWT.READ_ONLY);
-		fLaunchConfigCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fLaunchConfigCombo.setItems(getLaunchConfigurations());
-		
-		initializeState();
-	}
-	
-	private void initializeState() {
-		fLaunchConfigCombo.setEnabled(false);
-		if (fLaunchConfigCombo.getItemCount() > 0)
-			fLaunchConfigCombo.setText(fLaunchConfigCombo.getItem(0));
-		
-		if (fModel != null && fModel.getPluginBase().getId() != null) {
-			IPluginExtension[] extensions = fModel.getPluginBase().getExtensions();
-			for (int i = 0; i < extensions.length; i++) {
-				String point = extensions[i].getPoint();
-				if ("org.eclipse.core.runtime.products".equals(point)) { //$NON-NLS-1$
-					String id = extensions[i].getId();
-					if (id != null) {
-						String full = fModel.getPluginBase().getId() + "." + id; //$NON-NLS-1$
-						if (fProductCombo.indexOf(full) != -1) {
-							fProductCombo.setText(full);
-							fProductButton.setSelection(true);
-							return;
-						}
-					}
-				}
-			}
-		}
-		
-		fBasicButton.setSelection(true);
-
-		fProductCombo.setEnabled(false);
-		if (fProductCombo.getItemCount() > 0)
-			fProductCombo.setText(fProductCombo.getItem(0));
-
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.dialogs.WizardNewFileCreationPage#validatePage()
-	 */
-	protected boolean validatePage() {
-		if (!getFileName().trim().endsWith(".product")) { //$NON-NLS-1$
-			setErrorMessage(PDEUIMessages.ProductFileWizadPage_error); 
-			return false;
-		}
-		if (getFileName().trim().length() <= 8) {
-			return false;
-		}
-		return super.validatePage();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.dialogs.WizardNewFileCreationPage#validateLinkedResource()
-	 */
-	protected IStatus validateLinkedResource() {
-		return new Status(IStatus.OK, PDEPlugin.getPluginId(), IStatus.OK, "", null); //$NON-NLS-1$
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.dialogs.WizardNewFileCreationPage#createLinkTarget()
-	 */
-	protected void createLinkTarget() {
-	}
-	
-	private String[] getLaunchConfigurations() {
-		ArrayList list = new ArrayList();
-		try {
-			ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager();
-			ILaunchConfigurationType type = manager.getLaunchConfigurationType("org.eclipse.pde.ui.RuntimeWorkbench"); //$NON-NLS-1$
-			ILaunchConfiguration[] configs = manager.getLaunchConfigurations(type);
-			for (int i = 0; i < configs.length; i++) {
-				if (!DebugUITools.isPrivate(configs[i]))
-					list.add(configs[i].getName());
-			}
-		} catch (CoreException e) {
-		}
-		return (String[])list.toArray(new String[list.size()]);
-	}
-	
-	public ILaunchConfiguration getSelectedLaunchConfiguration() {
-		if (!fLaunchConfigButton.getSelection())
-			return null;
-		
-		String configName = fLaunchConfigCombo.getText();
-		try {
-			ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager();
-			ILaunchConfigurationType type = manager.getLaunchConfigurationType("org.eclipse.pde.ui.RuntimeWorkbench"); //$NON-NLS-1$
-			ILaunchConfiguration[] configs = manager.getLaunchConfigurations(type);
-			for (int i = 0; i < configs.length; i++) {
-				if (configs[i].getName().equals(configName) && !DebugUITools.isPrivate(configs[i]))
-					return configs[i];
-			}
-		} catch (CoreException e) {
-		}
-		return null;
-	}
-	
-	public String getSelectedProduct() {
-		return fProductButton.getSelection() ? fProductCombo.getText() : null;
-	}
-	
-	public int getInitializationOption() {
-		if (fBasicButton.getSelection())
-			return USE_DEFAULT;
-		if (fProductButton.getSelection())
-			return USE_PRODUCT;
-		return USE_LAUNCH_CONFIG;
-	}
-	
-	public void createControl(Composite parent) {
-		super.createControl(parent);
-		Dialog.applyDialogFont(fGroup);
-		setFileName(".product"); //$NON-NLS-1$
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductFromConfigOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductFromConfigOperation.java
deleted file mode 100644
index e188585..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductFromConfigOperation.java
+++ /dev/null

@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.product;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.iproduct.IConfigurationFileInfo;
-import org.eclipse.pde.internal.core.iproduct.IProduct;
-import org.eclipse.pde.internal.core.iproduct.IProductModelFactory;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.launcher.LaunchConfigurationHelper;
-import org.eclipse.pde.internal.ui.launcher.LaunchPluginValidator;
-import org.eclipse.pde.ui.launcher.IPDELauncherConstants;
-
-
-public class ProductFromConfigOperation extends BaseProductCreationOperation {
-
-	private ILaunchConfiguration fLaunchConfiguration;
-
-	public ProductFromConfigOperation(IFile file, ILaunchConfiguration config) {
-		super(file);
-		fLaunchConfiguration = config;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.product.BaseProductCreationOperation#initializeProduct(org.eclipse.pde.internal.core.iproduct.IProduct)
-	 */
-	protected void initializeProduct(IProduct product) {
-		if (fLaunchConfiguration == null)
-			return;
-		try {
-			IProductModelFactory factory = product.getModel().getFactory();
-			boolean useProduct = fLaunchConfiguration.getAttribute(IPDELauncherConstants.USE_PRODUCT, false);
-			if (useProduct) {
-				String id = fLaunchConfiguration.getAttribute(IPDELauncherConstants.PRODUCT, (String)null);
-				if (id != null) {
-					initializeProductInfo(factory, product, id);
-				}
-			} else {
-				String appName = fLaunchConfiguration.getAttribute(IPDELauncherConstants.APPLICATION, LaunchConfigurationHelper.getDefaultApplicationName());
-				product.setApplication(appName);
-			}
-			addPlugins(factory, product, getSelectedPlugins());
-			if (fLaunchConfiguration.getAttribute(IPDELauncherConstants.CONFIG_GENERATE_DEFAULT, true)) {
-				super.initializeProduct(product);
-			} else {
-				String path = fLaunchConfiguration.getAttribute(IPDELauncherConstants.CONFIG_TEMPLATE_LOCATION, "/"); //$NON-NLS-1$
-				IContainer container = PDEPlugin.getWorkspace().getRoot().getContainerForLocation(new Path(path));
-				if (container != null) {
-					IConfigurationFileInfo info = factory.createConfigFileInfo();
-					info.setUse("custom"); //$NON-NLS-1$
-					info.setPath(container.getFullPath().toString());
-					product.setConfigurationFileInfo(info);	
-				} else {
-					super.initializeProduct(product);
-				}
-			}
-		} catch (CoreException e) {
-		}	
-	}
-	
-	private IPluginModelBase[] getSelectedPlugins() {
-		try {
-			if (fLaunchConfiguration.getAttribute(IPDELauncherConstants.USE_DEFAULT, true)) {
-				return PDECore.getDefault().getModelManager().getPlugins();
-			}
-			return LaunchPluginValidator.getSelectedPlugins(fLaunchConfiguration);
-		} catch (CoreException e) {
-		}
-		return new IPluginModelBase[0];
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductFromExtensionOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductFromExtensionOperation.java
deleted file mode 100644
index 167d3b0..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductFromExtensionOperation.java
+++ /dev/null

@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.product;
-
-import java.util.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.core.iproduct.*;
-import org.eclipse.pde.internal.ui.launcher.*;
-
-
-public class ProductFromExtensionOperation extends BaseProductCreationOperation {
-	
-	private String fId;
-
-	public ProductFromExtensionOperation(IFile file, String productId) {
-		super(file);
-		fId = productId;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.product.BaseProductCreationOperation#initializeProduct(org.eclipse.pde.internal.core.iproduct.IProduct)
-	 */
-	protected void initializeProduct(IProduct product) {
-		if (fId == null)
-			return;
-		IProductModelFactory factory = product.getModel().getFactory();
-		initializeProductInfo(factory, product, fId);
-		addPlugins(factory, product, getPlugins());
-		super.initializeProduct(product);
-	}
-	
-	private IPluginModelBase[] getPlugins() {
-		int lastDot = fId.lastIndexOf('.');
-		if (lastDot == -1)
-			return new IPluginModelBase[0];
-		
-		TreeMap map = new TreeMap();
-		
-		// add plugin declaring product and its pre-reqs
-		PluginModelManager manager = PDECore.getDefault().getModelManager();
-		IPluginModelBase model = manager.findModel(fId.substring(0, lastDot));
-		if (model != null)
-			RuntimeWorkbenchShortcut.addPluginAndDependencies(model, map);
-		
-		// add plugin declaring product application and its pre-reqs
-		IPluginElement element = getProductExtension(fId);
-		if (element != null) {
-			IPluginAttribute attr = element.getAttribute("application"); //$NON-NLS-1$
-			if (attr != null) {
-				String appId = attr.getValue();
-				lastDot = appId.lastIndexOf('.');
-				if (lastDot != -1) {
-					model = manager.findModel(appId.substring(0, lastDot));
-					if (model != null) {
-						RuntimeWorkbenchShortcut.addPluginAndDependencies(model, map);
-					}
-				}
-			}
-		}
-		return (IPluginModelBase[])map.values().toArray(new IPluginModelBase[map.size()]);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroOperation.java
deleted file mode 100644
index d9382fd..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroOperation.java
+++ /dev/null

@@ -1,459 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.product;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.lang.reflect.InvocationTargetException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-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.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.osgi.util.ManifestElement;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.core.plugin.IExtensionsModelFactory;
-import org.eclipse.pde.core.plugin.IFragmentModel;
-import org.eclipse.pde.core.plugin.IPluginBase;
-import org.eclipse.pde.core.plugin.IPluginElement;
-import org.eclipse.pde.core.plugin.IPluginExtension;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.iproduct.IProduct;
-import org.eclipse.pde.internal.core.plugin.WorkspaceFragmentModel;
-import org.eclipse.pde.internal.core.plugin.WorkspacePluginModel;
-import org.eclipse.pde.internal.core.plugin.WorkspacePluginModelBase;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.model.IDocumentNode;
-import org.eclipse.pde.internal.ui.model.bundle.Bundle;
-import org.eclipse.pde.internal.ui.model.bundle.ManifestHeader;
-import org.eclipse.pde.internal.ui.model.plugin.FragmentModel;
-import org.eclipse.pde.internal.ui.model.plugin.PluginModel;
-import org.eclipse.pde.internal.ui.model.plugin.PluginModelBase;
-import org.eclipse.pde.internal.ui.refactoring.BundleManifestChange;
-import org.eclipse.pde.internal.ui.wizards.templates.ControlStack;
-import org.eclipse.pde.ui.templates.IVariableProvider;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.text.edits.ReplaceEdit;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.Constants;
-
-public class ProductIntroOperation implements IRunnableWithProgress, IVariableProvider {
-
-	protected String fIntroId;
-	protected String fPluginId;
-	private Shell fShell;
-	private IProduct fProduct;
-	private IDocument fDocument;
-	private IProject fProject;
-	private static final String INTRO_POINT = "org.eclipse.ui.intro"; //$NON-NLS-1$
-	private static final String INTRO_CONFIG_POINT = "org.eclipse.ui.intro.config"; //$NON-NLS-1$
-	private static final String INTRO_CLASS = "org.eclipse.ui.intro.config.CustomizableIntroPart"; //$NON-NLS-1$
-	private static final String KEY_PRODUCT_NAME = "productName"; //$NON-NLS-1$
-
-	public ProductIntroOperation(IProduct product, String pluginId, String introId, Shell shell) {
-		fIntroId = introId;
-		fShell = shell;
-		fProduct = product;
-		fPluginId = pluginId;
-		fProject = PDECore.getDefault().getModelManager().findModel(fPluginId).getUnderlyingResource().getProject();
-	}
-
-	public void run(IProgressMonitor monitor) throws InvocationTargetException,
-			InterruptedException {
-		try {
-			IFile file = getFile();
-			if (!file.exists()) {
-				createNewFile(file);
-			} else {
-				modifyExistingFile(file, monitor);
-			}
-			updateManifest(monitor);
-			generateFiles(monitor);
-		} catch (CoreException e) {
-			throw new InvocationTargetException(e);
-		} catch (IOException e) {
-			throw new InvocationTargetException(e);
-		} catch (MalformedTreeException e) {
-			throw new InvocationTargetException(e);
-		} catch (BadLocationException e) {
-			throw new InvocationTargetException(e);
-		}
-	}
-
-	private void updateManifest(IProgressMonitor monitor) throws CoreException, MalformedTreeException, BadLocationException {
-		IFile file = fProject.getFile("META-INF/MANIFEST.MF"); //$NON-NLS-1$
-		if (file.exists()) {
-			IStatus status = PDEPlugin.getWorkspace().validateEdit(new IFile[] { file }, fShell);
-			if (status.getSeverity() != IStatus.OK)
-				throw new CoreException(new Status(IStatus.ERROR, "org.eclipse.pde.ui", IStatus.ERROR, NLS.bind(PDEUIMessages.ProductDefinitionOperation_readOnly, fPluginId), null)); //$NON-NLS-1$ 
-
-			ITextFileBufferManager manager = FileBuffers.getTextFileBufferManager();
-			try {
-				manager.connect(file.getFullPath(), monitor);
-				ITextFileBuffer buffer = manager.getTextFileBuffer(file.getFullPath());
-				
-				IDocument document = buffer.getDocument();
-				Bundle bundle = BundleManifestChange.getBundle(file, monitor);
-				if (bundle != null) {
-					ManifestHeader header = bundle.getManifestHeader(Constants.BUNDLE_SYMBOLICNAME);
-					ManifestElement[] elements = new ManifestElement[0];
-					if (header != null)
-						elements = ManifestElement.parseHeader(Constants.BUNDLE_SYMBOLICNAME, header.getValue());
-					if (elements.length != 0 && elements[0] != null) {
-						String replacement = ProductDefinitionOperation.getModifiedElementString(elements[0], 
-																	  Constants.SINGLETON_DIRECTIVE, 
-																	  "true", //$NON-NLS-1$
-																	  true); //$NON-NLS-1$
-						if (replacement != null) {
-							new ReplaceEdit(header.getOffset(), 
-											header.getLength() - 1,
-											header.getName() + ": " + replacement).apply(document); //$NON-NLS-1$
-							buffer.commit(monitor, true);
-						}
-					}
-				}
-			} catch (BundleException e) {
-			} finally {
-				manager.disconnect(file.getFullPath(), monitor);
-			}
-		}
-	}
-	
-	private IFile getFile() {
-		IPluginModelBase model = PDECore.getDefault().getModelManager().findModel(fPluginId);
-		IProject project = model.getUnderlyingResource().getProject();
-		String filename = model instanceof IFragmentModel ? "fragment.xml" : "plugin.xml"; //$NON-NLS-1$ //$NON-NLS-2$
-		return project.getFile(filename);
-	}
-
-	private IPluginModelBase getModel(IFile file) {
-		if ("plugin.xml".equals(file.getName())) //$NON-NLS-1$
-			return new WorkspacePluginModel(file, false);
-		return new WorkspaceFragmentModel(file, false);
-	}
-
-	private PluginModelBase getEditingModel(boolean isFragment) {
-		if (isFragment)
-			return new FragmentModel(fDocument, false);
-		return new PluginModel(fDocument, false);
-	}
-
-	private void createNewFile(IFile file) throws CoreException {
-		WorkspacePluginModelBase model = (WorkspacePluginModelBase) getModel(file);
-		IPluginBase base = model.getPluginBase();
-		base.setSchemaVersion("3.0"); //$NON-NLS-1$
-		base.add(createIntroExtension(model));
-		base.add(createIntroConfigExtension(model));
-		model.save();
-	}
-
-	private IPluginExtension createIntroExtension(IPluginModelBase model)
-			throws CoreException {
-		IPluginExtension extension = model.getFactory().createExtension();
-		extension.setPoint(INTRO_POINT);
-		extension.add(createIntroExtensionContent(extension));
-		extension.add(createIntroBindingExtensionContent(extension));
-		return extension;
-	}
-
-	private IPluginExtension createIntroConfigExtension(IPluginModelBase model)
-			throws CoreException {
-		IPluginExtension extension = model.getFactory().createExtension();
-		extension.setPoint(INTRO_CONFIG_POINT);
-		extension.add(createIntroConfigExtensionContent(extension));
-		return extension;
-	}
-
-	private IPluginElement createIntroExtensionContent(IPluginExtension extension) throws CoreException {
-		IPluginElement element = extension.getModel().getFactory().createElement(extension);
-		element.setName("intro"); //$NON-NLS-1$
-		element.setAttribute("id", fIntroId); //$NON-NLS-1$
-		element.setAttribute("class", INTRO_CLASS); //$NON-NLS-1$
-		return element;
-	}
-
-	private IPluginElement createIntroBindingExtensionContent(IPluginExtension extension) throws CoreException {
-		IPluginElement element = extension.getModel().getFactory().createElement(extension);
-		element.setName("introProductBinding"); //$NON-NLS-1$
-		element.setAttribute("productId", fProduct.getId()); //$NON-NLS-1$
-		element.setAttribute("introId", fIntroId); //$NON-NLS-1$
-		return element;
-	}
-	
-	private IPluginElement createIntroConfigExtensionContent(
-			IPluginExtension extension) throws CoreException {
-		IPluginElement element = extension.getModel().getFactory()
-				.createElement(extension);
-		element.setName("config"); //$NON-NLS-1$
-		element.setAttribute("id", fPluginId + ".introConfigId"); //$NON-NLS-1$ //$NON-NLS-2$
-		element.setAttribute("introId", fIntroId); //$NON-NLS-1$
-		element.setAttribute("content", "introContent.xml"); //$NON-NLS-1$ //$NON-NLS-2$
-		element.add(createPresentationElement(element));
-
-		return element;
-	}
-
-	private IPluginElement createPresentationElement(IPluginElement parent)
-			throws CoreException {
-		IPluginElement presentation = null;
-		IPluginElement implementation = null;
-		IExtensionsModelFactory factory = parent.getModel().getFactory();
-		
-		presentation = factory.createElement(parent);
-		presentation.setName("presentation"); //$NON-NLS-1$
-		presentation.setAttribute("home-page-id", "root"); //$NON-NLS-1$ //$NON-NLS-2$
-		
-		implementation = factory.createElement(presentation);
-		implementation.setName("implementation"); //$NON-NLS-1$
-		implementation.setAttribute("kind", "html"); //$NON-NLS-1$ //$NON-NLS-2$
-		implementation.setAttribute("style", "content/shared.css"); //$NON-NLS-1$ //$NON-NLS-2$
-		implementation.setAttribute("os", "win32,linux,macosx"); //$NON-NLS-1$ //$NON-NLS-2$
-		
-		presentation.add(implementation);
-		
-		return presentation;
-	}
-
-	private void modifyExistingFile(IFile file, IProgressMonitor monitor)
-			throws CoreException, IOException, MalformedTreeException,
-			BadLocationException {
-		IStatus status = PDEPlugin.getWorkspace().validateEdit(new IFile[] { file }, fShell);
-		if (status.getSeverity() != IStatus.OK)
-			throw new CoreException(new Status(IStatus.ERROR, "org.eclipse.pde.ui", IStatus.ERROR, NLS.bind(PDEUIMessages.ProductDefinitionOperation_readOnly, fPluginId), null)); //$NON-NLS-1$ 
-
-		ITextFileBufferManager manager = FileBuffers.getTextFileBufferManager();
-		try {
-			manager.connect(file.getFullPath(), monitor);
-			ITextFileBuffer buffer = manager.getTextFileBuffer(file.getFullPath());
-
-			fDocument = buffer.getDocument();
-			PluginModelBase model = getEditingModel("fragment.xml".equals(file.getName())); //$NON-NLS-1$
-			try {
-				model.load();
-				if (!model.isLoaded())
-					throw new CoreException(new Status(IStatus.ERROR, "org.eclipse.pde.ui", IStatus.ERROR, NLS.bind(PDEUIMessages.ProductDefinitionOperation_malformed, fPluginId), null)); //$NON-NLS-1$ 
-			} catch (CoreException e) {
-				throw e;
-			}
-			
-			MultiTextEdit multi = new MultiTextEdit();
-			IPluginExtension extension = getExtension(model, INTRO_POINT);
-			if (extension == null) {
-				extension = createIntroExtension(model);
-				model.getPluginBase().add(extension);
-			} else {
-				extension.add(createIntroExtensionContent(extension));
-				extension.add(createIntroBindingExtensionContent(extension));
-			}
-			multi.addChild(TextEditUtilities.getInsertOperation((IDocumentNode) extension, fDocument));
-			
-			extension = getExtension(model, INTRO_CONFIG_POINT);
-			if (extension == null) {
-				extension = createIntroConfigExtension(model);
-				model.getPluginBase().add(extension);
-			} else {
-				extension.add(createIntroConfigExtensionContent(extension));
-			}
-			multi.addChild(TextEditUtilities.getInsertOperation((IDocumentNode) extension, fDocument));
-			
-			multi.apply(fDocument);
-			buffer.commit(monitor, true);
-			
-		} finally {
-			manager.disconnect(file.getFullPath(), monitor);
-		}
-	}
-
-	private IPluginExtension getExtension(IPluginModelBase model,
-			String tPoint) throws CoreException {
-		IPluginExtension[] extensions = model.getPluginBase().getExtensions();
-		for (int i = 0; i < extensions.length; i++) {
-			String point = extensions[i].getPoint();
-			if (tPoint.equals(point)) {
-				return extensions[i];
-			}
-		}
-		return null;
-	}
-	
-	protected void generateFiles(IProgressMonitor monitor) throws CoreException {
-		monitor.setTaskName(PDEUIMessages.AbstractTemplateSection_generating);
-		
-		URL locationUrl = null;
-		try {
-			locationUrl = new URL(PDEPlugin.getDefault().getInstallURL(), "templates_3.1/intro/"); //$NON-NLS-1$
-		} catch (MalformedURLException e1) { return; }
-		if (locationUrl == null) {
-			return;
-		}
-		try {
-			locationUrl = Platform.resolve(locationUrl);
-			locationUrl = Platform.asLocalURL(locationUrl);
-		} catch (IOException e) {
-			return;
-		}
-		if ("file".equals(locationUrl.getProtocol())) { //$NON-NLS-1$
-			File templateDirectory = new File(locationUrl.getFile());
-			if (!templateDirectory.exists())
-				return;
-			generateFiles(templateDirectory, fProject, true, false, monitor);
-		}
-		monitor.subTask(""); //$NON-NLS-1$
-		monitor.worked(1);
-	}
-	
-	
-	private void generateFiles(File src, IContainer dst, boolean firstLevel,
-			boolean binary, IProgressMonitor monitor) throws CoreException {
-		File[] members = src.listFiles();
-
-		for (int i = 0; i < members.length; i++) {
-			File member = members[i];
-			if (member.getName().equals("ext.xml") || //$NON-NLS-1$
-					member.getName().equals("java") || //$NON-NLS-1$
-					member.getName().equals("concept3.xhtml") || //$NON-NLS-1$
-					member.getName().equals("extContent.xhtml")) //$NON-NLS-1$
-				continue;
-			else if (member.isDirectory()) {
-				IContainer dstContainer = null;
-				if (firstLevel) {
-					binary = false;
-					if (member.getName().equals("bin")) { //$NON-NLS-1$
-						binary = true;
-						dstContainer = dst;
-					}
-				}
-				if (dstContainer == null) {
-					dstContainer = dst.getFolder(new Path(member.getName()));
-				}
-				if (dstContainer instanceof IFolder && !dstContainer.exists())
-					((IFolder) dstContainer).create(true, true, monitor);
-				generateFiles(member, dstContainer, false, binary, monitor);
-			} else {
-				if (firstLevel)
-					binary = false;
-				InputStream in = null;
-				try {
-					in = new FileInputStream(member);
-					copyFile(member.getName(), in, dst, binary, monitor);
-				} catch (IOException ioe) {
-				} finally {
-					if (in != null)
-						try {
-							in.close();
-						} catch (IOException ioe2) {
-						}
-				}
-			}
-		}
-	}
-
-	private void copyFile(String fileName, InputStream input, IContainer dst, boolean binary,
-			IProgressMonitor monitor) throws CoreException {
-
-		monitor.subTask(fileName);
-		IFile dstFile = dst.getFile(new Path(fileName));
-
-		try {
-			InputStream stream = getProcessedStream(fileName, input, binary);
-			if (dstFile.exists()) {
-				dstFile.setContents(stream, true, true, monitor);
-			} else {
-				dstFile.create(stream, true, monitor);
-			}
-			stream.close();
-
-		} catch (IOException e) {
-		}
-	}
-	
-
-	private InputStream getProcessedStream(String fileName, InputStream stream,
-			boolean binary) throws IOException, CoreException {
-		if (binary)
-			return stream;
-
-		InputStreamReader reader = new InputStreamReader(stream);
-		int bufsize = 1024;
-		char[] cbuffer = new char[bufsize];
-		int read = 0;
-		StringBuffer keyBuffer = new StringBuffer();
-		StringBuffer outBuffer = new StringBuffer();
-		ControlStack preStack = new ControlStack();
-		preStack.setValueProvider(this);
-
-		boolean replacementMode = false;
-		while (read != -1) {
-			read = reader.read(cbuffer);
-			for (int i = 0; i < read; i++) {
-				char c = cbuffer[i];
-
-				if (preStack.getCurrentState() == false) {
-					continue;
-				}
-
-				if (c == '$') {
-					if (replacementMode) {
-						replacementMode = false;
-						String key = keyBuffer.toString();
-						String value = key.length() == 0 ? "$" //$NON-NLS-1$
-								: getReplacementString(fileName, key);
-						outBuffer.append(value);
-						keyBuffer.delete(0, keyBuffer.length());
-					} else {
-						replacementMode = true;
-					}
-				} else {
-					if (replacementMode)
-						keyBuffer.append(c);
-					else {
-						outBuffer.append(c);
-					}
-				}
-			}
-		}
-		return new ByteArrayInputStream(outBuffer.toString().getBytes(
-				fProject.getDefaultCharset()));
-	}
-	
-	private String getReplacementString(String fileName, String key) {
-		if (key.equals(KEY_PRODUCT_NAME)) {
-			return fProduct.getName();
-		}
-		return key;
-	}
-
-	public Object getValue(String variable) {
-		return null;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroWizard.java
deleted file mode 100644
index 818c71b..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroWizard.java
+++ /dev/null

@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.product;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.pde.internal.core.iproduct.IProduct;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-
-public class ProductIntroWizard extends Wizard {
-
-	private ProductDefinitonWizardPage fProductDefinitionPage;
-	private ProductIntroWizardPage fNewIntroPage;
-	private boolean fNeedNewProduct;
-	private String fIntroId;
-	private String fProductId;
-	private String fPluginId;
-	private String fApplication;
-	private IProduct fProduct;
-	
-	public ProductIntroWizard(IProduct product, boolean needNewProduct) {
-		setDefaultPageImageDescriptor(PDEPluginImages.DESC_DEFCON_WIZ);
-		setNeedsProgressMonitor(true);
-		fProduct = product;
-		fNeedNewProduct = needNewProduct;
-		setWindowTitle(PDEUIMessages.ProductIntroWizard_title);  
-	}
-	
-	public void addPages() {
-		if (fNeedNewProduct)  {
-			fProductDefinitionPage = new ProductDefinitonWizardPage("product", fProduct); //$NON-NLS-1$
-			addPage(fProductDefinitionPage);
-		}
-		fNewIntroPage = new ProductIntroWizardPage("intro", fProduct); //$NON-NLS-1$
-		addPage(fNewIntroPage);
-	}
-
-	public boolean performFinish() {
-		try {
-			if (fNeedNewProduct) {
-				fProductId = fProductDefinitionPage.getProductId();
-				fPluginId = fProductDefinitionPage.getDefiningPlugin();
-				fApplication = fProductDefinitionPage.getApplication();
-				String newProductName = fProductDefinitionPage.getProductName();
-				if (newProductName != null)
-					fProduct.setName(newProductName);
-				fProduct.setId(getProductId());
-				fProduct.setApplication(fApplication);
-				getContainer().run(
-						false,
-						true,
-						new ProductDefinitionOperation(fProduct,
-								fPluginId, fProductId, fApplication, 
-								getContainer().getShell()));
-			}
-			
-			fIntroId = fNewIntroPage.getIntroId();
-			if (fPluginId == null)
-				fPluginId = fNewIntroPage.getDefiningPlugin();
-			getContainer().run(
-					false,
-					true,
-					new ProductIntroOperation(fProduct, fPluginId, fIntroId, getContainer().getShell()));
-		} catch (InvocationTargetException e) {
-			MessageDialog.openError(getContainer().getShell(), PDEUIMessages.ProductDefinitionWizard_error, e.getTargetException().getMessage()); 
-			return false;
-		} catch (InterruptedException e) {
-			return false;
-		}
-		return true;
-	}
-	
-	public String getIntroId() {
-		return fIntroId;
-	}
-	
-	public String getProductId() {
-		return fPluginId + "." + fProductId; //$NON-NLS-1$
-	}
-	
-	public String getApplication() {
-		return fApplication;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroWizardPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroWizardPage.java
deleted file mode 100644
index 2ebeb0b..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroWizardPage.java
+++ /dev/null

@@ -1,247 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.product;
-
-import java.util.TreeSet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.pde.core.plugin.IPluginElement;
-import org.eclipse.pde.core.plugin.IPluginExtension;
-import org.eclipse.pde.core.plugin.IPluginExtensionPoint;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.core.plugin.IPluginObject;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.iproduct.IProduct;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.search.ShowDescriptionAction;
-import org.eclipse.pde.internal.ui.util.SWTUtil;
-import org.eclipse.pde.internal.ui.wizards.PluginSelectionDialog;
-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.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.FormText;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-public class ProductIntroWizardPage extends WizardPage implements IHyperlinkListener {
-
-	private Text fPluginText;
-	private Text fIntroIdText;
-	private TreeSet fIntroIds;
-	private IProduct fProduct;
-
-	private ModifyListener fListener = new ModifyListener() {
-		public void modifyText(ModifyEvent e) {
-			validatePage();
-		}
-	};
-	
-	public ProductIntroWizardPage(String pageName, IProduct product) {
-		super(pageName);
-		setTitle(PDEUIMessages.ProductIntroWizardPage_title); 
-		setDescription(PDEUIMessages.ProductIntroWizardPage_description);
-		fIntroIds = getCurrentIntroIds();
-		fProduct = product;
-	}
-
-	public void createControl(Composite parent) {
-		Composite comp = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.verticalSpacing = 20;
-		comp.setLayout(layout);
-		
-		createProductGroup(comp);		
-
-		setControl(comp);
-		setPageComplete(getPluginId() != null);
-		Dialog.applyDialogFont(comp);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(comp, IHelpContextIds.PRODUCT_DEFINITIONS_WIZARD);
-	}
-
-	private void createProductGroup(Composite comp) {
-		Group group = new Group(comp, SWT.NONE);
-		group.setText(PDEUIMessages.ProductIntroWizardPage_groupText); 
-		group.setLayout(new GridLayout(3, false));
-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		FormToolkit toolkit = new FormToolkit(group.getDisplay());
-		FormText text = toolkit.createFormText(group, false);
-		text.setText(PDEUIMessages.ProductIntroWizardPage_formText, true, false);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 3;
-		gd.widthHint = 400;
-		text.setLayoutData(gd);
-		text.setBackground(null);
-		text.addHyperlinkListener(this);
-		
-		Label label = new Label(group, SWT.NONE);
-		label.setText(PDEUIMessages.ProductIntroWizardPage_targetLabel); 
-		
-		fPluginText = new Text(group, SWT.SINGLE|SWT.BORDER);
-		fPluginText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		Button button = new Button(group, SWT.PUSH);
-		button.setText(PDEUIMessages.ProductIntroWizardPage_browse); 
-		SWTUtil.setButtonDimensionHint(button);
-		button.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleBrowse();
-			}
-		});
-		
-		label = new Label(group, SWT.NONE);
-		label.setText(PDEUIMessages.ProductIntroWizardPage_introLabel); 
-		
-		fIntroIdText = new Text(group, SWT.SINGLE|SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		fIntroIdText.setLayoutData(gd);
-		
-		String pluginId = getPluginId();
-		if (pluginId != null) {
-			fPluginText.setText(pluginId);
-			fIntroIdText.setText(getAvailableIntroId(pluginId));
-		}
-		fPluginText.addModifyListener(fListener);
-		fIntroIdText.addModifyListener(fListener);
-	}
-	
-	
-	public void setVisible(boolean visible) {
-		super.setVisible(visible);
-		if (visible) {
-			fPluginText.setVisible(visible);
-			fPluginText.setFocus();
-		}
-	}
-
-	private void validatePage() {
-		String error = null;
-		String pluginId = getDefiningPlugin();
-		IPluginModelBase model = PDECore.getDefault().getModelManager().findModel(pluginId);
-		if (model == null){ 
-			error = PDEUIMessages.ProductDefinitonWizardPage_noPlugin; 
-		} else if (model.getUnderlyingResource() == null) {
-			error = PDEUIMessages.ProductDefinitonWizardPage_notInWorkspace; 
-		} else if (pluginId.length() == 0) {
-			error = PDEUIMessages.ProductIntroWizardPage_targetNotSet; 
-		}
-		validateId(error);
-
-	}
-	
-	private void validateId(String error) {
-		if (error == null) {
-			String id = fIntroIdText.getText().trim();
-			
-			if (id.length() == 0)
-				error = PDEUIMessages.ProductIntroWizardPage_introNotSet; 
-			
-			if (error == null)
-				for (int i = 0; i < id.length(); i++)
-					if (!id.substring(i,i+1).matches("[a-zA-Z0-9.]")) //$NON-NLS-1$
-						error = PDEUIMessages.ProductIntroWizardPage_invalidIntroId; 
-			
-			if (error == null && fIntroIds.contains(id))
-				error = PDEUIMessages.ProductIntroWizardPage_introIdExists;
-		}
-		setErrorMessage(error);
-		setPageComplete(error == null);
-	}
-
-	private void handleBrowse() {
-		PluginSelectionDialog dialog = new PluginSelectionDialog(getShell(), PDECore.getDefault().getModelManager().getWorkspaceModels(), false);
-		if (dialog.open() == PluginSelectionDialog.OK) {
-			IPluginModelBase model = (IPluginModelBase)dialog.getFirstResult();
-			String id = model.getPluginBase().getId();
-			fPluginText.setText(id);
-			fIntroIdText.setText(getAvailableIntroId(id)); 
-		}
-	}
-	
-	
-	private String getAvailableIntroId(String id) {
-		String introId = "intro"; //$NON-NLS-1$
-		String numString = ""; //$NON-NLS-1$
-		int idNum = 1;
-		while (fIntroIds.contains(id + "." + introId + numString)) { //$NON-NLS-1$
-			numString = Integer.toString(idNum++);
-		}
-		return id + "." + introId + numString; //$NON-NLS-1$
-	}
-
-	private TreeSet getCurrentIntroIds() {
-		String introId;
-		TreeSet result = new TreeSet();
-		IPluginModelBase[] plugins = PDECore.getDefault().getModelManager().getPlugins();
-		for (int i = 0; i < plugins.length; i++) {
-			IPluginExtension[] extensions = plugins[i].getPluginBase().getExtensions();
-			for (int j = 0; j < extensions.length; j++) {
-				String point = extensions[j].getPoint();
-				if (point != null && point.equals("org.eclipse.ui.intro")) {//$NON-NLS-1$
-					IPluginObject[] children = extensions[j].getChildren();
-					for (int k = 0; k < children.length; k++) {
-						IPluginElement element = (IPluginElement)children[k];
-						if ("intro".equals(element.getName())) {//$NON-NLS-1$
-							introId = element.getAttribute("id").getValue(); //$NON-NLS-1$
-							if (introId != null)
-								result.add(introId);
-						}
-					}
-				}
-			}
-		}
-		return result;
-	}
-	
-	
-	public String getDefiningPlugin() {
-		return fPluginText.getText().trim();
-	}
-	
-	public String getIntroId() {
-		return fIntroIdText.getText().trim();
-	}
-
-	private String getPluginId() {
-		IProject project = fProduct.getModel().getUnderlyingResource().getProject();
-		IPluginModelBase model = PDECore.getDefault().getModelManager().findModel(project);
-		return (model == null) ? null : model.getPluginBase().getId();
-	}
-
-	public void linkEntered(HyperlinkEvent e) {
-	}
-
-	public void linkExited(HyperlinkEvent e) {
-	}
-
-	public void linkActivated(HyperlinkEvent e) {
-		String extPoint = "org.eclipse.ui." + e.getHref().toString(); //$NON-NLS-1$
-		IPluginExtensionPoint point = PDECore.getDefault().findExtensionPoint(extPoint);
-		if (point != null)
-			new ShowDescriptionAction(point, true).run();
-		
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/SynchronizationOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/SynchronizationOperation.java
deleted file mode 100644
index db86f5a..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/SynchronizationOperation.java
+++ /dev/null

@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.product;
-
-import java.lang.reflect.*;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.core.iproduct.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.swt.widgets.*;
-
-
-public class SynchronizationOperation extends ProductDefinitionOperation {
-
-	public SynchronizationOperation(IProduct product, Shell shell) {
-		super(product, getPluginId(product), getProductId(product), product.getApplication(), shell);
-	}
-	
-	private static String getProductId(IProduct product) {
-		String full = product.getId();
-		int index = full.lastIndexOf('.');
-		return index != -1 ? full.substring(index + 1) : full;
-	}
-	
-	private static String getPluginId(IProduct product) {
-		String full = product.getId();
-		int index = full.lastIndexOf('.');
-		return index != -1 ? full.substring(0, index) : full;
-	}
-	
-	public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-		IPluginModelBase model = PDECore.getDefault().getModelManager().findModel(fPluginId);
-		if (model == null) {
-			String message = PDEUIMessages.SynchronizationOperation_noDefiningPlugin; 
-			throw new InvocationTargetException(createCoreException(message));
-		}
-		
-		if (model.getUnderlyingResource() == null) {
-			String id = model.getPluginBase().getId();
-			String message = PDEUIMessages.SynchronizationOperation_externalPlugin; 
-			throw new InvocationTargetException(createCoreException(NLS.bind(message, id)));
-		}
-		
-		super.run(monitor);	
-	}
-	
-	private CoreException createCoreException(String message) {
-		IStatus status = new Status(IStatus.ERROR, "org.eclipse.pde.ui", IStatus.ERROR, message, null); //$NON-NLS-1$
-		return new CoreException(status);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/TextEditUtilities.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/TextEditUtilities.java
deleted file mode 100644
index 0b5d239..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/TextEditUtilities.java
+++ /dev/null

@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.product;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.TextUtilities;
-import org.eclipse.pde.internal.core.util.CoreUtility;
-import org.eclipse.pde.internal.ui.model.IDocumentAttribute;
-import org.eclipse.pde.internal.ui.model.IDocumentNode;
-import org.eclipse.text.edits.InsertEdit;
-import org.eclipse.text.edits.ReplaceEdit;
-import org.eclipse.text.edits.TextEdit;
-
-public class TextEditUtilities {
-
-	public static TextEdit getInsertOperation(IDocumentNode node, IDocument doc) {
-		node = getHighestNodeToBeWritten(node, doc);
-		if (node.getParentNode() == null)
-			return new InsertEdit(0, node.write(true));
-
-		if (node.getOffset() > -1) {
-			// this is an element that was of the form <element/>
-			// it now needs to be broken up into <element><new/></element>
-			return new ReplaceEdit(node.getOffset(), node.getLength(), node.write(false));
-		} 
-		// try to insert after last sibling that has an offset
-		TextEdit op = insertAfterSibling(node, doc);
-		
-		// insert as first child of its parent if op is null
-		return (op != null) ? op : insertAsFirstChild(node, doc);
-	}
-	
-	public static TextEdit addAttributeOperation(IDocumentAttribute attr, String newValue, IDocument doc) {
-		int offset = attr.getValueOffset();
-		if (offset > -1)
-			return new ReplaceEdit(offset, attr.getValueLength(), CoreUtility.getWritableString(newValue));
-
-		IDocumentNode node = attr.getEnclosingElement();
-		if (node.getOffset() > -1) {
-			int len = getNextPosition(doc, node.getOffset(), '>');
-			return new ReplaceEdit(node.getOffset(), len + 1, node.writeShallow(shouldTerminateElement(doc, node.getOffset()+ len)));
-		}
-		return getInsertOperation(node, doc);
-	}
-	
-	private static boolean shouldTerminateElement(IDocument doc, int offset) {
-		try {
-			return doc.get(offset-1, 1).toCharArray()[0] == '/';
-		} catch (BadLocationException e) {
-		}
-		return false;
-	}
-
-	private static IDocumentNode getHighestNodeToBeWritten(IDocumentNode node, IDocument doc) {
-		IDocumentNode parent = node.getParentNode();
-		if (parent == null)
-			return node;
-		if (parent.getOffset() > -1) {
-			try {
-				String endChars = doc.get(parent.getOffset() + parent.getLength() - 2, 2);
-				return ("/>".equals(endChars)) ? parent : node; //$NON-NLS-1$
-			} catch (BadLocationException e) {
-				return node;
-			}
-			
-		}
-		return getHighestNodeToBeWritten(parent, doc);
-	}
-
-	private static InsertEdit insertAfterSibling(IDocumentNode node, IDocument doc) {
-		IDocumentNode sibling = node.getPreviousSibling();
-		for (;;) {
-			if (sibling == null)
-				break;
-			if (sibling.getOffset() > -1) {
-				node.setLineIndent(sibling.getLineIndent());
-				String sep = TextUtilities.getDefaultLineDelimiter(doc);
-				return new InsertEdit(sibling.getOffset() + sibling.getLength(), sep + node.write(true)); 
-			}
-			sibling = sibling.getPreviousSibling();
-		}
-		return null;
-	}
-	
-	private static InsertEdit insertAsFirstChild(IDocumentNode node, IDocument doc) {
-		int offset = node.getParentNode().getOffset();
-		int length = getNextPosition(doc, offset, '>');
-		node.setLineIndent(node.getParentNode().getLineIndent() + 3);
-		String sep = TextUtilities.getDefaultLineDelimiter(doc);
-		return new InsertEdit(offset+ length + 1, sep + node.write(true));	 
-	}
-	
-	private static int getNextPosition(IDocument doc, int offset, char ch) {
-		int i = 0;
-		try {
-			for (i = 0; i + offset < doc.getLength() ;i++) {
-				if (ch == doc.get(offset + i, 1).toCharArray()[0])
-					break;
-			}
-		} catch (BadLocationException e) {
-		}
-		return i;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/site/NewSiteProjectCreationOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/site/NewSiteProjectCreationOperation.java
deleted file mode 100644
index cd74679..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/site/NewSiteProjectCreationOperation.java
+++ /dev/null

@@ -1,451 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.site;
-
-import java.io.ByteArrayInputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.pde.internal.PDE;
-import org.eclipse.pde.internal.core.site.WorkspaceSiteModel;
-import org.eclipse.pde.internal.core.util.CoreUtility;
-import org.eclipse.pde.internal.ui.IPDEUIConstants;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.ISetSelectionTarget;
-
-
-public class NewSiteProjectCreationOperation extends WorkspaceModifyOperation {
-	private Display fDisplay;
-	private IProject fProject;
-	private IPath fPath;
-	private String fWebLocation;
-	
-	public NewSiteProjectCreationOperation(Display display, IProject project, IPath path, String webLocation) {
-		fDisplay = display;
-		fProject = project;
-		fPath = path;
-		fWebLocation = webLocation;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.actions.WorkspaceModifyOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void execute(IProgressMonitor monitor) throws CoreException,
-			InvocationTargetException, InterruptedException {
-		int numUnits = fWebLocation == null ? 3 : 4;
-		
-		monitor.beginTask(PDEUIMessages.NewSiteWizard_creatingProject, numUnits); 
-
-		CoreUtility.createProject(fProject, fPath, monitor);		
-		fProject.open(monitor);
-		CoreUtility.addNatureToProject(fProject, PDE.SITE_NATURE, monitor);
-		monitor.worked(1);
-		
-		if (fWebLocation != null){
-			CoreUtility.createFolder(fProject.getFolder(fWebLocation));
-			createXSLFile();
-			createCSSFile();
-			createHTMLFile();
-			monitor.worked(1);
-		}
-	
-		monitor.subTask(PDEUIMessages.NewSiteWizard_creatingManifest); 
-		IFile file = createSiteManifest();
-		monitor.worked(1);
-		
-		openFile(file);
-		monitor.worked(1);
-		
-	}
-
-	private IFile createSiteManifest() throws CoreException {
-		IFile file = fProject.getFile("site.xml"); //$NON-NLS-1$
-		if (file.exists()) return file;
-		
-		WorkspaceSiteModel model = new WorkspaceSiteModel(file);
-		model.getSite();
-		// Save the model
-		model.save();
-		model.dispose();			
-		// Set the default editor
-		IDE.setDefaultEditor(file, IPDEUIConstants.SITE_EDITOR_ID);
-		return file;
-	}
-	
-    private void openFile(final IFile file) {
-		fDisplay.asyncExec(new Runnable() {
-			public void run() {
-				IWorkbenchWindow ww = PDEPlugin.getActiveWorkbenchWindow();
-				if (ww == null) {
-					return;
-				}
-				IWorkbenchPage page = ww.getActivePage();
-				if (page == null || !file.exists())
-					return;
-				IWorkbenchPart focusPart = page.getActivePart();
-				if (focusPart instanceof ISetSelectionTarget) {
-					ISelection selection = new StructuredSelection(file);
-					((ISetSelectionTarget) focusPart).selectReveal(selection);
-				}
-				try {
-					page.openEditor(new FileEditorInput(file),
-							IPDEUIConstants.SITE_EDITOR_ID);
-				} catch (PartInitException e) {
-				}
-			}
-		});
-	}
-
-	private void createHTMLFile(){
-		StringWriter swriter = new StringWriter();
-		PrintWriter writer = new PrintWriter(swriter);
-		
-		writer.println("<html>"); //$NON-NLS-1$
-		writer.println("<head>"); //$NON-NLS-1$
-		writer.println("<title>"+fProject.getName()+"</title>"); //$NON-NLS-1$ //$NON-NLS-2$
-		writer.println("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">"); //$NON-NLS-1$
-		writer.println("<style>@import url(\""+fWebLocation+"/site.css\");</style>"); //$NON-NLS-1$ //$NON-NLS-2$
-		writer.println("<script type=\"text/javascript\">"); //$NON-NLS-1$
-		writer.println("	var returnval = 0;"); //$NON-NLS-1$
-		writer.println("	var stylesheet, xmlFile, cache, doc;"); //$NON-NLS-1$
-		writer.println("	function init(){"); //$NON-NLS-1$
-		writer.println("		// NSCP 7.1+ / Mozilla 1.4.1+ / Safari"); //$NON-NLS-1$
-		writer.println("		// Use the standard DOM Level 2 technique, if it is supported"); //$NON-NLS-1$
-		writer.println("		if (document.implementation && document.implementation.createDocument) {"); //$NON-NLS-1$
-		writer.println("			xmlFile = document.implementation.createDocument(\"\", \"\", null);"); //$NON-NLS-1$
-		writer.println("			stylesheet = document.implementation.createDocument(\"\", \"\", null);"); //$NON-NLS-1$
-		writer.println("			if (xmlFile.load){"); //$NON-NLS-1$
-		writer.println("				xmlFile.load(\"site.xml\");"); //$NON-NLS-1$
-		writer.println("				stylesheet.load(\""+fWebLocation+"/site.xsl\");"); //$NON-NLS-1$ //$NON-NLS-2$
-		writer.println("			} else {"); //$NON-NLS-1$
-		writer.println("				alert(\"" + PDEUIMessages.SiteHTML_loadError + "\");"); //$NON-NLS-1$ //$NON-NLS-2$ 
-		writer.println("			}"); //$NON-NLS-1$
-		writer.println("			xmlFile.addEventListener(\"load\", transform, false);"); //$NON-NLS-1$
-		writer.println("			stylesheet.addEventListener(\"load\", transform, false);"); //$NON-NLS-1$
-		writer.println("		}"); //$NON-NLS-1$
-		writer.println("		//IE 6.0+ solution"); //$NON-NLS-1$
-		writer.println("		else if (window.ActiveXObject) {"); //$NON-NLS-1$
-		writer.println("			xmlFile = new ActiveXObject(\"msxml2.DOMDocument.3.0\");"); //$NON-NLS-1$
-		writer.println("			xmlFile.async = false;"); //$NON-NLS-1$
-		writer.println("			xmlFile.load(\"site.xml\");"); //$NON-NLS-1$
-		writer.println("			stylesheet = new ActiveXObject(\"msxml2.FreeThreadedDOMDocument.3.0\");"); //$NON-NLS-1$
-		writer.println("			stylesheet.async = false;"); //$NON-NLS-1$
-		writer.println("			stylesheet.load(\""+fWebLocation+"/site.xsl\");"); //$NON-NLS-1$ //$NON-NLS-2$
-		writer.println("			cache = new ActiveXObject(\"msxml2.XSLTemplate.3.0\");"); //$NON-NLS-1$
-		writer.println("			cache.stylesheet = stylesheet;"); //$NON-NLS-1$
-		writer.println("			transformData();"); //$NON-NLS-1$
-		writer.println("		}"); //$NON-NLS-1$
-		writer.println("	}"); //$NON-NLS-1$
-		writer.println("	// separate transformation function for IE 6.0+"); //$NON-NLS-1$
-		writer.println("	function transformData(){"); //$NON-NLS-1$
-		writer.println("		var processor = cache.createProcessor();"); //$NON-NLS-1$
-		writer.println("		processor.input = xmlFile;"); //$NON-NLS-1$
-		writer.println("		processor.transform();"); //$NON-NLS-1$
-		writer.println("		data.innerHTML = processor.output;"); //$NON-NLS-1$
-		writer.println("	}"); //$NON-NLS-1$
-		writer.println("	// separate transformation function for NSCP 7.1+ and Mozilla 1.4.1+ "); //$NON-NLS-1$
-		writer.println("	function transform(){"); //$NON-NLS-1$
-		writer.println("		returnval+=1;"); //$NON-NLS-1$
-		writer.println("		if (returnval==2){"); //$NON-NLS-1$
-		writer.println("			var processor = new XSLTProcessor();"); //$NON-NLS-1$
-		writer.println("			processor.importStylesheet(stylesheet); "); //$NON-NLS-1$
-		writer.println("			doc = processor.transformToDocument(xmlFile);"); //$NON-NLS-1$
-		writer.println("			document.getElementById(\"data\").innerHTML = doc.documentElement.innerHTML;"); //$NON-NLS-1$
-		writer.println("		}"); //$NON-NLS-1$
-		writer.println("	}"); //$NON-NLS-1$
-		writer.println("</script>"); //$NON-NLS-1$
-		writer.println("</head>"); //$NON-NLS-1$
-		writer.println("<body onload=\"init();\">"); //$NON-NLS-1$
-		writer.println("<!--[insert static HTML here]-->"); //$NON-NLS-1$
-		writer.println("<div id=\"data\"><!-- this is where the transformed data goes --></div>"); //$NON-NLS-1$
-		writer.println("</body>"); //$NON-NLS-1$
-		writer.println("</html>"); //$NON-NLS-1$
-
-		writer.flush();
-		writeFile(fProject.getFile("index.html"), swriter); //$NON-NLS-1$
-	}
-		
-	private void createCSSFile(){
-		StringWriter swriter = new StringWriter();
-		PrintWriter writer = new PrintWriter(swriter);
-		writer.println("<STYLE type=\"text/css\">"); //$NON-NLS-1$
-		writer.println("td.spacer {padding-bottom: 10px; padding-top: 10px;}"); //$NON-NLS-1$
-		writer.println(".title { font-family: sans-serif; color: #99AACC;}"); //$NON-NLS-1$
-		writer.println(".bodyText { font-family: sans-serif; font-size: 9pt; color:#000000;  }"); //$NON-NLS-1$
-		writer.println(".sub-header { font-family: sans-serif; font-style: normal; font-weight: bold; font-size: 9pt; color: white;}"); //$NON-NLS-1$
-		writer.println(".log-text {font-family: sans-serif; font-style: normal; font-weight: lighter; font-size: 8pt; color:black;}"); //$NON-NLS-1$
-		writer.println(".big-header { font-family: sans-serif; font-style: normal; font-weight: bold; font-size: 9pt; color: white; border-top:10px solid white;}"); //$NON-NLS-1$
-		writer.println(".light-row {background:#FFFFFF}"); //$NON-NLS-1$
-		writer.println(".dark-row {background:#EEEEFF}"); //$NON-NLS-1$
-		writer.println(".header {background:#99AADD}"); //$NON-NLS-1$
-		writer.println("#indent {word-wrap : break-word;width :300px;text-indent:10px;}"); //$NON-NLS-1$
-		writer.println("</STYLE>"); //$NON-NLS-1$
-
-		writer.flush();
-		writeFile(fProject.getFile(fWebLocation + "/site.css"), swriter); //$NON-NLS-1$
-	}
-
-	private void createXSLFile(){
-		StringWriter swriter = new StringWriter();
-		PrintWriter writer = new PrintWriter(swriter);
-		writer.println("<xsl:stylesheet version = '1.0' xmlns:xsl='http://www.w3.org/1999/XSL/Transform' xmlns:msxsl=\"urn:schemas-microsoft-com:xslt\">"); //$NON-NLS-1$
-		writer.println("<xsl:output method=\"html\" encoding=\"UTF-8\"/>"); //$NON-NLS-1$
-		writer.println("<xsl:key name=\"cat\" match=\"category\" use=\"@name\"/>"); //$NON-NLS-1$
-		writer.println("<xsl:template match=\"/\">"); //$NON-NLS-1$
-		writer.println("<xsl:for-each select=\"site\">"); //$NON-NLS-1$
-		writer.println("	<html>"); //$NON-NLS-1$
-		writer.println("	<head>"); //$NON-NLS-1$
-		writer.println("	<title>"+fProject.getName()+"</title>"); //$NON-NLS-1$ //$NON-NLS-2$
-		writer.println("	<style>@import url(\"" + fWebLocation + "/site.css\");</style>"); //$NON-NLS-1$ //$NON-NLS-2$
-		writer.println("	</head>"); //$NON-NLS-1$
-		writer.println("	<body>"); //$NON-NLS-1$
-		writer.println("	<h1 class=\"title\">" + fProject.getName() +"</h1>"); //$NON-NLS-1$ //$NON-NLS-2$
-		writer.println("	<p class=\"bodyText\"><xsl:value-of select=\"description\"/></p>"); //$NON-NLS-1$
-		writer.println("	<table width=\"100%\" border=\"0\" cellspacing=\"1\" cellpadding=\"2\">"); //$NON-NLS-1$
-		writer.println("	<xsl:for-each select=\"category-def\">"); //$NON-NLS-1$
-		writer.println("		<xsl:sort select=\"@label\" order=\"ascending\" case-order=\"upper-first\"/>"); //$NON-NLS-1$
-		writer.println("		<xsl:sort select=\"@name\" order=\"ascending\" case-order=\"upper-first\"/>"); //$NON-NLS-1$
-		writer.println("	<xsl:if test=\"count(key('cat',@name)) != 0\">"); //$NON-NLS-1$
-		writer.println("			<tr class=\"header\">"); //$NON-NLS-1$
-		writer.println("				<td class=\"sub-header\" width=\"30%\">"); //$NON-NLS-1$
-		writer.println("					<xsl:value-of select=\"@name\"/>"); //$NON-NLS-1$
-		writer.println("				</td>"); //$NON-NLS-1$
-		writer.println("				<td class=\"sub-header\" width=\"70%\">"); //$NON-NLS-1$
-		writer.println("					<xsl:value-of select=\"@label\"/>"); //$NON-NLS-1$
-		writer.println("				</td>"); //$NON-NLS-1$
-		writer.println("			</tr>"); //$NON-NLS-1$
-		writer.println("			<xsl:for-each select=\"key('cat',@name)\">"); //$NON-NLS-1$
-		writer.println("			<xsl:sort select=\"ancestor::feature//@version\" order=\"ascending\"/>"); //$NON-NLS-1$
-		writer.println("			<xsl:sort select=\"ancestor::feature//@id\" order=\"ascending\" case-order=\"upper-first\"/>"); //$NON-NLS-1$
-		writer.println("			<tr>"); //$NON-NLS-1$
-		writer.println("				<xsl:choose>"); //$NON-NLS-1$
-		writer.println("				<xsl:when test=\"(position() mod 2 = 1)\">"); //$NON-NLS-1$
-		writer.println("					<xsl:attribute name=\"class\">dark-row</xsl:attribute>"); //$NON-NLS-1$
-		writer.println("				</xsl:when>"); //$NON-NLS-1$
-		writer.println("				<xsl:otherwise>"); //$NON-NLS-1$
-		writer.println("					<xsl:attribute name=\"class\">light-row</xsl:attribute>"); //$NON-NLS-1$
-		writer.println("				</xsl:otherwise>"); //$NON-NLS-1$
-		writer.println("				</xsl:choose>"); //$NON-NLS-1$
-		writer.println("				<td class=\"log-text\" id=\"indent\">"); //$NON-NLS-1$
-		writer.println("						<xsl:choose>"); //$NON-NLS-1$
-		writer.println("						<xsl:when test=\"ancestor::feature//@label\">"); //$NON-NLS-1$
-		writer.println("							<a href=\"{ancestor::feature//@url}\"><xsl:value-of select=\"ancestor::feature//@label\"/></a>"); //$NON-NLS-1$
-		writer.println("							<br/>"); //$NON-NLS-1$
-		writer.println("							<div id=\"indent\">"); //$NON-NLS-1$
-		writer.println("							(<xsl:value-of select=\"ancestor::feature//@id\"/> - <xsl:value-of select=\"ancestor::feature//@version\"/>)"); //$NON-NLS-1$
-		writer.println("							</div>"); //$NON-NLS-1$
-		writer.println("						</xsl:when>"); //$NON-NLS-1$
-		writer.println("						<xsl:otherwise>"); //$NON-NLS-1$
-		writer.println("						<a href=\"{ancestor::feature//@url}\"><xsl:value-of select=\"ancestor::feature//@id\"/> - <xsl:value-of select=\"ancestor::feature//@version\"/></a>"); //$NON-NLS-1$
-		writer.println("						</xsl:otherwise>"); //$NON-NLS-1$
-		writer.println("						</xsl:choose>"); //$NON-NLS-1$
-		writer.println("						<br />"); //$NON-NLS-1$
-		writer.println("				</td>"); //$NON-NLS-1$
-		writer.println("				<td>"); //$NON-NLS-1$
-		writer.println("					<table>"); //$NON-NLS-1$
-		writer.println("						<xsl:if test=\"ancestor::feature//@os\">"); //$NON-NLS-1$
-		writer.println("							<tr><td class=\"log-text\" id=\"indent\">Operating Systems:</td>"); //$NON-NLS-1$
-		writer.println("							<td class=\"log-text\" id=\"indent\"><xsl:value-of select=\"ancestor::feature//@os\"/></td>"); //$NON-NLS-1$
-		writer.println("							</tr>"); //$NON-NLS-1$
-		writer.println("						</xsl:if>"); //$NON-NLS-1$
-		writer.println("						<xsl:if test=\"ancestor::feature//@ws\">"); //$NON-NLS-1$
-		writer.println("							<tr><td class=\"log-text\" id=\"indent\">Windows Systems:</td>"); //$NON-NLS-1$
-		writer.println("							<td class=\"log-text\" id=\"indent\"><xsl:value-of select=\"ancestor::feature//@ws\"/></td>"); //$NON-NLS-1$
-		writer.println("							</tr>"); //$NON-NLS-1$
-		writer.println("						</xsl:if>"); //$NON-NLS-1$
-		writer.println("						<xsl:if test=\"ancestor::feature//@nl\">"); //$NON-NLS-1$
-		writer.println("							<tr><td class=\"log-text\" id=\"indent\">Languages:</td>"); //$NON-NLS-1$
-		writer.println("							<td class=\"log-text\" id=\"indent\"><xsl:value-of select=\"ancestor::feature//@nl\"/></td>"); //$NON-NLS-1$
-		writer.println("							</tr>"); //$NON-NLS-1$
-		writer.println("						</xsl:if>"); //$NON-NLS-1$
-		writer.println("						<xsl:if test=\"ancestor::feature//@arch\">"); //$NON-NLS-1$
-		writer.println("							<tr><td class=\"log-text\" id=\"indent\">Architecture:</td>"); //$NON-NLS-1$
-		writer.println("							<td class=\"log-text\" id=\"indent\"><xsl:value-of select=\"ancestor::feature//@arch\"/></td>"); //$NON-NLS-1$
-		writer.println("							</tr>"); //$NON-NLS-1$
-		writer.println("						</xsl:if>"); //$NON-NLS-1$
-		writer.println("					</table>"); //$NON-NLS-1$
-		writer.println("				</td>"); //$NON-NLS-1$
-		writer.println("			</tr>"); //$NON-NLS-1$
-		writer.println("			</xsl:for-each>"); //$NON-NLS-1$
-		writer.println("			<tr><td class=\"spacer\"><br/></td><td class=\"spacer\"><br/></td></tr>"); //$NON-NLS-1$
-		writer.println("		</xsl:if>"); //$NON-NLS-1$
-		writer.println("	</xsl:for-each>"); //$NON-NLS-1$
-		writer.println("	<xsl:if test=\"count(feature)  &gt; count(feature/category)\">"); //$NON-NLS-1$
-		writer.println("	<tr class=\"header\">"); //$NON-NLS-1$
-		writer.println("		<td class=\"sub-header\" colspan=\"2\">"); //$NON-NLS-1$
-		writer.println("		Uncategorized"); //$NON-NLS-1$
-		writer.println("		</td>"); //$NON-NLS-1$
-		writer.println("	</tr>"); //$NON-NLS-1$
-		writer.println("	</xsl:if>"); //$NON-NLS-1$
-		writer.println("	<xsl:choose>"); //$NON-NLS-1$
-		writer.println("	<xsl:when test=\"function-available('msxsl:node-set')\">"); //$NON-NLS-1$
-		writer.println("	   <xsl:variable name=\"rtf-nodes\">"); //$NON-NLS-1$
-		writer.println("		<xsl:for-each select=\"feature[not(category)]\">"); //$NON-NLS-1$
-		writer.println("			<xsl:sort select=\"@id\" order=\"ascending\" case-order=\"upper-first\"/>"); //$NON-NLS-1$
-		writer.println("			<xsl:sort select=\"@version\" order=\"ascending\" />"); //$NON-NLS-1$
-		writer.println("			<xsl:value-of select=\".\"/>"); //$NON-NLS-1$
-		writer.println("			<xsl:copy-of select=\".\" />"); //$NON-NLS-1$
-		writer.println("		</xsl:for-each>"); //$NON-NLS-1$
-		writer.println("	   </xsl:variable>"); //$NON-NLS-1$
-		writer.println("	   <xsl:variable name=\"myNodeSet\" select=\"msxsl:node-set($rtf-nodes)/*\"/>"); //$NON-NLS-1$
-		writer.println("	<xsl:for-each select=\"$myNodeSet\">"); //$NON-NLS-1$
-		writer.println("	<tr>"); //$NON-NLS-1$
-		writer.println("		<xsl:choose>"); //$NON-NLS-1$
-		writer.println("		<xsl:when test=\"position() mod 2 = 1\">"); //$NON-NLS-1$
-		writer.println("		<xsl:attribute name=\"class\">dark-row</xsl:attribute>"); //$NON-NLS-1$
-		writer.println("		</xsl:when>"); //$NON-NLS-1$
-		writer.println("		<xsl:otherwise>"); //$NON-NLS-1$
-		writer.println("		<xsl:attribute name=\"class\">light-row</xsl:attribute>"); //$NON-NLS-1$
-		writer.println("		</xsl:otherwise>"); //$NON-NLS-1$
-		writer.println("		</xsl:choose>"); //$NON-NLS-1$
-		writer.println("		<td class=\"log-text\" id=\"indent\">"); //$NON-NLS-1$
-		writer.println("			<xsl:choose>"); //$NON-NLS-1$
-		writer.println("			<xsl:when test=\"@label\">"); //$NON-NLS-1$
-		writer.println("				<a href=\"{@url}\"><xsl:value-of select=\"@label\"/></a>"); //$NON-NLS-1$
-		writer.println("				<br />"); //$NON-NLS-1$
-		writer.println("				<div id=\"indent\">"); //$NON-NLS-1$
-		writer.println("				(<xsl:value-of select=\"@id\"/> - <xsl:value-of select=\"@version\"/>)"); //$NON-NLS-1$
-		writer.println("				</div>"); //$NON-NLS-1$
-		writer.println("			</xsl:when>"); //$NON-NLS-1$
-		writer.println("			<xsl:otherwise>"); //$NON-NLS-1$
-		writer.println("				<a href=\"{@url}\"><xsl:value-of select=\"@id\"/> - <xsl:value-of select=\"@version\"/></a>"); //$NON-NLS-1$
-		writer.println("			</xsl:otherwise>"); //$NON-NLS-1$
-		writer.println("			</xsl:choose>"); //$NON-NLS-1$
-		writer.println("			<br /><br />"); //$NON-NLS-1$
-		writer.println("		</td>"); //$NON-NLS-1$
-		writer.println("		<td>"); //$NON-NLS-1$
-		writer.println("			<table>"); //$NON-NLS-1$
-		writer.println("				<xsl:if test=\"@os\">"); //$NON-NLS-1$
-		writer.println("					<tr><td class=\"log-text\" id=\"indent\">Operating Systems:</td>"); //$NON-NLS-1$
-		writer.println("					<td class=\"log-text\" id=\"indent\"><xsl:value-of select=\"@os\"/></td>"); //$NON-NLS-1$
-		writer.println("					</tr>"); //$NON-NLS-1$
-		writer.println("				</xsl:if>"); //$NON-NLS-1$
-		writer.println("				<xsl:if test=\"@ws\">"); //$NON-NLS-1$
-		writer.println("					<tr><td class=\"log-text\" id=\"indent\">Windows Systems:</td>"); //$NON-NLS-1$
-		writer.println("					<td class=\"log-text\" id=\"indent\"><xsl:value-of select=\"@ws\"/></td>"); //$NON-NLS-1$
-		writer.println("					</tr>"); //$NON-NLS-1$
-		writer.println("				</xsl:if>"); //$NON-NLS-1$
-		writer.println("				<xsl:if test=\"@nl\">"); //$NON-NLS-1$
-		writer.println("					<tr><td class=\"log-text\" id=\"indent\">Languages:</td>"); //$NON-NLS-1$
-		writer.println("					<td class=\"log-text\" id=\"indent\"><xsl:value-of select=\"@nl\"/></td>"); //$NON-NLS-1$
-		writer.println("					</tr>"); //$NON-NLS-1$
-		writer.println("				</xsl:if>"); //$NON-NLS-1$
-		writer.println("				<xsl:if test=\"@arch\">"); //$NON-NLS-1$
-		writer.println("					<tr><td class=\"log-text\" id=\"indent\">Architecture:</td>"); //$NON-NLS-1$
-		writer.println("					<td class=\"log-text\" id=\"indent\"><xsl:value-of select=\"@arch\"/></td>"); //$NON-NLS-1$
-		writer.println("					</tr>"); //$NON-NLS-1$
-		writer.println("				</xsl:if>"); //$NON-NLS-1$
-		writer.println("			</table>"); //$NON-NLS-1$
-		writer.println("		</td>"); //$NON-NLS-1$
-		writer.println("	</tr>"); //$NON-NLS-1$
-		writer.println("	</xsl:for-each>"); //$NON-NLS-1$
-		writer.println("	</xsl:when>"); //$NON-NLS-1$
-		writer.println("	<xsl:otherwise>"); //$NON-NLS-1$
-		writer.println("	<xsl:for-each select=\"feature[not(category)]\">"); //$NON-NLS-1$
-		writer.println("	<xsl:sort select=\"@id\" order=\"ascending\" case-order=\"upper-first\"/>"); //$NON-NLS-1$
-		writer.println("	<xsl:sort select=\"@version\" order=\"ascending\" />"); //$NON-NLS-1$
-		writer.println("	<tr>"); //$NON-NLS-1$
-		writer.println("		<xsl:choose>"); //$NON-NLS-1$
-		writer.println("		<xsl:when test=\"count(preceding-sibling::feature[not(category)]) mod 2 = 1\">"); //$NON-NLS-1$
-		writer.println("		<xsl:attribute name=\"class\">dark-row</xsl:attribute>"); //$NON-NLS-1$
-		writer.println("		</xsl:when>"); //$NON-NLS-1$
-		writer.println("		<xsl:otherwise>"); //$NON-NLS-1$
-		writer.println("		<xsl:attribute name=\"class\">light-row</xsl:attribute>"); //$NON-NLS-1$
-		writer.println("		</xsl:otherwise>"); //$NON-NLS-1$
-		writer.println("		</xsl:choose>"); //$NON-NLS-1$
-		writer.println("		<td class=\"log-text\" id=\"indent\">"); //$NON-NLS-1$
-		writer.println("			<xsl:choose>"); //$NON-NLS-1$
-		writer.println("			<xsl:when test=\"@label\">"); //$NON-NLS-1$
-		writer.println("				<a href=\"{@url}\"><xsl:value-of select=\"@label\"/></a>"); //$NON-NLS-1$
-		writer.println("				<br />"); //$NON-NLS-1$
-		writer.println("				<div id=\"indent\">"); //$NON-NLS-1$
-		writer.println("				(<xsl:value-of select=\"@id\"/> - <xsl:value-of select=\"@version\"/>)"); //$NON-NLS-1$
-		writer.println("				</div>"); //$NON-NLS-1$
-		writer.println("			</xsl:when>"); //$NON-NLS-1$
-		writer.println("			<xsl:otherwise>"); //$NON-NLS-1$
-		writer.println("				<a href=\"{@url}\"><xsl:value-of select=\"@id\"/> - <xsl:value-of select=\"@version\"/></a>"); //$NON-NLS-1$
-		writer.println("			</xsl:otherwise>"); //$NON-NLS-1$
-		writer.println("			</xsl:choose>"); //$NON-NLS-1$
-		writer.println("			<br /><br />"); //$NON-NLS-1$
-		writer.println("		</td>"); //$NON-NLS-1$
-		writer.println("		<td>"); //$NON-NLS-1$
-		writer.println("			<table>"); //$NON-NLS-1$
-		writer.println("				<xsl:if test=\"@os\">"); //$NON-NLS-1$
-		writer.println("					<tr><td class=\"log-text\" id=\"indent\">Operating Systems:</td>"); //$NON-NLS-1$
-		writer.println("					<td class=\"log-text\" id=\"indent\"><xsl:value-of select=\"@os\"/></td>"); //$NON-NLS-1$
-		writer.println("					</tr>"); //$NON-NLS-1$
-		writer.println("				</xsl:if>"); //$NON-NLS-1$
-		writer.println("				<xsl:if test=\"@ws\">"); //$NON-NLS-1$
-		writer.println("					<tr><td class=\"log-text\" id=\"indent\">Windows Systems:</td>"); //$NON-NLS-1$
-		writer.println("					<td class=\"log-text\" id=\"indent\"><xsl:value-of select=\"@ws\"/></td>"); //$NON-NLS-1$
-		writer.println("					</tr>"); //$NON-NLS-1$
-		writer.println("				</xsl:if>"); //$NON-NLS-1$
-		writer.println("				<xsl:if test=\"@nl\">"); //$NON-NLS-1$
-		writer.println("					<tr><td class=\"log-text\" id=\"indent\">Languages:</td>"); //$NON-NLS-1$
-		writer.println("					<td class=\"log-text\" id=\"indent\"><xsl:value-of select=\"@nl\"/></td>"); //$NON-NLS-1$
-		writer.println("					</tr>"); //$NON-NLS-1$
-		writer.println("				</xsl:if>"); //$NON-NLS-1$
-		writer.println("				<xsl:if test=\"@arch\">"); //$NON-NLS-1$
-		writer.println("					<tr><td class=\"log-text\" id=\"indent\">Architecture:</td>"); //$NON-NLS-1$
-		writer.println("					<td class=\"log-text\" id=\"indent\"><xsl:value-of select=\"@arch\"/></td>"); //$NON-NLS-1$
-		writer.println("					</tr>"); //$NON-NLS-1$
-		writer.println("				</xsl:if>"); //$NON-NLS-1$
-		writer.println("			</table>"); //$NON-NLS-1$
-		writer.println("		</td>"); //$NON-NLS-1$
-		writer.println("	</tr>"); //$NON-NLS-1$
-		writer.println("	</xsl:for-each>"); //$NON-NLS-1$
-		writer.println("	</xsl:otherwise>"); //$NON-NLS-1$
-		writer.println("	</xsl:choose>"); //$NON-NLS-1$
-		writer.println("	</table>"); //$NON-NLS-1$
-		writer.println("	</body>"); //$NON-NLS-1$
-		writer.println("	</html>"); //$NON-NLS-1$
-		writer.println("</xsl:for-each>"); //$NON-NLS-1$
-		writer.println("</xsl:template>"); //$NON-NLS-1$
-		writer.println("</xsl:stylesheet>"); //$NON-NLS-1$
-
-		writer.flush();
-		writeFile(fProject.getFile(fWebLocation + "/site.xsl"), swriter); //$NON-NLS-1$
-	}
-	
-	private void writeFile(IFile file, StringWriter swriter) {
-		try {
-			ByteArrayInputStream stream = new ByteArrayInputStream(swriter
-					.toString().getBytes("UTF8")); //$NON-NLS-1$
-			if (file.exists()) {
-				file.setContents(stream, false, false, null);
-			} else {
-				file.create(stream, false, null);
-			}
-			stream.close();
-			swriter.close();
-		} catch (Exception e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/site/NewSiteProjectCreationPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/site/NewSiteProjectCreationPage.java
deleted file mode 100644
index dcdf0f9..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/site/NewSiteProjectCreationPage.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.site;
-
-import java.io.File;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-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.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
-
-public class NewSiteProjectCreationPage extends WizardNewProjectCreationPage {
-	
-	private Button fWebButton;
-	protected Text fWebText;
-	private Label fWebLabel;
-		
-	/**
-	 * Creates a new project creation wizard page.
-	 *
-	 * @param pageName the name of this page
-	 */
-	public NewSiteProjectCreationPage(String pageName) {
-		super(pageName);
-	}
-	
-	/** (non-Javadoc)
-	 * Method declared on IDialogPage.
-	 */
-	public void createControl(Composite parent) {
-		super.createControl(parent);
-		Composite control = (Composite)getControl();
-		GridLayout layout = new GridLayout();
-		layout.verticalSpacing = 15;
-		control.setLayout(layout);
-		
-		Group webGroup = new Group(control, SWT.NULL);
-		webGroup.setText(PDEUIMessages.NewSiteProjectCreationPage_webTitle); 
-		
-		initializeDialogUnits(parent);
-		layout = new GridLayout();
-		layout.numColumns = 2;
-		webGroup.setLayout(layout);
-		webGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		fWebButton = new Button(webGroup, SWT.CHECK);
-		fWebButton.setText(PDEUIMessages.SiteHTML_checkLabel);
-		GridData gd = new GridData();
-		gd.horizontalSpan = 2;
-		fWebButton.setLayoutData(gd);
-		fWebButton.addSelectionListener(new SelectionAdapter(){
-			public void widgetSelected(SelectionEvent e){
-				fWebLabel.setEnabled(fWebButton.getSelection());
-				fWebText.setEnabled(fWebButton.getSelection());
-				setPageComplete(validatePage());
-			}
-		});
-		
-		fWebLabel = new Label(webGroup, SWT.NULL);
-		fWebLabel.setText(PDEUIMessages.SiteHTML_webLabel);
-		fWebLabel.setEnabled(false);
-		
-		fWebText = new Text(webGroup, SWT.BORDER);
-		fWebText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fWebText.setText("web"); //$NON-NLS-1$
-		fWebText.setEnabled(false);
-		fWebText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				setPageComplete(validatePage());
-			}
-		});
-
-		setPageComplete(validatePage());
-		setControl(webGroup);
-		Dialog.applyDialogFont(webGroup);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(control, IHelpContextIds.NEW_SITE_MAIN);
-	}
-
-	public String getWebLocation(){
-		if (fWebButton == null)
-			return null;
-		
-		if (!fWebButton.getSelection())
-			return null;
-		
-		String text = fWebText.getText();
-		if (text.startsWith(File.separator) || text.startsWith("/")) //$NON-NLS-1$
-			text = text.substring(1);
-		if (text.endsWith(File.separator) || text.endsWith("/")) //$NON-NLS-1$
-			text = text.substring(0,text.length()-1);
-		return text.trim();
-	}
-
-	protected boolean validatePage() {
-		if (!super.validatePage())
-			return false;
-		String webLocation = getWebLocation();
-		if (webLocation != null && webLocation.trim().length() == 0){ 
-			setErrorMessage(PDEUIMessages.SiteHTML_webError);
-			return false;
-		}
-		return true;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/site/NewSiteProjectWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/site/NewSiteProjectWizard.java
deleted file mode 100644
index 0e45eda..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/site/NewSiteProjectWizard.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.site;
-
-import java.lang.reflect.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.operation.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.wizards.*;
-import org.eclipse.ui.wizards.newresource.*;
-
-public class NewSiteProjectWizard extends NewWizard implements IExecutableExtension {
-
-	public static final String DEF_PROJECT_NAME = "project-name"; //$NON-NLS-1$
-
-	private NewSiteProjectCreationPage fMainPage;
-	private IConfigurationElement fConfig;
-	
-
-	public NewSiteProjectWizard() {
-		setDefaultPageImageDescriptor(PDEPluginImages.DESC_NEWSITEPRJ_WIZ);
-		setDialogSettings(PDEPlugin.getDefault().getDialogSettings());
-		setNeedsProgressMonitor(true);
-		setWindowTitle(PDEUIMessages.NewSiteWizard_wtitle); 
-	}
-	
-	public void addPages() {
-		fMainPage = new NewSiteProjectCreationPage("main"); //$NON-NLS-1$
-		fMainPage.setTitle(PDEUIMessages.NewSiteWizard_MainPage_title); 
-		fMainPage.setDescription(PDEUIMessages.NewSiteWizard_MainPage_desc); 
-		String pname = getDefaultValue(DEF_PROJECT_NAME);
-		if (pname!=null)
-			fMainPage.setInitialProjectName(pname);
-		addPage(fMainPage);
-	}
-
-	
-	public boolean performFinish() {
-		try {
-			BasicNewProjectResourceWizard.updatePerspective(fConfig);
-			final IProject project = fMainPage.getProjectHandle();
-			final IPath location = fMainPage.getLocationPath();
-			final String webLocation = fMainPage.getWebLocation();
-			IRunnableWithProgress op = new NewSiteProjectCreationOperation(getShell().getDisplay(), project, location, webLocation);
-			getContainer().run(false, true, op);
-		} catch (InvocationTargetException e) {
-			PDEPlugin.logException(e);
-			return false;
-		} catch (InterruptedException e) {
-			return false;
-		}
-		return true;
-	}
-
-	public void setInitializationData(
-		IConfigurationElement config,
-		String property,
-		Object data)
-		throws CoreException {
-		this.fConfig = config;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/site/OpenProjectWizardAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/site/OpenProjectWizardAction.java
deleted file mode 100644
index 3734c89..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/site/OpenProjectWizardAction.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.site;
-
-import java.util.Hashtable;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.util.SWTUtil;
-import org.eclipse.ui.*;
-import org.eclipse.ui.cheatsheets.*;
-
-public class OpenProjectWizardAction extends Action implements ICheatSheetAction {
-	/**
-	 * @param text
-	 */
-	public OpenProjectWizardAction() {
-		super(PDEUIMessages.Actions_Site_OpenProjectWizardAction); 
-	}
-	
-	/**
-	 * @see IActionDelegate#run(IAction)
-	 */
-	public void run() {
-		run(new String [] {}, null);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.cheatsheets.ICheatSheetAction#run(java.lang.String[], org.eclipse.ui.cheatsheets.ICheatSheetManager)
-	 */
-	public void run(String[] params, ICheatSheetManager manager) {
-		Hashtable defValues = new Hashtable();
-		if (params.length>0)
-			defValues.put(NewSiteProjectWizard.DEF_PROJECT_NAME, params[0]);
-		NewSiteProjectWizard wizard = new NewSiteProjectWizard();
-		wizard.init(PlatformUI.getWorkbench(), new StructuredSelection());
-		wizard.init(defValues);
-		WizardDialog dialog = new WizardDialog(PDEPlugin.getActiveWorkbenchShell(), wizard);
-		dialog.create();
-		SWTUtil.setDialogSize(dialog, 500, 500);
-		dialog.getShell().setText(wizard.getWindowTitle());
-		int result = dialog.open();
-		notifyResult(result==WizardDialog.OK);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/BaseEditorTemplate.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/BaseEditorTemplate.java
deleted file mode 100644
index da9bb1c..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/BaseEditorTemplate.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-public abstract class BaseEditorTemplate extends PDETemplateSection {
-	
-	public String getUsedExtensionPoint() {
-		return "org.eclipse.ui.editors"; //$NON-NLS-1$
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.ITemplateSection#getFoldersToInclude()
-	 */
-	public String[] getNewFiles() {
-		return new String[] {"icons/"}; //$NON-NLS-1$
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/BuilderNewExtensionWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/BuilderNewExtensionWizard.java
deleted file mode 100644
index 77032e3..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/BuilderNewExtensionWizard.java
+++ /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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-import org.eclipse.pde.internal.ui.wizards.extension.NewExtensionTemplateWizard;
-
-public class BuilderNewExtensionWizard extends NewExtensionTemplateWizard {
-
-	public BuilderNewExtensionWizard() {
-		super(new BuilderTemplate());
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/BuilderNewWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/BuilderNewWizard.java
deleted file mode 100644
index bb28941..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/BuilderNewWizard.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.ITemplateSection;
-import org.eclipse.pde.ui.templates.NewPluginTemplateWizard;
-
-/**
- * Constructor for BuilderNewWizard.
- */
-public class BuilderNewWizard extends NewPluginTemplateWizard {
-
-	/**
-	 *  
-	 */
-	public BuilderNewWizard() {
-		super();
-	}
-
-	public void init(IFieldData data) {
-		super.init(data);
-		setWindowTitle(PDEUIMessages.BuilderNewWizard_wtitle);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.ui.templates.NewPluginTemplateWizard#createTemplateSections()
-	 */
-	public ITemplateSection[] createTemplateSections() {
-		return new ITemplateSection[] { new BuilderTemplate() };
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/BuilderTemplate.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/BuilderTemplate.java
deleted file mode 100644
index 0928fa5..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/BuilderTemplate.java
+++ /dev/null

@@ -1,278 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-import java.io.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.ui.*;
-import org.eclipse.pde.ui.templates.*;
-
-public class BuilderTemplate extends PDETemplateSection {
-
-	private static final String KEY_BUILDER_CLASS_NAME = "builderClassName"; //$NON-NLS-1$
-
-	private static final String KEY_BUILDER_ID = "builderId"; //$NON-NLS-1$
-
-	private static final String KEY_BUILDER_NAME = "builderName"; //$NON-NLS-1$
-
-	private static final String KEY_NATURE_CLASS_NAME = "natureClassName"; //$NON-NLS-1$
-
-	private static final String KEY_NATURE_ID = "natureId"; //$NON-NLS-1$
-
-	private static final String KEY_NATURE_NAME = "natureName"; //$NON-NLS-1$
-
-	private static final String KEY_GEN_ACTION = "genAction"; //$NON-NLS-1$
-
-	private BooleanOption actionOption;
-
-	/**
-	 * Constructor for BuilderTemplate.
-	 */
-	public BuilderTemplate() {
-		setPageCount(1);
-		createOptions();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getSectionId()
-	 */
-	public String getSectionId() {
-		return "builder"; //$NON-NLS-1$
-	}
-
-	/*
-	 * @see ITemplateSection#getNumberOfWorkUnits()
-	 */
-	public int getNumberOfWorkUnits() {
-		return super.getNumberOfWorkUnits() + 1;
-	}
-
-	private void createOptions() {
-		addOption(KEY_PACKAGE_NAME, PDEUIMessages.BuilderTemplate_packageLabel, (String) null, 0);
-
-		addOption(KEY_BUILDER_CLASS_NAME, PDEUIMessages.BuilderTemplate_builderClass, "SampleBuilder", 0); //$NON-NLS-1$
-		addOption(KEY_BUILDER_ID, PDEUIMessages.BuilderTemplate_builderId,
-				"sampleBuilder", 0); //$NON-NLS-1$
-		addOption(KEY_BUILDER_NAME, PDEUIMessages.BuilderTemplate_builderName, PDEUIMessages.BuilderTemplate_defaultBuilderName, 0);
-
-		addOption(KEY_NATURE_CLASS_NAME, PDEUIMessages.BuilderTemplate_natureClass, "SampleNature", 0); //$NON-NLS-1$
-		addOption(KEY_NATURE_ID, PDEUIMessages.BuilderTemplate_natureId,
-				"sampleNature", 0); //$NON-NLS-1$
-		addOption(KEY_NATURE_NAME, PDEUIMessages.BuilderTemplate_natureName,
-				PDEUIMessages.BuilderTemplate_defaultNatureName, 0);
-
-		actionOption = (BooleanOption) addOption(KEY_GEN_ACTION, PDEUIMessages.BuilderTemplate_generateAction, true, 0);
-	}
-
-	public void addPages(Wizard wizard) {
-		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_BUILDER);
-		page.setTitle(PDEUIMessages.BuilderTemplate_title);
-		page.setDescription(PDEUIMessages.BuilderTemplate_desc);
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-
-	public void validateOptions(TemplateOption source) {
-		if (source.isRequired() && source.isEmpty()) {
-			flagMissingRequiredOption(source);
-		} else {
-			validateContainerPage(source);
-		}
-	}
-
-	private void validateContainerPage(TemplateOption source) {
-		TemplateOption[] allPageOptions = getOptions(0);
-		for (int i = 0; i < allPageOptions.length; i++) {
-			TemplateOption nextOption = allPageOptions[i];
-			if (nextOption.isRequired() && nextOption.isEmpty()) {
-				flagMissingRequiredOption(nextOption);
-				return;
-			}
-		}
-		resetPageState();
-	}
-
-	public boolean isDependentOnParentWizard() {
-		return true;
-	}
-
-	protected void initializeFields(IFieldData data) {
-		// In a new project wizard, we don't know this yet - the
-		// model has not been created
-		String id = data.getId();
-		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(id));
-	}
-
-	public void initializeFields(IPluginModelBase model) {
-		// In the new extension wizard, the model exists so
-		// we can initialize directly from it
-		String pluginId = model.getPluginBase().getId();
-		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(pluginId));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.ui.templates.ITemplateSection#getUsedExtensionPoint()
-	 */
-	public String getUsedExtensionPoint() {
-		return null;
-	}
-
-	protected void updateModel(IProgressMonitor monitor) throws CoreException {
-		IPluginBase plugin = model.getPluginBase();
-		IPluginModelFactory factory = model.getPluginFactory();
-
-		// Builder
-		IPluginExtension extension1 = createExtension(
-				"org.eclipse.core.resources.builders", true); //$NON-NLS-1$
-		extension1.setId(getStringOption(KEY_BUILDER_ID));
-		extension1.setName(getStringOption(KEY_BUILDER_NAME));
-
-		IPluginElement builder = factory.createElement(extension1);
-		builder.setName("builder"); //$NON-NLS-1$
-		builder.setAttribute("hasNature", "true"); //$NON-NLS-1$ //$NON-NLS-2$
-		extension1.add(builder);
-
-		IPluginElement run = factory.createElement(builder);
-		run.setName("run"); //$NON-NLS-1$
-		run.setAttribute("class", getStringOption(KEY_PACKAGE_NAME) //$NON-NLS-1$
-				+ "." + getStringOption(KEY_BUILDER_CLASS_NAME)); //$NON-NLS-1$
-		builder.add(run);
-
-		if (!extension1.isInTheModel())
-			plugin.add(extension1);
-
-		// Nature
-		IPluginExtension extension2 = createExtension(
-				"org.eclipse.core.resources.natures", true); //$NON-NLS-1$
-		extension2.setId(getStringOption(KEY_NATURE_ID));
-		extension2.setName(getStringOption(KEY_NATURE_NAME)); 
-
-		IPluginElement runtime = factory.createElement(extension2);
-		runtime.setName("runtime"); //$NON-NLS-1$
-		extension2.add(runtime);
-
-		IPluginElement run2 = factory.createElement(runtime);
-		run2.setName("run"); //$NON-NLS-1$
-		run2.setAttribute("class", getStringOption(KEY_PACKAGE_NAME) //$NON-NLS-1$
-				+ "." + getStringOption(KEY_NATURE_CLASS_NAME)); //$NON-NLS-1$
-		runtime.add(run2);
-
-		IPluginElement builder2 = factory.createElement(extension2);
-		builder2.setName("builder"); //$NON-NLS-1$
-		builder2.setAttribute("id", model.getPluginBase().getId() //$NON-NLS-1$
-				+ "." + getStringOption(KEY_BUILDER_ID)); //$NON-NLS-1$
-		extension2.add(builder2);
-
-		if (!extension2.isInTheModel())
-			plugin.add(extension2);
-
-		// Popup Action
-		if (actionOption.isSelected()) {
-			IPluginExtension extension3 = createExtension(
-					"org.eclipse.ui.popupMenus", true); //$NON-NLS-1$
-			IPluginElement objectContribution = factory
-					.createElement(extension3);
-			objectContribution.setName("objectContribution"); //$NON-NLS-1$
-			objectContribution.setAttribute("objectClass", //$NON-NLS-1$
-					"org.eclipse.core.resources.IProject"); //$NON-NLS-1$
-			objectContribution.setAttribute("adaptable", "true"); //$NON-NLS-1$ //$NON-NLS-2$
-			objectContribution.setAttribute("nameFilter", "*"); //$NON-NLS-1$ //$NON-NLS-2$
-			objectContribution.setAttribute("id", model.getPluginBase().getId() //$NON-NLS-1$
-					+ ".contribution1"); //$NON-NLS-1$
-			extension3.add(objectContribution);
-
-			IPluginElement action = factory.createElement(objectContribution);
-			action.setName("action"); //$NON-NLS-1$
-			action.setAttribute(
-					"label", PDEUIMessages.BuilderTemplate_actionLabel); //$NON-NLS-1$
-			action.setAttribute("class", getStringOption(KEY_PACKAGE_NAME) //$NON-NLS-1$
-					+ ".ToggleNatureAction"); //$NON-NLS-1$
-			action.setAttribute("menubarPath", "additions"); //$NON-NLS-1$ //$NON-NLS-2$
-			action.setAttribute("enablesFor", "+"); //$NON-NLS-1$ //$NON-NLS-2$
-			action.setAttribute("id", model.getPluginBase().getId() //$NON-NLS-1$
-					+ ".addRemoveNatureAction"); //$NON-NLS-1$
-			objectContribution.add(action);
-
-			if (!extension3.isInTheModel())
-				plugin.add(extension3);
-		}
-
-		// Marker
-		IPluginExtension extension4 = createExtension(
-				"org.eclipse.core.resources.markers", false); //$NON-NLS-1$
-		extension4.setId("xmlProblem"); //$NON-NLS-1$
-		extension4.setName(PDEUIMessages.BuilderTemplate_markerName);
-
-		IPluginElement superElement = factory.createElement(extension4);
-		superElement.setName("super"); //$NON-NLS-1$
-		superElement.setAttribute("type", //$NON-NLS-1$
-				"org.eclipse.core.resources.problemmarker"); //$NON-NLS-1$
-		extension4.add(superElement);
-
-		IPluginElement persistent = factory.createElement(extension4);
-		persistent.setName("persistent"); //$NON-NLS-1$
-		persistent.setAttribute("value", "true"); //$NON-NLS-1$ //$NON-NLS-2$
-		extension4.add(persistent);
-
-		if (!extension4.isInTheModel())
-			plugin.add(extension4);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getDependencies(java.lang.String)
-	 */
-	public IPluginReference[] getDependencies(String schemaVersion) {
-		ArrayList result = new ArrayList();
-		result.add(new PluginReference("org.eclipse.core.resources", null, 0)); //$NON-NLS-1$
-		if (schemaVersion != null)
-			result.add(new PluginReference("org.eclipse.core.runtime", null, //$NON-NLS-1$
-					0));
-		if (actionOption.isSelected())
-			result.add(new PluginReference("org.eclipse.ui", null, 0)); //$NON-NLS-1$
-
-		return (IPluginReference[]) result.toArray(new IPluginReference[result
-				.size()]);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#formatPackageName(java.lang.String)
-	 */
-	protected String getFormattedPackageName(String id) {
-		String packageName = super.getFormattedPackageName(id);
-		if (packageName.length() != 0)
-			return packageName + ".builder"; //$NON-NLS-1$
-		return "builder"; //$NON-NLS-1$
-	}
-
-	/**
-	 * @see AbstractTemplateSection#isOkToCreateFile(File)
-	 */
-	protected boolean isOkToCreateFile(File sourceFile) {
-		String fileName = sourceFile.getName();
-		if (fileName.equals("ToggleNatureAction.java")) { //$NON-NLS-1$
-			return actionOption.isSelected();
-		}
-		return true;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/ControlStack.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/ControlStack.java
deleted file mode 100644
index 2e0dd58..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/ControlStack.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-import java.util.*;
-
-import org.eclipse.pde.ui.templates.*;
-
-public class ControlStack {
-	private Stack stack;
-	private PreprocessorParser parser;
-	
-	class Entry {
-		boolean value;
-	}
-	
-	public ControlStack() {
-		stack = new Stack();
-		parser = new PreprocessorParser();
-	}
-	
-	public void setValueProvider(IVariableProvider provider) {
-		parser.setVariableProvider(provider);
-	}
-	
-	public void processLine(String line) {
-		if (line.startsWith("if")) { //$NON-NLS-1$
-			String expression = line.substring(2).trim();
-			boolean result = false;
-			try {
-				result = parser.parseAndEvaluate(expression);
-			}
-			catch (Exception e) {
-			}
-			Entry entry = new Entry();
-			entry.value = result;
-			stack.push(entry);
-		}
-		else if (line.startsWith("else")) { //$NON-NLS-1$
-			if (stack.isEmpty()==false) {
-				Entry entry = (Entry)stack.peek();
-				entry.value = !entry.value;
-			}
-		}
-		else if (line.startsWith("endif")) { //$NON-NLS-1$
-			// pop the stack
-			if (!stack.isEmpty())
-				stack.pop();
-		}
-		else {
-			// a preprocessor comment - ignore it
-		}
-	}
-	
-	public boolean getCurrentState() {
-		if (stack.isEmpty()) return true;
-		// All control levels must evaluate to true to
-		// return result==true
-		for (Iterator iter = stack.iterator(); iter.hasNext();) {
-			Entry entry = (Entry)iter.next();
-			if (!entry.value) return false;
-		}
-		return true;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/EditorNewWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/EditorNewWizard.java
deleted file mode 100644
index bb25c03..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/EditorNewWizard.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.ui.*;
-import org.eclipse.pde.ui.templates.*;
-
-public class EditorNewWizard extends NewPluginTemplateWizard {
-	/**
-	 * Constructor for EditorNewWizard.
-	 */
-	public EditorNewWizard() {
-		super();
-	}
-	public void init(IFieldData data) {
-		super.init(data);
-		setWindowTitle(PDEUIMessages.EditorNewWizard_wtitle);
-	}
-
-	/*
-	 * @see NewExtensionTemplateWizard#createTemplateSections()
-	 */
-	public ITemplateSection[] createTemplateSections() {
-		return new ITemplateSection[] { new EditorTemplate()};
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/EditorTemplate.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/EditorTemplate.java
deleted file mode 100644
index 42a60de..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/EditorTemplate.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.jface.wizard.*;
-
-public class EditorTemplate extends BaseEditorTemplate {
-	public static final String EDITOR_CLASS_NAME = "editorClass"; //$NON-NLS-1$
-	public static final String EDITOR_NAME = "editorName"; //$NON-NLS-1$
-	public static final String EXTENSIONS = "extensions"; //$NON-NLS-1$
-	/**
-	 * Constructor for EditorTemplate.
-	 */
-	public EditorTemplate() {
-		setPageCount(1);
-		createOptions();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getDependencies(java.lang.String)
-	 */
-	public IPluginReference[] getDependencies(String schemaVersion) {
-		if (schemaVersion != null) {
-			IPluginReference[] dep = new IPluginReference[5];
-			dep[0] = new PluginReference("org.eclipse.core.runtime", null, 0); //$NON-NLS-1$
-			dep[1] = new PluginReference("org.eclipse.ui", null, 0); //$NON-NLS-1$
-			dep[2] = new PluginReference("org.eclipse.jface.text", null, 0); //$NON-NLS-1$
-			dep[3] = new PluginReference("org.eclipse.ui.editors", null, 0); //$NON-NLS-1$
-			dep[4] = new PluginReference("org.eclipse.ui.workbench.texteditor", null, 0); //$NON-NLS-1$
-			return dep;
-		}
-		return super.getDependencies(schemaVersion);
-	}
-
-	public void addPages(Wizard wizard) {
-		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_EDITOR);
-		page.setTitle(PDEUIMessages.EditorTemplate_title);
-		page.setDescription(PDEUIMessages.EditorTemplate_desc);
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-
-	private void createOptions() {
-		// first page	
-		addOption(
-			KEY_PACKAGE_NAME,
-			PDEUIMessages.EditorTemplate_packageName,
-			(String) null,
-			0);
-		addOption(
-			EDITOR_CLASS_NAME,
-			PDEUIMessages.EditorTemplate_editorClass,
-			"XMLEditor", //$NON-NLS-1$
-			0);
-		addOption(
-			EDITOR_NAME,
-			PDEUIMessages.EditorTemplate_editorName,
-			PDEUIMessages.EditorTemplate_defaultEditorName,
-			0);
-		addOption(
-			EXTENSIONS,
-			PDEUIMessages.EditorTemplate_fileExtension,
-			"xml", //$NON-NLS-1$
-			0);
-	}
-
-	public String getSectionId() {
-		return "editor"; //$NON-NLS-1$
-	}
-	/*
-	 * @see ITemplateSection#getNumberOfWorkUnits()
-	 */
-	public int getNumberOfWorkUnits() {
-		return super.getNumberOfWorkUnits() + 1;
-	}
-
-	protected void initializeFields(IFieldData data) {
-		// In a new project wizard, we don't know this yet - the
-		// model has not been created
-		String id = data.getId();
-		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(id)); 
-	}
-	public void initializeFields(IPluginModelBase model) {
-		// In the new extension wizard, the model exists so 
-		// we can initialize directly from it
-		String pluginId = model.getPluginBase().getId();
-		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(pluginId)); 
-	}
-
-	public boolean isDependentOnParentWizard() {
-		return true;
-	}
-
-	/**
-	 * @see GenericTemplateSection#validateOptions(TemplateOption)
-	 */
-	public void validateOptions(TemplateOption source) {
-		if (source.isRequired() && source.isEmpty()) {
-			flagMissingRequiredOption(source);
-		} else {
-			validateContainerPage(source);
-		}
-	}
-
-	private void validateContainerPage(TemplateOption source) {
-		TemplateOption[] options = getOptions(0);
-		for (int i = 0; i < options.length; i++) {
-			TemplateOption nextOption = options[i];
-			if (nextOption.isRequired() && nextOption.isEmpty()) {
-				flagMissingRequiredOption(nextOption);
-				return;
-			}
-		}
-		resetPageState();
-	}
-
-	protected void updateModel(IProgressMonitor monitor) throws CoreException {
-		IPluginBase plugin = model.getPluginBase();
-		IPluginExtension extension = createExtension(getUsedExtensionPoint(), true);
-		IPluginModelFactory factory = model.getPluginFactory();
-
-		IPluginElement editorElement = factory.createElement(extension);
-		editorElement.setName("editor"); //$NON-NLS-1$
-		editorElement.setAttribute(
-			"id", //$NON-NLS-1$
-			getStringOption(KEY_PACKAGE_NAME) + "." + getStringOption(EDITOR_CLASS_NAME)); //$NON-NLS-1$
-		editorElement.setAttribute("name", getStringOption(EDITOR_NAME)); //$NON-NLS-1$
-		editorElement.setAttribute("icon", "icons/sample.gif"); //$NON-NLS-1$ //$NON-NLS-2$
-		editorElement.setAttribute("extensions", getStringOption(EXTENSIONS)); //$NON-NLS-1$
-
-		editorElement.setAttribute(
-			"class", //$NON-NLS-1$
-			getStringOption(KEY_PACKAGE_NAME) + "." + getStringOption(EDITOR_CLASS_NAME)); //$NON-NLS-1$
-		editorElement.setAttribute(
-			"contributorClass", //$NON-NLS-1$
-			"org.eclipse.ui.texteditor.BasicTextEditorActionContributor"); //$NON-NLS-1$
-		extension.add(editorElement);
-		if (!extension.isInTheModel())
-			plugin.add(extension);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#formatPackageName(java.lang.String)
-	 */
-	protected String getFormattedPackageName(String id) {
-	    String packageName = super.getFormattedPackageName(id);
-	    if (packageName.length() != 0)
-	        return packageName + ".editors"; //$NON-NLS-1$
-	    return "editors"; //$NON-NLS-1$
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelloNonUIRCPNewWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelloNonUIRCPNewWizard.java
deleted file mode 100644
index 078d859..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelloNonUIRCPNewWizard.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.ui.*;
-import org.eclipse.pde.ui.templates.*;
-
-
-public class HelloNonUIRCPNewWizard extends NewPluginTemplateWizard {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractNewPluginTemplateWizard#init(org.eclipse.pde.ui.IFieldData)
-	 */
-	public void init(IFieldData data) {
-		super.init(data);
-		setWindowTitle(PDEUIMessages.HelloNonUIRCPNewWizard_title); 
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.NewPluginTemplateWizard#createTemplateSections()
-	 */
-	public ITemplateSection[] createTemplateSections() {
-		return new ITemplateSection[] {new HelloNonUIRCPTemplate()};
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelloNonUIRCPTemplate.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelloNonUIRCPTemplate.java
deleted file mode 100644
index 0a9f43e..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelloNonUIRCPTemplate.java
+++ /dev/null

@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.ui.*;
-import org.eclipse.pde.ui.templates.*;
-
-
-public class HelloNonUIRCPTemplate extends PDETemplateSection {
-	
-	public static final String KEY_APPLICATION_CLASS = "applicationClass"; //$NON-NLS-1$
-	public static final String KEY_APPLICATION_MESSAGE = "message"; //$NON-NLS-1$
-	
-	public HelloNonUIRCPTemplate() {
-		setPageCount(1);
-		createOptions();
-	}
-	
-	public void addPages(Wizard wizard) {
-		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_RCP_MAIL);
-		page.setTitle(PDEUIMessages.HelloNonUIRCPTemplate_title); 
-		page.setDescription(PDEUIMessages.HelloNonUIRCPTemplate_desc);  
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-
-	
-	private void createOptions() {
-		addOption(KEY_PACKAGE_NAME,
-				PDEUIMessages.MailTemplate_packageName,
-				(String) null, 0); 
-		
-		addOption(KEY_APPLICATION_CLASS,
-				PDEUIMessages.HelloNonUIRCPTemplate_appClass,
-				"Application", 0); //$NON-NLS-1$
-		
-		addOption(KEY_APPLICATION_MESSAGE,
-				PDEUIMessages.HelloNonUIRCPTemplate_messageText,
-				PDEUIMessages.HelloNonUIRCPTemplate_defaultMessage, 0); 
-	}
-	
-	protected void initializeFields(IFieldData data) {
-		// In a new project wizard, we don't know this yet - the
-		// model has not been created
-		String packageName = getFormattedPackageName(data.getId());
-		initializeOption(KEY_PACKAGE_NAME, packageName);
-	}
-	
-	public void initializeFields(IPluginModelBase model) {
-		String packageName = getFormattedPackageName(model.getPluginBase().getId());
-		initializeOption(KEY_PACKAGE_NAME, packageName);
-	}	
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getSectionId()
-	 */
-	public String getSectionId() {
-		return "helloNonUIRCP"; //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#validateOptions(org.eclipse.pde.ui.templates.TemplateOption)
-	 */
-	public void validateOptions(TemplateOption source) {
-		if (source.isRequired() && source.isEmpty()) {
-			flagMissingRequiredOption(source);
-		} else {
-			validateContainerPage(source);
-		}
-	}
-	
-	private void validateContainerPage(TemplateOption source) {
-		TemplateOption[] allPageOptions = getOptions(0);
-		for (int i = 0; i < allPageOptions.length; i++) {
-			TemplateOption nextOption = allPageOptions[i];
-			if (nextOption.isRequired() && nextOption.isEmpty()) {
-				flagMissingRequiredOption(nextOption);
-				return;
-			}
-		}
-		resetPageState();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#updateModel(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void updateModel(IProgressMonitor monitor) throws CoreException {
-		createApplicationExtension();
-	}
-	
-	private void createApplicationExtension() throws CoreException {
-		IPluginBase plugin = model.getPluginBase();
-		
-		IPluginExtension extension = createExtension("org.eclipse.core.runtime.applications", true); //$NON-NLS-1$
-		extension.setId("application"); //$NON-NLS-1$
-		
-		IPluginElement element = model.getPluginFactory().createElement(extension);
-		element.setName("application"); //$NON-NLS-1$
-		extension.add(element);
-		
-		IPluginElement run = model.getPluginFactory().createElement(element);
-		run.setName("run"); //$NON-NLS-1$
-		run.setAttribute("class", getStringOption(KEY_PACKAGE_NAME) + "." + getStringOption(KEY_APPLICATION_CLASS)); //$NON-NLS-1$ //$NON-NLS-2$
-		element.add(run);
-		
-		if (!extension.isInTheModel())
-			plugin.add(extension);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.ITemplateSection#getUsedExtensionPoint()
-	 */
-	public String getUsedExtensionPoint() {
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#isDependentOnParentWizard()
-	 */
-	public boolean isDependentOnParentWizard() {
-		return true;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getNumberOfWorkUnits()
-	 */
-	public int getNumberOfWorkUnits() {
-		return super.getNumberOfWorkUnits() + 1;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getDependencies(java.lang.String)
-	 */
-	public IPluginReference[] getDependencies(String schemaVersion) {
-		IPluginReference[] dep = new IPluginReference[1];
-		dep[0] = new PluginReference("org.eclipse.core.runtime", null, 0); //$NON-NLS-1$
-		return dep;
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelloOSGiNewWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelloOSGiNewWizard.java
deleted file mode 100644
index 5e5f809..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelloOSGiNewWizard.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.wizards.plugin.PluginFieldData;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.ITemplateSection;
-import org.eclipse.pde.ui.templates.NewPluginTemplateWizard;
-
-
-public class HelloOSGiNewWizard extends NewPluginTemplateWizard {
-
-	protected PluginFieldData fData;
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractNewPluginTemplateWizard#init(org.eclipse.pde.ui.IFieldData)
-	 */
-	public void init(IFieldData data) {
-		super.init(data);
-		fData = (PluginFieldData) data;
-		setWindowTitle(PDEUIMessages.HelloOSGiNewWizard_title); 
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.NewPluginTemplateWizard#createTemplateSections()
-	 */
-	public ITemplateSection[] createTemplateSections() {
-		return new ITemplateSection[] {new HelloOSGiTemplate(this)};
-	}
-	
-	public String[] getImportPackages() {
-		return new String[] {"org.osgi.framework;version=\"1.3.0\""}; //$NON-NLS-1$
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelloOSGiTemplate.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelloOSGiTemplate.java
deleted file mode 100644
index 1bf1446..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelloOSGiTemplate.java
+++ /dev/null

@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.pde.core.plugin.IPluginReference;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.ui.templates.TemplateOption;
-
-
-public class HelloOSGiTemplate extends PDETemplateSection {
-	
-	public static final String KEY_START_MESSAGE = "startMessage"; //$NON-NLS-1$
-	public static final String KEY_STOP_MESSAGE = "stopMessage"; //$NON-NLS-1$
-	public static final String KEY_APPLICATION_CLASS = "applicationClass"; //$NON-NLS-1$
-	
-	private HelloOSGiNewWizard osgiWizard;
-	
-	public HelloOSGiTemplate(HelloOSGiNewWizard wizard) {
-		setPageCount(1);
-		osgiWizard = wizard;
-		addOption(KEY_START_MESSAGE, PDEUIMessages.HelloOSGiTemplate_startMessage, "Hello World!!", 0);  //$NON-NLS-1$
-		addOption(KEY_STOP_MESSAGE, PDEUIMessages.HelloOSGiTemplate_stopMessage, "Goodbye World!!", 0);  //$NON-NLS-1$
-	}
-	
-	public void addPages(Wizard wizard) {
-		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_RCP_MAIL);
-		page.setTitle(PDEUIMessages.HelloOSGiTemplate_pageTitle); 
-		page.setDescription(PDEUIMessages.HelloOSGiTemplate_pageDescription);  
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-	
-	public String getReplacementString(String fileName, String key) {
-		if (KEY_APPLICATION_CLASS.equals(key)) {
-			String className = osgiWizard.fData.getClassname();
-			return className.substring(className.lastIndexOf(".") + 1); //$NON-NLS-1$
-		} else if (KEY_PACKAGE_NAME.equals(key))
-			return getFormattedPackageName(osgiWizard.fData.getId());
-		return super.getReplacementString(fileName, key);
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getSectionId()
-	 */
-	public String getSectionId() {
-		return "helloOSGi"; //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#validateOptions(org.eclipse.pde.ui.templates.TemplateOption)
-	 */
-	public void validateOptions(TemplateOption source) {
-		if (source.isRequired() && source.isEmpty()) {
-			flagMissingRequiredOption(source);
-		} else {
-			validateContainerPage(source);
-		}
-	}
-	
-	private void validateContainerPage(TemplateOption source) {
-		TemplateOption[] allPageOptions = getOptions(0);
-		for (int i = 0; i < allPageOptions.length; i++) {
-			TemplateOption nextOption = allPageOptions[i];
-			if (nextOption.isRequired() && nextOption.isEmpty()) {
-				flagMissingRequiredOption(nextOption);
-				return;
-			}
-		}
-		resetPageState();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#updateModel(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void updateModel(IProgressMonitor monitor) throws CoreException {
-		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.ITemplateSection#getUsedExtensionPoint()
-	 */
-	public String getUsedExtensionPoint() {
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#isDependentOnParentWizard()
-	 */
-	public boolean isDependentOnParentWizard() {
-		return true;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getNumberOfWorkUnits()
-	 */
-	public int getNumberOfWorkUnits() {
-		return super.getNumberOfWorkUnits() + 1;
-	}
-	
-	public IPluginReference[] getDependencies(String schemaVersion) {
-		return new IPluginReference[0];
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelloRCPNewWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelloRCPNewWizard.java
deleted file mode 100644
index e909c00..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelloRCPNewWizard.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.ui.*;
-import org.eclipse.pde.ui.templates.*;
-
-
-public class HelloRCPNewWizard extends NewPluginTemplateWizard {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractNewPluginTemplateWizard#init(org.eclipse.pde.ui.IFieldData)
-	 */
-	public void init(IFieldData data) {
-		super.init(data);
-		setWindowTitle(PDEUIMessages.HelloRCPNewWizard_title); 
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.NewPluginTemplateWizard#createTemplateSections()
-	 */
-	public ITemplateSection[] createTemplateSections() {
-		return new ITemplateSection[] {new HelloRCPTemplate()};
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelloRCPTemplate.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelloRCPTemplate.java
deleted file mode 100644
index 37bde77..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelloRCPTemplate.java
+++ /dev/null

@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.ui.*;
-import org.eclipse.pde.ui.templates.*;
-
-
-public class HelloRCPTemplate extends PDETemplateSection {
-	
-	public static final String KEY_PERSPECTIVE_NAME = "perspectiveName"; //$NON-NLS-1$
-	public static final String KEY_APPLICATION_CLASS = "applicationClass"; //$NON-NLS-1$
-	public static final String KEY_APPLICATION_ID = "applicationID"; //$NON-NLS-1$
-	public static final String KEY_WINDOW_TITLE = "windowTitle"; //$NON-NLS-1$
-	
-	public HelloRCPTemplate() {
-		setPageCount(1);
-		createOptions();
-	}
-	
-	public void addPages(Wizard wizard) {
-		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_RCP_MAIL);
-		page.setTitle(PDEUIMessages.HelloRCPTemplate_title); 
-		page.setDescription(PDEUIMessages.HelloRCPTemplate_desc);  
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-
-	
-	private void createOptions() {
-		addOption(KEY_WINDOW_TITLE, PDEUIMessages.HelloRCPTemplate_windowTitle, "Hello RCP", 0); //$NON-NLS-1$ 
-		
-		addOption(KEY_APPLICATION_ID, PDEUIMessages.HelloRCPTemplate_appId, "application", 0); //$NON-NLS-1$ 
-
-		addOption(KEY_PACKAGE_NAME, PDEUIMessages.MailTemplate_packageName, (String) null, 0); 
-		
-		addOption(KEY_APPLICATION_CLASS, PDEUIMessages.HelloRCPTemplate_appClass, "Application", 0); //$NON-NLS-1$ 
-		
-		addOption(KEY_PERSPECTIVE_NAME, PDEUIMessages.HelloRCPTemplate_perspective, (String) null, 0); 	
-	}
-	
-	protected void initializeFields(IFieldData data) {
-		// In a new project wizard, we don't know this yet - the
-		// model has not been created
-		String packageName = getFormattedPackageName(data.getId());
-		initializeOption(KEY_PACKAGE_NAME, packageName);
-		
-		int index = packageName.lastIndexOf('.');
-		String name = packageName.substring(index + 1) + " Perspective"; //$NON-NLS-1$
-		initializeOption(KEY_PERSPECTIVE_NAME, Character.toUpperCase(name.charAt(0)) + name.substring(1));
-	}
-	
-	public void initializeFields(IPluginModelBase model) {
-		String packageName = getFormattedPackageName(model.getPluginBase().getId());
-		initializeOption(KEY_PACKAGE_NAME, packageName);
-
-		int index = packageName.lastIndexOf('.');
-		String name = packageName.substring(index + 1) + " Perspective"; //$NON-NLS-1$
-		initializeOption(KEY_PERSPECTIVE_NAME, Character.toUpperCase(name.charAt(0)) + name.substring(1));
-	}	
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getSectionId()
-	 */
-	public String getSectionId() {
-		return "helloRCP"; //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#validateOptions(org.eclipse.pde.ui.templates.TemplateOption)
-	 */
-	public void validateOptions(TemplateOption source) {
-		if (source.isRequired() && source.isEmpty()) {
-			flagMissingRequiredOption(source);
-		} else {
-			validateContainerPage(source);
-		}
-	}
-	
-	private void validateContainerPage(TemplateOption source) {
-		TemplateOption[] allPageOptions = getOptions(0);
-		for (int i = 0; i < allPageOptions.length; i++) {
-			TemplateOption nextOption = allPageOptions[i];
-			if (nextOption.isRequired() && nextOption.isEmpty()) {
-				flagMissingRequiredOption(nextOption);
-				return;
-			}
-		}
-		resetPageState();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#updateModel(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void updateModel(IProgressMonitor monitor) throws CoreException {
-		createApplicationExtension();
-		createPerspectiveExtension();
-	}
-	
-	private void createApplicationExtension() throws CoreException {
-		IPluginBase plugin = model.getPluginBase();
-		
-		IPluginExtension extension = createExtension("org.eclipse.core.runtime.applications", true); //$NON-NLS-1$
-		extension.setId(getStringOption(KEY_APPLICATION_ID));
-		
-		IPluginElement element = model.getPluginFactory().createElement(extension);
-		element.setName("application"); //$NON-NLS-1$
-		extension.add(element);
-		
-		IPluginElement run = model.getPluginFactory().createElement(element);
-		run.setName("run"); //$NON-NLS-1$
-		run.setAttribute("class", getStringOption(KEY_PACKAGE_NAME) + "." + getStringOption(KEY_APPLICATION_CLASS)); //$NON-NLS-1$ //$NON-NLS-2$
-		element.add(run);
-		
-		if (!extension.isInTheModel())
-			plugin.add(extension);
-	}
-
-	private void createPerspectiveExtension() throws CoreException {
-		IPluginBase plugin = model.getPluginBase();
-		
-		IPluginExtension extension = createExtension("org.eclipse.ui.perspectives", true); //$NON-NLS-1$
-		IPluginElement element = model.getPluginFactory().createElement(extension);
-		element.setName("perspective"); //$NON-NLS-1$
-		element.setAttribute("class", getStringOption(KEY_PACKAGE_NAME) + ".Perspective"); //$NON-NLS-1$ //$NON-NLS-2$
-		element.setAttribute("name", getStringOption(KEY_PERSPECTIVE_NAME)); //$NON-NLS-1$
-		element.setAttribute("id", plugin.getId() + ".perspective"); //$NON-NLS-1$ //$NON-NLS-2$
-		extension.add(element);
-		
-		if (!extension.isInTheModel())
-			plugin.add(extension);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.ITemplateSection#getUsedExtensionPoint()
-	 */
-	public String getUsedExtensionPoint() {
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#isDependentOnParentWizard()
-	 */
-	public boolean isDependentOnParentWizard() {
-		return true;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getNumberOfWorkUnits()
-	 */
-	public int getNumberOfWorkUnits() {
-		return super.getNumberOfWorkUnits() + 1;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getDependencies(java.lang.String)
-	 */
-	public IPluginReference[] getDependencies(String schemaVersion) {
-		IPluginReference[] dep = new IPluginReference[2];
-		dep[0] = new PluginReference("org.eclipse.core.runtime", null, 0); //$NON-NLS-1$
-		dep[1] = new PluginReference("org.eclipse.ui", null, 0); //$NON-NLS-1$
-		return dep;
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelloWorldNewWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelloWorldNewWizard.java
deleted file mode 100644
index 968f8d1..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelloWorldNewWizard.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.ui.*;
-import org.eclipse.pde.ui.templates.*;
-
-public class HelloWorldNewWizard extends NewPluginTemplateWizard {
-	/**
-	 * Constructor for HelloWorldNewWizard.
-	 */
-	public HelloWorldNewWizard() {
-		super();
-	}
-
-	public void init(IFieldData data) {
-		super.init(data);
-		setWindowTitle(PDEUIMessages.HelloWorldNewWizard_wtitle);
-	}
-	/*
-	 * @see NewExtensionTemplateWizard#createTemplateSections()
-	 */
-	public ITemplateSection[] createTemplateSections() {
-		return new ITemplateSection [] {
-				new HelloWorldTemplate() };
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelloWorldTemplate.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelloWorldTemplate.java
deleted file mode 100644
index 6cffe87..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelloWorldTemplate.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.*;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.jface.wizard.*;
-
-public class HelloWorldTemplate extends PDETemplateSection {
-	public static final String KEY_CLASS_NAME = "className"; //$NON-NLS-1$
-	public static final String KEY_MESSAGE = "message"; //$NON-NLS-1$
-	public static final String CLASS_NAME = "SampleAction"; //$NON-NLS-1$
-
-	/**
-	 * Constructor for HelloWorldTemplate.
-	 */
-	public HelloWorldTemplate() {
-		setPageCount(1);
-		createOptions();
-	}
-
-	public String getSectionId() {
-		return "helloWorld"; //$NON-NLS-1$
-	}
-	/*
-	 * @see ITemplateSection#getNumberOfWorkUnits()
-	 */
-	public int getNumberOfWorkUnits() {
-		return super.getNumberOfWorkUnits() + 1;
-	}
-	
-	private void createOptions() {
-		addOption(
-			KEY_PACKAGE_NAME,
-			PDEUIMessages.HelloWorldTemplate_packageName,
-			(String) null,
-			0);
-		addOption(
-			KEY_CLASS_NAME,
-			PDEUIMessages.HelloWorldTemplate_className,
-			CLASS_NAME,
-			0);
-		addOption(
-			KEY_MESSAGE,
-			PDEUIMessages.HelloWorldTemplate_messageText,
-			PDEUIMessages.HelloWorldTemplate_defaultMessage,
-			0);
-	}
-
-	public void addPages(Wizard wizard) {
-		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_HELLO_WORLD);
-		page.setTitle(PDEUIMessages.HelloWorldTemplate_title);
-		page.setDescription(PDEUIMessages.HelloWorldTemplate_desc);
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-
-	public void validateOptions(TemplateOption source) {
-		if (source.isRequired() && source.isEmpty()) {
-			flagMissingRequiredOption(source);
-		} else {
-			validateContainerPage(source);
-		}
-	}
-
-	private void validateContainerPage(TemplateOption source) {
-		TemplateOption[] allPageOptions = getOptions(0);
-		for (int i = 0; i < allPageOptions.length; i++) {
-			TemplateOption nextOption = allPageOptions[i];
-			if (nextOption.isRequired() && nextOption.isEmpty()) {
-				flagMissingRequiredOption(nextOption);
-				return;
-			}
-		}
-		resetPageState();
-	}
-
-
-	public boolean isDependentOnParentWizard() {
-		return true;
-	}
-
-	protected void initializeFields(IFieldData data) {
-		// In a new project wizard, we don't know this yet - the
-		// model has not been created
-		String id = data.getId();
-		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(id)); 
-	}
-	public void initializeFields(IPluginModelBase model) {
-		// In the new extension wizard, the model exists so 
-		// we can initialize directly from it
-		String pluginId = model.getPluginBase().getId();
-		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(pluginId)); 
-	}
-
-	public String getUsedExtensionPoint() {
-		return "org.eclipse.ui.actionSets"; //$NON-NLS-1$
-	}
-
-	protected void updateModel(IProgressMonitor monitor) throws CoreException {
-		IPluginBase plugin = model.getPluginBase();
-		IPluginExtension extension = createExtension("org.eclipse.ui.actionSets", true); //$NON-NLS-1$
-		IPluginModelFactory factory = model.getPluginFactory();
-
-		IPluginElement setElement = factory.createElement(extension);
-		setElement.setName("actionSet"); //$NON-NLS-1$
-		setElement.setAttribute("id", plugin.getId() + ".actionSet"); //$NON-NLS-1$ //$NON-NLS-2$
-		setElement.setAttribute("label", PDEUIMessages.HelloWorldTemplate_sampleActionSet); //$NON-NLS-1$
-		setElement.setAttribute("visible", "true"); //$NON-NLS-1$ //$NON-NLS-2$
-
-		IPluginElement menuElement = factory.createElement(setElement);
-		menuElement.setName("menu"); //$NON-NLS-1$
-		menuElement.setAttribute("label", PDEUIMessages.HelloWorldTemplate_sampleMenu); //$NON-NLS-1$
-		menuElement.setAttribute("id", "sampleMenu"); //$NON-NLS-1$ //$NON-NLS-2$
-
-		IPluginElement groupElement = factory.createElement(menuElement);
-		groupElement.setName("separator"); //$NON-NLS-1$
-		groupElement.setAttribute("name", "sampleGroup"); //$NON-NLS-1$ //$NON-NLS-2$
-		menuElement.add(groupElement);
-		setElement.add(menuElement);
-
-		String fullClassName =
-			getStringOption(KEY_PACKAGE_NAME) + "." + getStringOption(KEY_CLASS_NAME); //$NON-NLS-1$
-
-		IPluginElement actionElement = factory.createElement(setElement);
-		actionElement.setName("action"); //$NON-NLS-1$
-		actionElement.setAttribute("id", fullClassName); //$NON-NLS-1$
-		actionElement.setAttribute("label", PDEUIMessages.HelloWorldTemplate_sampleAction); //$NON-NLS-1$
-		actionElement.setAttribute("menubarPath", "sampleMenu/sampleGroup"); //$NON-NLS-1$ //$NON-NLS-2$
-		actionElement.setAttribute("toolbarPath", "sampleGroup"); //$NON-NLS-1$ //$NON-NLS-2$
-		actionElement.setAttribute("icon", "icons/sample.gif"); //$NON-NLS-1$ //$NON-NLS-2$
-		actionElement.setAttribute("tooltip", PDEUIMessages.HelloWorldTemplate_defaultMessage); //$NON-NLS-1$
-		actionElement.setAttribute("class", fullClassName); //$NON-NLS-1$
-		setElement.add(actionElement);
-		extension.add(setElement);
-		if (!extension.isInTheModel())
-			plugin.add(extension);			
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.ITemplateSection#getFoldersToInclude()
-	 */
-	public String[] getNewFiles() {
-		return new String[] {"icons/"}; //$NON-NLS-1$
-	}
-	
-	/* (non-Javadoc)
-     * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#formatPackageName(java.lang.String)
-     */
-    protected String getFormattedPackageName(String id) {
-        String packageName = super.getFormattedPackageName(id);
-        if (packageName.length() != 0)
-            return packageName + ".actions"; //$NON-NLS-1$
-        return "actions"; //$NON-NLS-1$
-    }
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelpTemplate.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelpTemplate.java
deleted file mode 100644
index 99e709f..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/HelpTemplate.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-import java.io.File;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.core.plugin.IPluginBase;
-import org.eclipse.pde.core.plugin.IPluginElement;
-import org.eclipse.pde.core.plugin.IPluginExtension;
-import org.eclipse.pde.core.plugin.IPluginModelFactory;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.ui.templates.BooleanOption;
-import org.eclipse.pde.ui.templates.TemplateOption;
-
-public class HelpTemplate extends PDETemplateSection {
-	
-	public static final String KEY_TOC_LABEL   = "tocLabel"; //$NON-NLS-1$
-	public static final String KEY_IS_PRIMARY  = "isPrimary"; //$NON-NLS-1$
-	public static final String KEY_GEN_TEST    = "generateTest"; //$NON-NLS-1$
-	public static final String KEY_GET_STARTED = "gettingStarted"; //$NON-NLS-1$
-	public static final String KEY_CONCEPTS    = "concepts"; //$NON-NLS-1$
-	public static final String KEY_TASKS       = "tasks"; //$NON-NLS-1$
-	public static final String KEY_REFERENCE   = "reference"; //$NON-NLS-1$
-	public static final String KEY_SAMPLES     = "samples"; //$NON-NLS-1$
-	
-	private TemplateOption tocLabelOption;
-	private BooleanOption primaryOption;
-	private BooleanOption genTestOption;
-	private BooleanOption gettingStartedOption;
-	private BooleanOption conceptsOption;
-	private BooleanOption tasksOption;
-	private BooleanOption referenceOption;
-	private BooleanOption samplesOption;
-	
-	public HelpTemplate() {
-		setPageCount(1);
-		createOptions();
-		alterOptionStates();
-	}
-
-	public void addPages(Wizard wizard) {
-		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_HELP);
-		page.setTitle(PDEUIMessages.HelpTemplate_title);
-		page.setDescription(PDEUIMessages.HelpTemplate_desc);
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-	
-	private void alterOptionStates() {
-		genTestOption.setEnabled(!primaryOption.isSelected());
-		gettingStartedOption.setEnabled(primaryOption.isSelected());
-		conceptsOption.setEnabled(primaryOption.isSelected());
-		tasksOption.setEnabled(primaryOption.isSelected());
-		referenceOption.setEnabled(primaryOption.isSelected());
-		samplesOption.setEnabled(primaryOption.isSelected());
-	}	
-
-	private void createOptions() {
-		tocLabelOption = addOption(
-			KEY_TOC_LABEL,
-			PDEUIMessages.HelpTemplate_tocLabel,
-			"Sample Table of Contents", //$NON-NLS-1$
-			0);
-			
-		primaryOption = (BooleanOption)addOption(
-			KEY_IS_PRIMARY,
-			PDEUIMessages.HelpTemplate_isPrimary,
-			false,
-			0);
-			
-		genTestOption = (BooleanOption)addOption(
-			KEY_GEN_TEST,
-			PDEUIMessages.HelpTemplate_generateTest,
-			true,
-			0);
-
-		gettingStartedOption = (BooleanOption)addOption(
-			KEY_GET_STARTED,
-			PDEUIMessages.HelpTemplate_gettingStarted,
-			true,
-			0);
-			
-		conceptsOption = (BooleanOption)addOption(
-			KEY_CONCEPTS,
-			PDEUIMessages.HelpTemplate_concepts,
-			true,
-			0);
-			
-		tasksOption = (BooleanOption)addOption(
-			KEY_TASKS,
-			PDEUIMessages.HelpTemplate_tasks,
-			true,
-			0);
-			
-		referenceOption = (BooleanOption)addOption(
-			KEY_REFERENCE,
-			PDEUIMessages.HelpTemplate_reference,
-			true,
-			0);
-			
-		samplesOption = (BooleanOption)addOption(
-			KEY_SAMPLES,
-			PDEUIMessages.HelpTemplate_samples,
-			true,
-			0);
-
-	}
-	/**
-	 * @see OptionTemplateSection#getSectionId()
-	 */
-	public String getSectionId() {
-		return "help"; //$NON-NLS-1$
-	}
-
-	protected boolean isOkToCreateFolder(File sourceFolder) {
-		boolean isOk = true;
-		String folderName = sourceFolder.getName();
-		if (folderName.equals("concepts")) { //$NON-NLS-1$
-			isOk = conceptsOption.isEnabled() && conceptsOption.isSelected();
-		} else if (folderName.equals("gettingstarted")) { //$NON-NLS-1$
-			isOk = gettingStartedOption.isEnabled() && gettingStartedOption.isSelected();
-		} else if (folderName.equals("reference")) { //$NON-NLS-1$
-			isOk = referenceOption.isEnabled() && referenceOption.isSelected();
-		} else if (folderName.equals("samples")) { //$NON-NLS-1$
-			isOk = samplesOption.isEnabled() && samplesOption.isSelected();
-		} else if (folderName.equals("tasks")) { //$NON-NLS-1$
-			isOk = tasksOption.isEnabled() && tasksOption.isSelected();
-		}
-		return isOk;
-	}
-	/**
-	 * @see AbstractTemplateSection#isOkToCreateFile(File)
-	 */
-	protected boolean isOkToCreateFile(File sourceFile) {
-		boolean isOk = true;
-		String fileName = sourceFile.getName();
-		if (fileName.equals("testToc.xml")) { //$NON-NLS-1$
-			isOk = genTestOption.isEnabled() && genTestOption.isSelected();
-		} else if (fileName.equals("tocconcepts.xml")) { //$NON-NLS-1$
-			isOk = conceptsOption.isEnabled() && conceptsOption.isSelected();
-		} else if (fileName.equals("tocgettingstarted.xml")) { //$NON-NLS-1$
-			isOk = gettingStartedOption.isEnabled() && gettingStartedOption.isSelected();
-		} else if (fileName.equals("tocreference.xml")) { //$NON-NLS-1$
-			isOk = referenceOption.isEnabled() && referenceOption.isSelected();
-		} else if (fileName.equals("tocsamples.xml")) { //$NON-NLS-1$
-			isOk = samplesOption.isEnabled() && samplesOption.isSelected();
-		} else if (fileName.equals("toctasks.xml")) { //$NON-NLS-1$
-			isOk = tasksOption.isEnabled() && tasksOption.isSelected();
-		} else if (
-			(fileName.equals("maintopic.html") || fileName.equals("subtopic.html")) //$NON-NLS-1$ //$NON-NLS-2$
-				&& sourceFile.getParentFile().getName().equals("html")) { //$NON-NLS-1$
-			isOk =
-				!primaryOption.isSelected()
-					|| (primaryOption.isSelected()
-						&& !gettingStartedOption.isSelected()
-						&& !conceptsOption.isSelected()
-						&& !tasksOption.isSelected()
-						&& !referenceOption.isSelected()
-						&& !samplesOption.isSelected());
-		}
-		return isOk;	
-	}
-	/**
-	 * @see BaseOptionTemplateSection#validateOptions(TemplateOption)
-	 */
-	public void validateOptions(TemplateOption changed) {
-		if (changed == tocLabelOption) {
-			if (changed.isEmpty()) {
-				flagMissingRequiredOption(changed);
-			} else {
-				resetPageState();
-			}
-		} else if (changed == primaryOption) {
-			alterOptionStates();
-		}
-	}
-
-	/**
-	 * @see AbstractTemplateSection#updateModel(IProgressMonitor)
-	 */
-	protected void updateModel(IProgressMonitor monitor) throws CoreException {
-		IPluginBase plugin = model.getPluginBase();
-		IPluginExtension extension = createExtension(getUsedExtensionPoint(), true);
-		IPluginModelFactory factory = model.getPluginFactory();
-
-		IPluginElement tocElement = factory.createElement(extension);
-		tocElement.setName("toc"); //$NON-NLS-1$
-		tocElement.setAttribute("file","toc.xml"); //$NON-NLS-1$ //$NON-NLS-2$
-		if (primaryOption.isSelected()) tocElement.setAttribute("primary","true"); //$NON-NLS-1$ //$NON-NLS-2$
-		extension.add(tocElement);
-		
-		if (genTestOption.isSelected() && genTestOption.isEnabled()) {
-			IPluginElement testTocElement = factory.createElement(extension);
-			testTocElement.setName("toc"); //$NON-NLS-1$
-			testTocElement.setAttribute("file","testToc.xml"); //$NON-NLS-1$ //$NON-NLS-2$
-			testTocElement.setAttribute("primary","true"); //$NON-NLS-1$ //$NON-NLS-2$
-			extension.add(testTocElement);
-		}
-		addNonPrimaryTopic(conceptsOption, "tocconcepts.xml", extension); //$NON-NLS-1$
-		addNonPrimaryTopic(gettingStartedOption, "tocgettingstarted.xml", extension); //$NON-NLS-1$
-		addNonPrimaryTopic(referenceOption, "tocreference.xml", extension); //$NON-NLS-1$
-		addNonPrimaryTopic(samplesOption, "tocsamples.xml", extension); //$NON-NLS-1$
-		addNonPrimaryTopic(tasksOption, "toctasks.xml", extension); //$NON-NLS-1$
-		
-		if (!extension.isInTheModel())
-			plugin.add(extension);
-	}
-	
-	private void addNonPrimaryTopic(BooleanOption option, String file, IPluginExtension extension) throws CoreException {
-		if (option.isEnabled() && option.isSelected()) {
-			IPluginElement tocElement = extension.getPluginModel().getPluginFactory().createElement(extension);
-			tocElement.setName("toc"); //$NON-NLS-1$
-			tocElement.setAttribute("file", file); //$NON-NLS-1$
-			extension.add(tocElement);
-		}
-	}
-
-	/**
-	 * @see ITemplateSection#getUsedExtensionPoint()
-	 */
-	public String getUsedExtensionPoint() {
-		return "org.eclipse.help.toc"; //$NON-NLS-1$
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getDependencies(java.lang.String)
-	 */
-	public IPluginReference[] getDependencies(String schemaVersion) {
-		return new IPluginReference[0];
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#getFoldersToInclude()
-	 */
-	public String[] getNewFiles() {
-		return new String[] {"html/", "*.xml"}; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/IntroNewWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/IntroNewWizard.java
deleted file mode 100644
index 1e70e4f..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/IntroNewWizard.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.ITemplateSection;
-import org.eclipse.pde.ui.templates.NewPluginTemplateWizard;
-
-public class IntroNewWizard extends NewPluginTemplateWizard {
-    
-    public void init(IFieldData data) {
-        super.init(data);
-        setWindowTitle(PDEUIMessages.IntroNewWizard_wtitle);      
-    }
-
-    public ITemplateSection[] createTemplateSections() {
-        return new ITemplateSection[] {new IntroTemplate()};
-    }
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/IntroTemplate.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/IntroTemplate.java
deleted file mode 100644
index ba4f9d0..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/IntroTemplate.java
+++ /dev/null

@@ -1,333 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-import java.io.File;
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.pde.core.plugin.IPluginBase;
-import org.eclipse.pde.core.plugin.IPluginElement;
-import org.eclipse.pde.core.plugin.IPluginExtension;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.core.plugin.IPluginModelFactory;
-import org.eclipse.pde.core.plugin.IPluginReference;
-import org.eclipse.pde.internal.core.plugin.PluginBase;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.TemplateOption;
-
-public class IntroTemplate extends PDETemplateSection {
-    
-    private static final String DYNAMIC_SELECTED = "dynamic"; //$NON-NLS-1$
-    
-    private static final String STATIC_SELECTED = "static"; //$NON-NLS-1$
-
-	private static final String KEY_PRODUCT_ID = "IntroTemplate.productID"; //$NON-NLS-1$
-
-	private static final String KEY_PRODUCT_NAME = "productName"; //$NON-NLS-1$
-
-	private static final String KEY_APPLICATION_ID = "IntroTemplate.application"; //$NON-NLS-1$
-
-    private static final String KEY_GENERATE_DYNAMIC_CONTENT = "IntroTemplate.generateDynamicContent"; //$NON-NLS-1$
-     
-    public static final String CLASS_NAME = "SampleXHTMLContentProvider"; //$NON-NLS-1$
-    
-    public static final String KEY_PERSPECTIVE_NAME = "perspectiveName"; //$NON-NLS-1$
-    
-    private String packageName;
-    private String introID;
-    private String perspectiveName;
-    private static final String APPLICATION_CLASS = "Application"; //$NON-NLS-1$
-
-	public IntroTemplate() {
-		super();
-		setPageCount(1);
-		createOptions();
-	}
-
-	private void createOptions() {
-
-		// product options
-		addOption(KEY_PRODUCT_ID, PDEUIMessages.IntroTemplate_productID,
-				"product", 0); //$NON-NLS-1$ 
-		addOption(KEY_PRODUCT_NAME, PDEUIMessages.IntroTemplate_productName,
-				"My New Product", 0); //$NON-NLS-1$        
-		addOption(KEY_APPLICATION_ID, PDEUIMessages.IntroTemplate_application,
-				"application", 0); //$NON-NLS-1$ 
-
-        addOption( KEY_GENERATE_DYNAMIC_CONTENT,
-                PDEUIMessages.IntroTemplate_generate,
-                new String[][] { {STATIC_SELECTED, PDEUIMessages.IntroTemplate_generateStaticContent}, 
-                                 {DYNAMIC_SELECTED, PDEUIMessages.IntroTemplate_generateDynamicContent}}, 
-                STATIC_SELECTED, 0); 
-	}
-    
-	public void addPages(Wizard wizard) {
-		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_INTRO);
-		page.setTitle(PDEUIMessages.IntroTemplate_title);
-		page.setDescription(PDEUIMessages.IntroTemplate_desc);
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-
-	public boolean isDependentOnParentWizard() {
-		return true;
-	}
-
-	public String getSectionId() {
-		return "intro"; //$NON-NLS-1$
-	}
-    
-    protected void initializeFields(IFieldData data) {
-        // In a new project wizard, we don't know this yet - the
-        // model has not been created
-        String pluginId = data.getId();
-        initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(pluginId) + ".intro");  //$NON-NLS-1$
-        initializeOption(KEY_APPLICATION_ID, getFormattedPackageName(pluginId) + ".application");  //$NON-NLS-1$
-        initializeOption(KEY_PERSPECTIVE_NAME, getFormattedPackageName(pluginId) + " Perspective");  //$NON-NLS-1$
-        perspectiveName = getFormattedPackageName(pluginId) + ".perspective"; //$NON-NLS-1$
-        packageName =  getFormattedPackageName(pluginId) + ".intro"; //$NON-NLS-1$
-        introID = getFormattedPackageName(pluginId) + ".intro"; //$NON-NLS-1$
-    }
-    public void initializeFields(IPluginModelBase model) {
-        // In the new extension wizard, the model exists so 
-        // we can initialize directly from it
-        String pluginId = model.getPluginBase().getId();
-        initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(pluginId) + ".intro");  //$NON-NLS-1$
-        initializeOption(KEY_APPLICATION_ID, getFormattedPackageName(pluginId) + ".application");  //$NON-NLS-1$
-        initializeOption(KEY_PERSPECTIVE_NAME, getFormattedPackageName(pluginId) + " Perspective");  //$NON-NLS-1$
-        perspectiveName = getFormattedPackageName(pluginId) + ".perspective"; //$NON-NLS-1$
-        packageName =  getFormattedPackageName(pluginId) + ".intro"; //$NON-NLS-1$
-        introID = getFormattedPackageName(pluginId) + ".intro"; //$NON-NLS-1$
-    }
-
-	public void validateOptions(TemplateOption source) {
-        
-		if (source.isRequired() && source.isEmpty()) {
-			flagMissingRequiredOption(source);
-		} else {
-			validateContainerPage(source);
-		}        
-	}
-
-	private void validateContainerPage(TemplateOption source) {
-		TemplateOption[] allPageOptions = getOptions(0);
-		for (int i = 0; i < allPageOptions.length; i++) {
-			TemplateOption nextOption = allPageOptions[i];
-			if (nextOption.isRequired() && nextOption.isEmpty()) {        
-                    flagMissingRequiredOption(nextOption);
-				    return;
-			}
-		}
-		resetPageState();
-	}
-
-	protected void updateModel(IProgressMonitor monitor) throws CoreException {
-
-		IPluginBase plugin = model.getPluginBase();
-		IPluginModelFactory factory = model.getPluginFactory();
-        		
-		// org.eclipse.core.runtime.applications
-		IPluginExtension extension = createExtension("org.eclipse.core.runtime.applications", true); //$NON-NLS-1$
-		extension.setId(getStringOption(KEY_APPLICATION_ID));
-		
-		IPluginElement element = model.getPluginFactory().createElement(extension);
-		element.setName("application"); //$NON-NLS-1$
-		extension.add(element);
-		
-		IPluginElement run = model.getPluginFactory().createElement(element);
-		run.setName("run"); //$NON-NLS-1$
-		run.setAttribute("class", getStringOption(KEY_PACKAGE_NAME) + "." + APPLICATION_CLASS); //$NON-NLS-1$ //$NON-NLS-2$
-		element.add(run);
-		
-		if (!extension.isInTheModel())
-			plugin.add(extension);
-		
-		
-		// org.eclipse.ui.perspectives
-		IPluginExtension perspectivesExtension = createExtension("org.eclipse.ui.perspectives", true); //$NON-NLS-1$
-		IPluginElement perspectiveElement = model.getPluginFactory().createElement(perspectivesExtension);
-		perspectiveElement.setName("perspective"); //$NON-NLS-1$
-		perspectiveElement.setAttribute("class", getStringOption(KEY_PACKAGE_NAME) + ".Perspective"); //$NON-NLS-1$ //$NON-NLS-2$
-		perspectiveElement.setAttribute("name", getStringOption(KEY_PERSPECTIVE_NAME)); //$NON-NLS-1$
-		perspectiveElement.setAttribute("id", plugin.getId() + ".perspective"); //$NON-NLS-1$ //$NON-NLS-2$
-		perspectivesExtension.add(perspectiveElement);
-		
-		if (!perspectivesExtension.isInTheModel())
-			plugin.add(perspectivesExtension);
-
-
-		// org.eclipse.core.runtime.products
-		IPluginExtension extension1 = createExtension(
-				"org.eclipse.core.runtime.products", true); //$NON-NLS-1$
-		extension1.setId(getStringOption(KEY_PRODUCT_ID));
-		//extension1.setName("org.eclipse.core.runtime.products"); //$NON-NLS-1$
-
-		IPluginElement productElement = factory.createElement(extension1);
-		productElement.setName("product"); //$NON-NLS-1$
-		productElement.setAttribute("name", getStringOption(KEY_PRODUCT_NAME)); //$NON-NLS-1$
-		productElement.setAttribute(
-				"application", plugin.getId() + "." + getStringOption(KEY_APPLICATION_ID)); //$NON-NLS-1$ //$NON-NLS-2$
-		extension1.add(productElement);
-
-		if (!extension1.isInTheModel())
-			plugin.add(extension1);
-
-		// org.eclipse.ui.intro
-		IPluginExtension extension2 = createExtension(
-				"org.eclipse.ui.intro", true); //$NON-NLS-1$
-
-		IPluginElement introElement = factory.createElement(extension2);
-		introElement.setName("intro"); //$NON-NLS-1$
-		introElement.setAttribute("id", introID); //$NON-NLS-1$
-		introElement.setAttribute("class", //$NON-NLS-1$
-				"org.eclipse.ui.intro.config.CustomizableIntroPart"); //$NON-NLS-1$
-		extension2.add(introElement);
-
-		IPluginElement introProductBindingElement = factory
-				.createElement(extension2);
-		introProductBindingElement.setName("introProductBinding"); //$NON-NLS-1$
-		introProductBindingElement.setAttribute("introId", introID);//$NON-NLS-1$
-                
-		introProductBindingElement.setAttribute("productId", plugin.getId() //$NON-NLS-1$
-				+ '.' + getStringOption(KEY_PRODUCT_ID));
-		extension2.add(introProductBindingElement);
-
-		if (!extension2.isInTheModel())
-			plugin.add(extension2);
-
-		// org.eclipse.ui.intro.config
-		IPluginExtension extension3 = createExtension(
-				"org.eclipse.ui.intro.config", true); //$NON-NLS-1$
-
-		IPluginElement configurationElement = factory.createElement(extension3);
-		configurationElement.setName("config"); //$NON-NLS-1$
-		configurationElement.setAttribute("id", plugin.getId() + '.' //$NON-NLS-1$
-				+ "configId"); //$NON-NLS-1$
-		configurationElement.setAttribute("introId", introID);//$NON-NLS-1$            
-		configurationElement.setAttribute("content", "introContent.xml"); //$NON-NLS-1$ //$NON-NLS-2$
-		IPluginElement presentationElement = factory
-				.createElement(configurationElement);
-		presentationElement.setName("presentation"); //$NON-NLS-1$
-		presentationElement.setAttribute("home-page-id", "root"); //$NON-NLS-1$ //$NON-NLS-2$
-		IPluginElement implementationElement = factory
-				.createElement(presentationElement);
-		implementationElement.setName("implementation"); //$NON-NLS-1$
-        implementationElement.setAttribute("os", "win32,linux,macosx"); //$NON-NLS-1$ //$NON-NLS-2$
-        if ( ((PluginBase)plugin).getTargetVersion().equals("3.0")) {   //$NON-NLS-1$
-            implementationElement.setAttribute("style", "content/shared.css");  //$NON-NLS-1$//$NON-NLS-2$
-        }
-		implementationElement.setAttribute("kind", "html"); //$NON-NLS-1$ //$NON-NLS-2$
-		presentationElement.add(implementationElement);
-		configurationElement.add(presentationElement);
-		extension3.add(configurationElement);
-
-		if (!extension3.isInTheModel())
-			plugin.add(extension3);
-        
-        // org.eclipse.ui.intro.configExtension
-        if (getValue(KEY_GENERATE_DYNAMIC_CONTENT).toString().equals(DYNAMIC_SELECTED)) {
-            IPluginExtension extension4 = createExtension(
-                "org.eclipse.ui.intro.configExtension", true); //$NON-NLS-1$
-
-            IPluginElement configExtensionElement = factory.createElement(extension4);
-            configExtensionElement.setName("configExtension"); //$NON-NLS-1$
-            configExtensionElement.setAttribute("configId", plugin.getId() + '.' + "configId"); //$NON-NLS-1$ //$NON-NLS-2$
-            configExtensionElement.setAttribute("content", "ext.xml"); //$NON-NLS-1$ //$NON-NLS-2$
-            extension4.add(configExtensionElement);
-
-            if (!extension4.isInTheModel())
-                plugin.add(extension4);
-        }
-
-
-	}
-
-	protected boolean isOkToCreateFolder(File sourceFolder) {
-		return true;
-	}
-
-	/**
-	 * @see AbstractTemplateSection#isOkToCreateFile(File)
-	 */
-	protected boolean isOkToCreateFile(File sourceFile) {
-
-        if ( getValue(KEY_GENERATE_DYNAMIC_CONTENT).toString().equals(STATIC_SELECTED) && 
-                (sourceFile.getName().equals("DynamicContentProvider.java") ||  //$NON-NLS-1$
-                 sourceFile.getName().equals("concept3.xhtml") || //$NON-NLS-1$
-                 sourceFile.getName().equals("extContent.xhtml") || //$NON-NLS-1$
-                 sourceFile.getName().equals("ext.xml") ) ) { //$NON-NLS-1$
-            return false;
-        }
-        
-        return true;
-	}
-
-	public String getUsedExtensionPoint() {
-		return "org.eclipse.ui.intro"; // need more then one extension point //$NON-NLS-1$
-	}
-
-	public IPluginReference[] getDependencies(String schemaVersion) {
-		ArrayList result = new ArrayList();
-
-		result.add(new PluginReference("org.eclipse.ui.intro", null, 0)); //$NON-NLS-1$
-        result.add(new PluginReference("org.eclipse.core.runtime", null, 0)); //$NON-NLS-1$
-        result.add(new PluginReference("org.eclipse.ui", null, 0)); //$NON-NLS-1$
-        
-        if ( getValue(KEY_GENERATE_DYNAMIC_CONTENT).toString().equals(DYNAMIC_SELECTED)) {
-            result.add(new PluginReference("org.eclipse.ui.forms", null, 0)); //$NON-NLS-1$
-            result.add(new PluginReference("org.eclipse.swt", null, 0)); //$NON-NLS-1$
-        }
-
-		return (IPluginReference[]) result.toArray(new IPluginReference[result
-				.size()]);
-	}
-
-	public int getNumberOfWorkUnits() {
-		return super.getNumberOfWorkUnits() + 1;
-	}
-    
-    public Object getValue(String valueName) {
-        
-        if (valueName.equals(KEY_PACKAGE_NAME)) {
-            return packageName;
-        }
-        
-        return super.getValue(valueName);
-    }
-    
-    public String getStringOption(String name) {
-        
-        if (name.equals(KEY_PERSPECTIVE_NAME)) {
-            return perspectiveName;
-        } else if ( name.equals(KEY_PACKAGE_NAME)) {
-            return packageName;
-        }
-        
-        return super.getStringOption(name);
-    }
-
-    public String[] getNewFiles() {
-        
-       if ( getValue(KEY_GENERATE_DYNAMIC_CONTENT).toString().equals(STATIC_SELECTED)) {
-           return new String[] {"content/", "splash.bmp", "introContent.xml"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-       } 
-           
-       return new String[] {"content/", "splash.bmp", "introContent.xml", "ext.xml"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-       
-    }
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/MailNewWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/MailNewWizard.java
deleted file mode 100644
index 9179a12..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/MailNewWizard.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.ui.*;
-import org.eclipse.pde.ui.templates.*;
-
-
-public class MailNewWizard extends NewPluginTemplateWizard {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractNewPluginTemplateWizard#init(org.eclipse.pde.ui.IFieldData)
-	 */
-	public void init(IFieldData data) {
-		super.init(data);
-		setWindowTitle(PDEUIMessages.MailNewWizard_title); 
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.NewPluginTemplateWizard#createTemplateSections()
-	 */
-	public ITemplateSection[] createTemplateSections() {
-		return new ITemplateSection[] {new MailTemplate()};
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/MailTemplate.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/MailTemplate.java
deleted file mode 100644
index 6e6d192..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/MailTemplate.java
+++ /dev/null

@@ -1,354 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.plugin.PluginBase;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.ui.*;
-import org.eclipse.pde.ui.templates.*;
-
-
-public class MailTemplate extends PDETemplateSection {
-	
-	public static final String KEY_PRODUCT_NAME = "productName"; //$NON-NLS-1$
-	public static final String KEY_PRODUCT_ID = "productID"; //$NON-NLS-1$
-	public static final String KEY_PERSPECTIVE_NAME = "perspectiveName"; //$NON-NLS-1$
-	public static final String KEY_WORKBENCH_ADVISOR = "advisor"; //$NON-NLS-1$
-	public static final String KEY_APPLICATION_CLASS = "applicationClass"; //$NON-NLS-1$
-	public static final String KEY_APPLICATION_ID = "applicationID"; //$NON-NLS-1$
-	
-	public MailTemplate() {
-		setPageCount(1);
-		createOptions();
-	}
-	
-	public void addPages(Wizard wizard) {
-		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_RCP_MAIL);
-		page.setTitle(PDEUIMessages.MailTemplate_title); 
-		page.setDescription(PDEUIMessages.MailTemplate_desc); 
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-
-	
-	private void createOptions() {	
-		addOption(KEY_PRODUCT_NAME, PDEUIMessages.MailTemplate_productName, "RCP Product", 0); //$NON-NLS-1$ 
-		
-		addOption(KEY_PRODUCT_ID, PDEUIMessages.MailTemplate_productID, "product", 0); //$NON-NLS-1$ 
-		
-		addOption(KEY_APPLICATION_ID, PDEUIMessages.MailTemplate_appId, "application", 0); //$NON-NLS-1$ 
-		
-		addOption(KEY_PERSPECTIVE_NAME, PDEUIMessages.MailTemplate_perspectiveName, (String)null, 0); // 
-		
-		addOption(KEY_PACKAGE_NAME, PDEUIMessages.MailTemplate_packageName, (String) null, 0); //		
-
-		addOption(KEY_APPLICATION_CLASS, PDEUIMessages.MailTemplate_appClass, "Application", 0); //$NON-NLS-1$ 
-	}
-	
-	protected void initializeFields(IFieldData data) {
-		// In a new project wizard, we don't know this yet - the
-		// model has not been created
-		String packageName = getFormattedPackageName(data.getId());
-		initializeOption(KEY_PACKAGE_NAME, packageName);
-
-		int index = packageName.lastIndexOf('.');
-		String name = packageName.substring(index + 1) + " Perspective"; //$NON-NLS-1$
-		initializeOption(KEY_PERSPECTIVE_NAME, Character.toUpperCase(name.charAt(0)) + name.substring(1));
-	}
-	
-	public void initializeFields(IPluginModelBase model) {
-		String packageName = getFormattedPackageName(model.getPluginBase().getId());
-		initializeOption(KEY_PACKAGE_NAME, packageName);
-
-		int index = packageName.lastIndexOf('.');
-		String name = packageName.substring(index + 1) + " Perspective"; //$NON-NLS-1$
-		initializeOption(KEY_PERSPECTIVE_NAME, Character.toUpperCase(name.charAt(0)) + name.substring(1));
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getSectionId()
-	 */
-	public String getSectionId() {
-		return "mail"; //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#validateOptions(org.eclipse.pde.ui.templates.TemplateOption)
-	 */
-	public void validateOptions(TemplateOption source) {
-		if (source.isRequired() && source.isEmpty()) {
-			flagMissingRequiredOption(source);
-		} else {
-			validateContainerPage(source);
-		}
-	}
-	
-	private void validateContainerPage(TemplateOption source) {
-		TemplateOption[] allPageOptions = getOptions(0);
-		for (int i = 0; i < allPageOptions.length; i++) {
-			TemplateOption nextOption = allPageOptions[i];
-			if (nextOption.isRequired() && nextOption.isEmpty()) {
-				flagMissingRequiredOption(nextOption);
-				return;
-			}
-		}
-		resetPageState();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#updateModel(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void updateModel(IProgressMonitor monitor) throws CoreException {
-		createApplicationExtension();
-		createPerspectiveExtension();
-		createViewExtension();
-        if ("3.1".compareTo(((PluginBase) model.getPluginBase()).getTargetVersion()) <= 0) { //$NON-NLS-1$
-            createCommandExtension(false);
-            createBindingsExtension();
-        } else {
-            createCommandExtension(true);
-        }
-		createProductExtension();
-	}
-	
-	private void createApplicationExtension() throws CoreException {
-		IPluginBase plugin = model.getPluginBase();
-		
-		IPluginExtension extension = createExtension("org.eclipse.core.runtime.applications", true); //$NON-NLS-1$
-		extension.setId(getStringOption(KEY_APPLICATION_ID));
-		
-		IPluginElement element = model.getPluginFactory().createElement(extension);
-		element.setName("application"); //$NON-NLS-1$
-		extension.add(element);
-		
-		IPluginElement run = model.getPluginFactory().createElement(element);
-		run.setName("run"); //$NON-NLS-1$
-		run.setAttribute("class", getStringOption(KEY_PACKAGE_NAME) + "." + getStringOption(KEY_APPLICATION_CLASS)); //$NON-NLS-1$ //$NON-NLS-2$
-		element.add(run);
-		
-		if (!extension.isInTheModel())
-			plugin.add(extension);
-	}
-
-	
-	private void createPerspectiveExtension() throws CoreException {
-		IPluginBase plugin = model.getPluginBase();
-		
-		IPluginExtension extension = createExtension("org.eclipse.ui.perspectives", true); //$NON-NLS-1$
-		IPluginElement element = model.getPluginFactory().createElement(extension);
-		element.setName("perspective"); //$NON-NLS-1$
-		element.setAttribute("class", getStringOption(KEY_PACKAGE_NAME) + ".Perspective"); //$NON-NLS-1$ //$NON-NLS-2$
-		element.setAttribute("name", getStringOption(KEY_PERSPECTIVE_NAME)); //$NON-NLS-1$
-		element.setAttribute("id", plugin.getId() + ".perspective"); //$NON-NLS-1$ //$NON-NLS-2$
-		extension.add(element);
-		
-		if (!extension.isInTheModel())
-			plugin.add(extension);
-	}
-	
-	private void createViewExtension() throws CoreException {
-		IPluginBase plugin = model.getPluginBase();
-		String id = plugin.getId();
-		IPluginExtension extension = createExtension("org.eclipse.ui.views", true); //$NON-NLS-1$
-		
-		IPluginElement view = model.getPluginFactory().createElement(extension);
-		view.setName("view"); //$NON-NLS-1$
-		view.setAttribute("allowMultiple", "true"); //$NON-NLS-1$ //$NON-NLS-2$
-		view.setAttribute("icon", "icons/sample2.gif"); //$NON-NLS-1$ //$NON-NLS-2$
-		view.setAttribute("class", getStringOption(KEY_PACKAGE_NAME) + ".View" ); //$NON-NLS-1$ //$NON-NLS-2$
-		view.setAttribute("name", "Message"); //$NON-NLS-1$ //$NON-NLS-2$
-		view.setAttribute("id", id + ".view"); //$NON-NLS-1$ //$NON-NLS-2$
-		extension.add(view);
-		
-		view = model.getPluginFactory().createElement(extension);
-		view.setName("view"); //$NON-NLS-1$
-		view.setAttribute("allowMultiple", "true"); //$NON-NLS-1$ //$NON-NLS-2$
-		view.setAttribute("icon", "icons/sample3.gif"); //$NON-NLS-1$ //$NON-NLS-2$
-		view.setAttribute("class", getStringOption(KEY_PACKAGE_NAME) + ".NavigationView" ); //$NON-NLS-1$ //$NON-NLS-2$
-		view.setAttribute("name", "Mailboxes"); //$NON-NLS-1$ //$NON-NLS-2$
-		view.setAttribute("id", id + ".navigationView"); //$NON-NLS-1$ //$NON-NLS-2$
-		extension.add(view);
-		
-		if (!extension.isInTheModel())
-			plugin.add(extension);
-	}
-	
-    private void createCommandExtension(boolean generateKeyBindings) throws CoreException {
-        IPluginBase plugin = model.getPluginBase(); 
-        String id = plugin.getId();
-        IPluginExtension extension = createExtension("org.eclipse.ui.commands", true); //$NON-NLS-1$
-
-        IPluginElement element = model.getPluginFactory().createElement(extension);
-        element.setName("category"); //$NON-NLS-1$
-        element.setAttribute("id", id + ".category"); //$NON-NLS-1$ //$NON-NLS-2$
-        element.setAttribute("name", "Mail"); //$NON-NLS-1$ //$NON-NLS-2$
-        extension.add(element);
-
-        element = model.getPluginFactory().createElement(extension);
-        element.setName("command"); //$NON-NLS-1$
-        element.setAttribute("description", "Opens a mailbox"); //$NON-NLS-1$ //$NON-NLS-2$
-        element.setAttribute("name", "Open Mailbox"); //$NON-NLS-1$ //$NON-NLS-2$
-        element.setAttribute("id", id + ".open"); //$NON-NLS-1$ //$NON-NLS-2$
-        element.setAttribute("categoryId", id + ".category"); //$NON-NLS-1$ //$NON-NLS-2$
-        extension.add(element);
-        
-        element = model.getPluginFactory().createElement(extension);
-        element.setName("command"); //$NON-NLS-1$
-        element.setAttribute("description", "Open a message dialog"); //$NON-NLS-1$ //$NON-NLS-2$
-        element.setAttribute("name", "Open Message Dialog"); //$NON-NLS-1$ //$NON-NLS-2$
-        element.setAttribute("id", id + ".openMessage");     //$NON-NLS-1$ //$NON-NLS-2$
-        element.setAttribute("categoryId", id + ".category"); //$NON-NLS-1$ //$NON-NLS-2$
-        extension.add(element);
-        
-        if(generateKeyBindings){
-            element = model.getPluginFactory().createElement(extension);
-            element.setName("keyConfiguration"); //$NON-NLS-1$
-            element.setAttribute("description", "The key configuration for this sample"); //$NON-NLS-1$ //$NON-NLS-2$
-            element.setAttribute("name", id + ".keyConfiguration"); //$NON-NLS-1$ //$NON-NLS-2$
-            element.setAttribute("id", id + ".keyConfiguration");    //$NON-NLS-1$ //$NON-NLS-2$
-            extension.add(element);
-            
-            element = model.getPluginFactory().createElement(extension);
-            element.setName("keyBinding"); //$NON-NLS-1$
-            element.setAttribute("commandId", id + ".open"); //$NON-NLS-1$ //$NON-NLS-2$
-            element.setAttribute("keySequence", "CTRL+2"); //$NON-NLS-1$ //$NON-NLS-2$
-            element.setAttribute("keyConfigurationId", "org.eclipse.ui.defaultAcceleratorConfiguration");    //$NON-NLS-1$ //$NON-NLS-2$
-            extension.add(element);
-            
-            element = model.getPluginFactory().createElement(extension);
-            element.setName("keyBinding"); //$NON-NLS-1$
-            element.setAttribute("commandId", id + ".openMessage"); //$NON-NLS-1$ //$NON-NLS-2$
-            element.setAttribute("keySequence", "CTRL+3"); //$NON-NLS-1$ //$NON-NLS-2$
-            element.setAttribute("keyConfigurationId", "org.eclipse.ui.defaultAcceleratorConfiguration");    //$NON-NLS-1$ //$NON-NLS-2$
-            extension.add(element);
-            
-            element = model.getPluginFactory().createElement(extension);
-            element.setName("keyBinding"); //$NON-NLS-1$
-            element.setAttribute("commandId", "org.eclipse.ui.file.exit"); //$NON-NLS-1$ //$NON-NLS-2$
-            element.setAttribute("keySequence", "CTRL+X"); //$NON-NLS-1$ //$NON-NLS-2$
-            element.setAttribute("keyConfigurationId", "org.eclipse.ui.defaultAcceleratorConfiguration");    //$NON-NLS-1$ //$NON-NLS-2$
-            extension.add(element);
-        }
-        
-        if (!extension.isInTheModel())
-            plugin.add(extension);
-    }
-    
-    private void createBindingsExtension() throws CoreException {
-        IPluginBase plugin = model.getPluginBase(); 
-        String id = plugin.getId();
-        IPluginExtension extension = createExtension("org.eclipse.ui.bindings", true); //$NON-NLS-1$
-
-        IPluginElement element = model.getPluginFactory().createElement(extension);
-        element.setName("key"); //$NON-NLS-1$
-        element.setAttribute("commandId", id + ".open"); //$NON-NLS-1$ //$NON-NLS-2$
-        element.setAttribute("sequence", "CTRL+2"); //$NON-NLS-1$ //$NON-NLS-2$
-        element.setAttribute("schemeId", "org.eclipse.ui.defaultAcceleratorConfiguration");    //$NON-NLS-1$ //$NON-NLS-2$
-        extension.add(element);
-        
-        element = model.getPluginFactory().createElement(extension);
-        element.setName("key"); //$NON-NLS-1$
-        element.setAttribute("commandId", id + ".openMessage"); //$NON-NLS-1$ //$NON-NLS-2$
-        element.setAttribute("sequence", "CTRL+3"); //$NON-NLS-1$ //$NON-NLS-2$
-        element.setAttribute("schemeId", "org.eclipse.ui.defaultAcceleratorConfiguration");    //$NON-NLS-1$ //$NON-NLS-2$
-        extension.add(element);
-        
-        element = model.getPluginFactory().createElement(extension);
-        element.setName("key"); //$NON-NLS-1$
-        element.setAttribute("commandId", "org.eclipse.ui.file.exit"); //$NON-NLS-1$ //$NON-NLS-2$
-        element.setAttribute("sequence", "CTRL+X"); //$NON-NLS-1$ //$NON-NLS-2$
-        element.setAttribute("schemeId", "org.eclipse.ui.defaultAcceleratorConfiguration");    //$NON-NLS-1$ //$NON-NLS-2$
-        extension.add(element);
-        
-        if (!extension.isInTheModel())
-            plugin.add(extension);
-    }
-    
-	private void createProductExtension() throws CoreException {
-		IPluginBase plugin = model.getPluginBase();
-		IPluginExtension extension = createExtension("org.eclipse.core.runtime.products", true); //$NON-NLS-1$
-		extension.setId(getStringOption(KEY_PRODUCT_ID));
-		
-		IPluginElement element = model.getFactory().createElement(extension);
-		element.setName("product"); //$NON-NLS-1$
-		element.setAttribute("name", getStringOption(KEY_PRODUCT_NAME)); //$NON-NLS-1$
-		element.setAttribute("application", plugin.getId() + "." + getStringOption(KEY_APPLICATION_ID)); //$NON-NLS-1$ //$NON-NLS-2$
-
-		IPluginElement property = model.getFactory().createElement(element);
-		property.setName("property"); //$NON-NLS-1$
-		property.setAttribute("name", "aboutText"); //$NON-NLS-1$ //$NON-NLS-2$
-		property.setAttribute("value", "%aboutText"); //$NON-NLS-1$ //$NON-NLS-2$
-		element.add(property);
-		
-		property = model.getFactory().createElement(element);
-		property.setName("property"); //$NON-NLS-1$
-		property.setAttribute("name", "windowImages"); //$NON-NLS-1$ //$NON-NLS-2$
-		property.setAttribute("value", "icons/sample2.gif"); //$NON-NLS-1$ //$NON-NLS-2$
-		element.add(property);
-
-		property = model.getFactory().createElement(element);
-		property.setName("property"); //$NON-NLS-1$
-		property.setAttribute("name", "aboutImage"); //$NON-NLS-1$ //$NON-NLS-2$
-		property.setAttribute("value", "product_lg.gif"); //$NON-NLS-1$ //$NON-NLS-2$
-		element.add(property);
-		
-		extension.add(element);
-		
-		if (!extension.isInTheModel()) {
-			plugin.add(extension);
-		}
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.ITemplateSection#getUsedExtensionPoint()
-	 */
-	public String getUsedExtensionPoint() {
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#isDependentOnParentWizard()
-	 */
-	public boolean isDependentOnParentWizard() {
-		return true;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getNumberOfWorkUnits()
-	 */
-	public int getNumberOfWorkUnits() {
-		return super.getNumberOfWorkUnits() + 1;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getDependencies(java.lang.String)
-	 */
-	public IPluginReference[] getDependencies(String schemaVersion) {
-		IPluginReference[] dep = new IPluginReference[2];
-		dep[0] = new PluginReference("org.eclipse.core.runtime", null, 0); //$NON-NLS-1$
-		dep[1] = new PluginReference("org.eclipse.ui", null, 0); //$NON-NLS-1$
-		return dep;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#getNewFiles()
-	 */
-	public String[] getNewFiles() {
-		return new String[] {"icons/", "plugin.properties", "product_lg.gif", "splash.bmp"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/MultiPageEditorNewWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/MultiPageEditorNewWizard.java
deleted file mode 100644
index e57ca6e..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/MultiPageEditorNewWizard.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.ui.*;
-import org.eclipse.pde.ui.templates.*;
-
-public class MultiPageEditorNewWizard extends NewPluginTemplateWizard {
-	/**
-	 * Constructor for MultiPageEditorNewWizard.
-	 */
-	public MultiPageEditorNewWizard() {
-		super();
-	}
-	public void init(IFieldData data) {
-		super.init(data);
-		setWindowTitle(PDEUIMessages.MultiPageEditorNewWizard_wtitle);
-	}
-
-	/*
-	 * @see NewExtensionTemplateWizard#createTemplateSections()
-	 */
-	public ITemplateSection[] createTemplateSections() {
-		return new ITemplateSection [] {
-				new MultiPageEditorTemplate(),
-				new NewWizardTemplate() };
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/MultiPageEditorTemplate.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/MultiPageEditorTemplate.java
deleted file mode 100644
index 4a76311..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/MultiPageEditorTemplate.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.*;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.jface.wizard.*;
-
-public class MultiPageEditorTemplate extends BaseEditorTemplate {
-	/**
-	 * Constructor for MultiPageEditorTemplate.
-	 */
-	public MultiPageEditorTemplate() {
-		setPageCount(1);
-		createOptions();
-	}
-
-	public String getSectionId() {
-		return "multiPageEditor"; //$NON-NLS-1$
-	}
-	
-	public IPluginReference[] getDependencies(String schemaVersion) {
-		if (schemaVersion != null) {
-			IPluginReference[] dep = new IPluginReference[7];
-			dep[0] = new PluginReference("org.eclipse.jface.text", null, 0); //$NON-NLS-1$
-			dep[1] = new PluginReference("org.eclipse.core.resources", null, 0); //$NON-NLS-1$
-			dep[2] = new PluginReference("org.eclipse.ui", null, 0); //$NON-NLS-1$
-			dep[3] = new PluginReference("org.eclipse.ui.editors", null, 0); //$NON-NLS-1$
-			dep[4] = new PluginReference("org.eclipse.ui.ide", null, 0); //$NON-NLS-1$
-			dep[5] = new PluginReference("org.eclipse.ui.workbench.texteditor", null, 0); //$NON-NLS-1$
-			dep[6] = new PluginReference("org.eclipse.core.runtime", null, 0); //$NON-NLS-1$
-			return dep;
-		}
-		return super.getDependencies(schemaVersion);
-	}
-	
-	/*
-	 * @see ITemplateSection#getNumberOfWorkUnits()
-	 */
-	public int getNumberOfWorkUnits() {
-		return super.getNumberOfWorkUnits() + 1;
-	}
-
-	private void createOptions() {
-		// first page	
-		addOption(
-			KEY_PACKAGE_NAME,
-			PDEUIMessages.MultiPageEditorTemplate_packageName,
-			(String) null,
-			0);
-		addOption(
-			"editorClassName", //$NON-NLS-1$
-			PDEUIMessages.MultiPageEditorTemplate_className,
-			"MultiPageEditor", //$NON-NLS-1$
-			0);
-		addOption(
-			"contributorClassName", //$NON-NLS-1$
-			PDEUIMessages.MultiPageEditorTemplate_contributor,
-			"MultiPageEditorContributor", //$NON-NLS-1$
-			0);
-		addOption(
-			"editorName", //$NON-NLS-1$
-			PDEUIMessages.MultiPageEditorTemplate_editorName,
-			PDEUIMessages.MultiPageEditorTemplate_defaultEditorName,
-			0);
-		addOption(
-			"extensions", //$NON-NLS-1$
-			PDEUIMessages.MultiPageEditorTemplate_extensions,
-			"mpe",  //$NON-NLS-1$
-			0);
-	}
-
-	protected void initializeFields(IFieldData data) {
-		// In a new project wizard, we don't know this yet - the
-		// model has not been created
-		String id = data.getId();
-		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(id)); 
-	}
-	public void initializeFields(IPluginModelBase model) {
-		// In the new extension wizard, the model exists so 
-		// we can initialize directly from it
-		String pluginId = model.getPluginBase().getId();
-		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(pluginId)); 
-	}
-
-	public boolean isDependentOnParentWizard() {
-		return true;
-	}
-
-	public void addPages(Wizard wizard) {
-		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_MULTIPAGE_EDITOR);
-		page.setTitle(PDEUIMessages.MultiPageEditorTemplate_title);
-		page.setDescription(PDEUIMessages.MultiPageEditorTemplate_desc);
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-
-	public void validateOptions(TemplateOption source) {
-		if (source.isRequired() && source.isEmpty()) {
-			flagMissingRequiredOption(source);
-		} else {
-			validateContainerPage(source);
-		}
-	}
-
-	private void validateContainerPage(TemplateOption source) {
-		TemplateOption[] allPageOptions = getOptions(0);
-		for (int i = 0; i < allPageOptions.length; i++) {
-			TemplateOption nextOption = allPageOptions[i];
-			if (nextOption.isRequired() && nextOption.isEmpty()) {
-				flagMissingRequiredOption(nextOption);
-				return;
-			}
-		}
-		resetPageState();
-	}
-
-	protected void updateModel(IProgressMonitor monitor) throws CoreException {
-		IPluginBase plugin = model.getPluginBase();
-		IPluginExtension extension = createExtension("org.eclipse.ui.editors", true); //$NON-NLS-1$
-		IPluginModelFactory factory = model.getPluginFactory();
-
-		String editorClassName =
-			getStringOption(KEY_PACKAGE_NAME) + "." + getStringOption("editorClassName"); //$NON-NLS-1$ //$NON-NLS-2$
-		String contributorClassName =
-			getStringOption(KEY_PACKAGE_NAME)
-				+ "." //$NON-NLS-1$
-				+ getStringOption("contributorClassName"); //$NON-NLS-1$
-
-		IPluginElement editorElement = factory.createElement(extension);
-		editorElement.setName("editor"); //$NON-NLS-1$
-		editorElement.setAttribute("id", editorClassName); //$NON-NLS-1$
-		editorElement.setAttribute("name", getStringOption("editorName")); //$NON-NLS-1$ //$NON-NLS-2$
-		editorElement.setAttribute("icon", "icons/sample.gif"); //$NON-NLS-1$ //$NON-NLS-2$
-		editorElement.setAttribute("extensions", getStringOption("extensions")); //$NON-NLS-1$ //$NON-NLS-2$
-
-		editorElement.setAttribute("class", editorClassName); //$NON-NLS-1$
-		editorElement.setAttribute("contributorClass", contributorClassName); //$NON-NLS-1$
-		extension.add(editorElement);
-		if (!extension.isInTheModel())
-			plugin.add(extension);
-	}
-	
-	/* (non-Javadoc)
-     * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#formatPackageName(java.lang.String)
-     */
-    protected String getFormattedPackageName(String id) {
-        String packageName = super.getFormattedPackageName(id);
-        if (packageName.length() != 0)
-            return packageName + ".editors"; //$NON-NLS-1$
-        return "editors"; //$NON-NLS-1$
-    }
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/NewPluginTemplateChoiceWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/NewPluginTemplateChoiceWizard.java
deleted file mode 100644
index 8906a94..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/NewPluginTemplateChoiceWizard.java
+++ /dev/null

@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.ui.templates.*;
-
-public class NewPluginTemplateChoiceWizard
-	extends AbstractNewPluginTemplateWizard {
-	private TemplateSelectionPage fSelectionPage;
-    private ITemplateSection[] fCandiates;
-
-	public NewPluginTemplateChoiceWizard() {
-	}
-
-	public ITemplateSection[] getTemplateSections() {
-        if (fSelectionPage != null) {
-            return fSelectionPage.getSelectedTemplates();
-        }
-        return getCandidates();
-    }
-
-	public void addAdditionalPages() {
-		fSelectionPage = new TemplateSelectionPage(getCandidates());
-		addPage(fSelectionPage);
-	}
-	
-	public IWizardPage getNextPage(IWizardPage page) {
-		if (fSelectionPage == null)
-			return null;
-		return fSelectionPage.getNextVisiblePage(page);
-	}
-	public IWizardPage getPreviousPage(IWizardPage page) {
-		return null;
-	}
-    private ITemplateSection[] getCandidates() {
-        if (fCandiates == null) {
-            createCandidates();
-        }
-        return fCandiates;
-
-    }
-
-    private void createCandidates() {
-        ArrayList candidates;
-        candidates = new ArrayList();
-        IExtensionRegistry registry = Platform.getExtensionRegistry();
-        IConfigurationElement[] elements = registry
-                .getConfigurationElementsFor(PDEPlugin.getPluginId(),
-                        "templates"); //$NON-NLS-1$
-        for (int i = 0; i < elements.length; i++) {
-            IConfigurationElement element = elements[i];
-            addTemplate(element, candidates);
-        }
-        fCandiates = (ITemplateSection[]) candidates
-                .toArray(new ITemplateSection[candidates.size()]);
-    }
-
-    private void addTemplate(IConfigurationElement config, ArrayList result) {
-        if (config.getName().equalsIgnoreCase("template") == false) //$NON-NLS-1$
-            return;
-
-        try {
-            Object template = config.createExecutableExtension("class"); //$NON-NLS-1$
-            if (template instanceof ITemplateSection) {
-                result.add(template);
-            }
-        } catch (CoreException e) {
-            PDEPlugin.log(e);
-        }
-    }
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/NewWizardTemplate.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/NewWizardTemplate.java
deleted file mode 100644
index e228e9c..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/NewWizardTemplate.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-import java.util.*;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.jface.wizard.*;
-
-public class NewWizardTemplate extends PDETemplateSection {
-	public NewWizardTemplate() {
-		setPageCount(1);
-		createOptions();
-	}
-	
-	public String getSectionId() {
-		return "newWizard"; //$NON-NLS-1$
-	}
-	/*
-	 * @see ITemplateSection#getNumberOfWorkUnits()
-	 */
-	public int getNumberOfWorkUnits() {
-		return super.getNumberOfWorkUnits()+1;
-	}
-	
-	private void createOptions() {
-		// first page
-		addOption(KEY_PACKAGE_NAME, PDEUIMessages.NewWizardTemplate_packageName, (String)null, 0);
-		addOption("categoryId", PDEUIMessages.NewWizardTemplate_categoryId, (String)null, 0); //$NON-NLS-1$
-		addOption("categoryName", PDEUIMessages.NewWizardTemplate_categoryName, "Sample Wizards", 0); //$NON-NLS-1$ //$NON-NLS-2$
-		addOption("wizardClassName", PDEUIMessages.NewWizardTemplate_className, "SampleNewWizard", 0); //$NON-NLS-1$ //$NON-NLS-2$
-		addOption("wizardPageClassName", PDEUIMessages.NewWizardTemplate_pageClassName, "SampleNewWizardPage", 0); //$NON-NLS-1$ //$NON-NLS-2$
-		addOption("wizardName", PDEUIMessages.NewWizardTemplate_wizardName, PDEUIMessages.NewWizardTemplate_defaultName, 0); //$NON-NLS-1$
-		addOption("extension", PDEUIMessages.NewWizardTemplate_extension, "mpe", 0);  //$NON-NLS-1$ //$NON-NLS-2$
-		addOption("initialFileName", PDEUIMessages.NewWizardTemplate_fileName,"new_file.mpe", 0);  //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	protected void initializeFields(IFieldData data) {
-		// In a new project wizard, we don't know this yet - the
-		// model has not been created
-		String id = data.getId();
-		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(id));
-		initializeOption("categoryId", id); //$NON-NLS-1$
-	}
-	public void initializeFields(IPluginModelBase model) {
-		// In the new extension wizard, the model exists so 
-		// we can initialize directly from it
-		String pluginId = model.getPluginBase().getId();
-		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(pluginId));
-		initializeOption("categoryId", pluginId); //$NON-NLS-1$
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getDependencies(java.lang.String)
-	 */
-	public IPluginReference[] getDependencies(String schemaVersion) {
-		ArrayList result = new ArrayList();
-		result.add(new PluginReference("org.eclipse.core.resources", null, 0)); //$NON-NLS-1$
-		result.add(new PluginReference("org.eclipse.ui", null, 0)); //$NON-NLS-1$
-		if (schemaVersion != null) {
-			result.add(new PluginReference("org.eclipse.ui.ide", null, 0)); //$NON-NLS-1$
-			result.add(new PluginReference("org.eclipse.core.runtime", null, 0)); //$NON-NLS-1$
-		}
-		return (IPluginReference[])result.toArray(new IPluginReference[result.size()]);
-	}
-	
-	public boolean isDependentOnParentWizard() {
-		return true;
-	}
-	
-	public void addPages(Wizard wizard) {
-		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_NEW_WIZARD);
-		page.setTitle(PDEUIMessages.NewWizardTemplate_title);
-		page.setDescription(PDEUIMessages.NewWizardTemplate_desc);
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-
-	public void validateOptions(TemplateOption source) {
-		if (source.isRequired() && source.isEmpty()) {
-			flagMissingRequiredOption(source);
-		} else {
-			validateContainerPage(source);
-		}	
-	}
-
-	private void validateContainerPage(TemplateOption source) {
-		TemplateOption[] allPageOptions = getOptions(0);
-		for (int i = 0; i < allPageOptions.length; i++) {
-			TemplateOption nextOption = allPageOptions[i];
-			if (nextOption.isRequired() && nextOption.isEmpty()) {
-				flagMissingRequiredOption(nextOption);
-				return;
-			}
-		}
-		resetPageState();
-	}
-	
-	public String getUsedExtensionPoint() {
-		return "org.eclipse.ui.newWizards"; //$NON-NLS-1$
-	}
-	
-	protected void updateModel(IProgressMonitor monitor) throws CoreException {
-		IPluginBase plugin = model.getPluginBase();
-		IPluginExtension extension = createExtension("org.eclipse.ui.newWizards", true); //$NON-NLS-1$
-		IPluginModelFactory factory = model.getPluginFactory();
-		
-		String cid = getStringOption("categoryId"); //$NON-NLS-1$
-
-		createCategory(extension, cid);
-		String fullClassName = getStringOption(KEY_PACKAGE_NAME)+"."+getStringOption("wizardClassName"); //$NON-NLS-1$ //$NON-NLS-2$
-		
-		IPluginElement viewElement = factory.createElement(extension);
-		viewElement.setName("wizard"); //$NON-NLS-1$
-		viewElement.setAttribute("id", fullClassName); //$NON-NLS-1$
-		viewElement.setAttribute("name", getStringOption("wizardName")); //$NON-NLS-1$ //$NON-NLS-2$
-		viewElement.setAttribute("icon", "icons/sample.gif"); //$NON-NLS-1$ //$NON-NLS-2$
-		viewElement.setAttribute("class", fullClassName); //$NON-NLS-1$
-		viewElement.setAttribute("category", cid); //$NON-NLS-1$
-		extension.add(viewElement);
-		if (!extension.isInTheModel())
-			plugin.add(extension);
-	}
-
-	private void createCategory(IPluginExtension extension, String id) throws CoreException {
-		IPluginObject [] elements = extension.getChildren();
-		for (int i=0; i<elements.length; i++) {
-			IPluginElement element = (IPluginElement)elements[i];
-			if (element.getName().equalsIgnoreCase("category")) { //$NON-NLS-1$
-				IPluginAttribute att = element.getAttribute("id"); //$NON-NLS-1$
-				if (att!=null) {
-					String cid = att.getValue();
-					if (cid!=null && cid.equals(id))
-						return;
-				}
-			}
-		}
-		IPluginElement categoryElement = model.getFactory().createElement(extension);
-		categoryElement.setName("category"); //$NON-NLS-1$
-		categoryElement.setAttribute("name", getStringOption("categoryName")); //$NON-NLS-1$ //$NON-NLS-2$
-		categoryElement.setAttribute("id", id); //$NON-NLS-1$
-		extension.add(categoryElement);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#getFoldersToInclude()
-	 */
-	public String[] getNewFiles() {
-		return new String[] {"icons/"}; //$NON-NLS-1$
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#formatPackageName(java.lang.String)
-	 */
-	protected String getFormattedPackageName(String id) {
-	    String packageName =  super.getFormattedPackageName(id);
-	    if (packageName.length() != 0 )
-	        return packageName + ".wizards"; //$NON-NLS-1$
-	    return "wizards"; //$NON-NLS-1$
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PDETemplateSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PDETemplateSection.java
deleted file mode 100644
index 0067cdb..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PDETemplateSection.java
+++ /dev/null

@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.pde.ui.templates.*;
-import org.eclipse.pde.core.plugin.IPluginBase;
-import org.eclipse.pde.internal.core.TargetPlatform;
-import org.eclipse.pde.internal.core.plugin.*;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.osgi.framework.*;
-
-import java.net.*;
-import java.util.*;
-
-public abstract class PDETemplateSection extends OptionTemplateSection {
-
-	protected ResourceBundle getPluginResourceBundle() {
-		Bundle bundle = Platform.getBundle(PDEPlugin.getPluginId());
-		return Platform.getResourceBundle(bundle);
-	}
-	
-	protected URL getInstallURL() {
-		return PDEPlugin.getDefault().getInstallURL();
-	}
-	
-	public URL getTemplateLocation() {
-		try {
-			String[] candidates = getDirectoryCandidates();
-			for (int i = 0; i < candidates.length; i++) {
-				if (PDEPlugin.getDefault().getBundle().getEntry(candidates[i]) != null) {
-					URL candidate = new URL(getInstallURL(), candidates[i]);
-					return candidate;
-				}
-			}
-		} catch (MalformedURLException e) {
-		}
-		return null;
-	}
-
-	private String[] getDirectoryCandidates() {
-		String version = getVersion(model.getPluginBase());
-		if ("3.0".equals(version)) //$NON-NLS-1$
-			return new String[] { "templates_3.0" + "/" + getSectionId() + "/" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		if ("3.1".equals(version) || "3.2".equals(version)) //$NON-NLS-1$ //$NON-NLS-2$
-			return new String[] { 
-					"templates_3.2" + "/" + getSectionId() + "/", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					"templates_3.1" + "/" + getSectionId() + "/", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					"templates_3.0" + "/" + getSectionId() + "/" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		return new String[] { "templates" + "/" + getSectionId() + "/" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-    
-    private String getVersion(IPluginBase plugin) {
-        // workaround to not introduce new API for IPluginBase
-        if (plugin instanceof PluginBase)
-            return ((PluginBase)plugin).getTargetVersion();
-        return TargetPlatform.getTargetVersionString();
-    }
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.ITemplateSection#getFoldersToInclude()
-	 */
-	public String[] getNewFiles() {
-		return new String[0];
-	}
-	
-	protected String getFormattedPackageName(String id){
-		StringBuffer buffer = new StringBuffer();
-		for (int i = 0; i < id.length(); i++) {
-			char ch = id.charAt(i);
-			if (buffer.length() == 0) {
-				if (Character.isJavaIdentifierStart(ch))
-					buffer.append(Character.toLowerCase(ch));
-			} else {
-				if (Character.isJavaIdentifierPart(ch) || ch == '.')
-					buffer.append(ch);
-			}
-		}
-		return buffer.toString().toLowerCase(Locale.ENGLISH);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PluginReference.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PluginReference.java
deleted file mode 100644
index 0aba52c..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PluginReference.java
+++ /dev/null

@@ -1,88 +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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.pde.core.plugin.IPluginReference;
-
-public class PluginReference implements IPluginReference {
-	private int match = NONE;
-	private String version;
-	private String id;
-
-	/**
-	 * Constructor for PluginReference.
-	 */
-	public PluginReference() {
-		super();
-	}
-	
-	public boolean equals(Object object) {
-		if (object instanceof IPluginReference) {
-			IPluginReference source = (IPluginReference)object;
-			if (id==null) return false;
-			if (id.equals(source.getId())==false) return false;
-			if (version==null && source.getVersion()==null) return true;
-			return version.equals(source.getVersion());
-		}
-		return false;
-	}
-	
-	public PluginReference(String id, String version, int match) {
-		this.id = id;
-		this.version = version;
-		this.match = match;
-	}
-
-	/*
-	 * @see IPluginReference#getMatch()
-	 */
-	public int getMatch() {
-		return match;
-	}
-
-	/*
-	 * @see IPluginReference#getVersion()
-	 */
-	public String getVersion() {
-		return version;
-	}
-
-	/*
-	 * @see IPluginReference#setMatch(int)
-	 */
-	public void setMatch(int match) throws CoreException {
-		this.match = match;
-	}
-
-	/*
-	 * @see IPluginReference#setVersion(String)
-	 */
-	public void setVersion(String version) throws CoreException {
-		this.version = version;
-	}
-
-	/*
-	 * @see IIdentifiable#getId()
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/*
-	 * @see IIdentifiable#setId(String)
-	 */
-	public void setId(String id) throws CoreException {
-		this.id = id;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PopupMenuNewWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PopupMenuNewWizard.java
deleted file mode 100644
index 395a242..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PopupMenuNewWizard.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.ui.*;
-import org.eclipse.pde.ui.templates.*;
-
-public class PopupMenuNewWizard extends NewPluginTemplateWizard {
-	/**
-	 * Constructor for PerspectiveExtensionsNewWizard.
-	 */
-	public PopupMenuNewWizard() {
-		super();
-	}
-
-	public void init(IFieldData data) {
-		super.init(data);
-		setWindowTitle(PDEUIMessages.PopupMenuNewWizard_wtitle);
-	}
-	/**
-	 * @see NewPluginTemplateWizard#createTemplateSections()
-	 */
-	public ITemplateSection[] createTemplateSections() {
-		return new ITemplateSection[] { new PopupMenuTemplate()};
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PopupMenuTemplate.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PopupMenuTemplate.java
deleted file mode 100644
index 27102aa..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PopupMenuTemplate.java
+++ /dev/null

@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.*;
-
-public class PopupMenuTemplate extends PDETemplateSection {
-
-	public static final String KEY_TARGET_OBJECT = "objectClass"; //$NON-NLS-1$
-	public static final String KEY_NAME_FILTER = "nameFilter"; //$NON-NLS-1$
-	public static final String KEY_SUBMENU_LABEL = "subMenuLabel"; //$NON-NLS-1$
-	public static final String KEY_ACTION_LABEL = "actionLabel"; //$NON-NLS-1$
-	public static final String KEY_ACTION_CLASS = "actionClass"; //$NON-NLS-1$
-	public static final String KEY_SELECTION = "selection"; //$NON-NLS-1$
-
-	/**
-	 * Constructor for PropertyPageTemplate.
-	 */
-	public PopupMenuTemplate() {
-		setPageCount(1);
-		createOptions();
-	}
-
-	public void addPages(Wizard wizard) {
-		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_POPUP_MENU);
-		page.setTitle(PDEUIMessages.PopupMenuTemplate_title);
-		page.setDescription(PDEUIMessages.PopupMenuTemplate_desc);
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-
-	private void createOptions() {
-		addOption(
-			KEY_TARGET_OBJECT,
-			PDEUIMessages.PopupMenuTemplate_targetClass,
-			"org.eclipse.core.resources.IFile", //$NON-NLS-1$
-			0);
-		addOption(
-			KEY_NAME_FILTER,
-			PDEUIMessages.PopupMenuTemplate_nameFilter,
-			"plugin.xml", //$NON-NLS-1$
-			0);
-		addOption(
-			KEY_SUBMENU_LABEL,
-			PDEUIMessages.PopupMenuTemplate_submenuName,
-			PDEUIMessages.PopupMenuTemplate_defaultSubmenuName,
-			0);
-		addOption(
-			KEY_ACTION_LABEL,
-			PDEUIMessages.PopupMenuTemplate_actionLabel,
-			PDEUIMessages.PopupMenuTemplate_defaultActionName,
-			0);
-		addOption(
-			KEY_PACKAGE_NAME,
-			PDEUIMessages.PopupMenuTemplate_packageName,
-			(String) null,
-			0);
-		addOption(
-			KEY_ACTION_CLASS,
-			PDEUIMessages.PopupMenuTemplate_actionClass,
-			PDEUIMessages.PopupMenuTemplate_newAction, 
-			0);
-		addOption(
-			KEY_SELECTION,
-			PDEUIMessages.PopupMenuTemplate_enabledFor,
-			new String[][] {
-				{ "singleSelection", PDEUIMessages.PopupMenuTemplate_singleSelection}, //$NON-NLS-1$
-				{
-				"multipleSelection", PDEUIMessages.PopupMenuTemplate_multipleSelection //$NON-NLS-1$
-				}
-		}, "singleSelection", 0); //$NON-NLS-1$
-	}
-	/**
-	 * @see PDETemplateSection#getSectionId()
-	 */
-	public String getSectionId() {
-		return "popupMenus"; //$NON-NLS-1$
-	}
-
-	public boolean isDependentOnParentWizard() {
-		return true;
-	}
-
-	protected void initializeFields(IFieldData data) {
-		// In a new project wizard, we don't know this yet - the
-		// model has not been created
-		String id = data.getId();
-		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(id)); 
-	}
-
-	public void initializeFields(IPluginModelBase model) {
-		// In the new extension wizard, the model exists so 
-		// we can initialize directly from it
-		String pluginId = model.getPluginBase().getId();
-		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(pluginId)); 
-	}
-
-	/**
-	 * @see GenericTemplateSection#validateOptions(TemplateOption)
-	 */
-	public void validateOptions(TemplateOption source) {
-		if (source.isRequired() && source.isEmpty()) {
-			flagMissingRequiredOption(source);
-		} else {
-			validateContainerPage(source);
-		}
-	}
-
-	private void validateContainerPage(TemplateOption source) {
-		TemplateOption[] allPageOptions = getOptions(0);
-		for (int i = 0; i < allPageOptions.length; i++) {
-			TemplateOption nextOption = allPageOptions[i];
-			if (nextOption.isRequired() && nextOption.isEmpty()) {
-				flagMissingRequiredOption(nextOption);
-				return;
-			}
-		}
-		resetPageState();
-	}
-
-	/**
-	 * @see AbstractTemplateSection#updateModel(IProgressMonitor)
-	 */
-	protected void updateModel(IProgressMonitor monitor) throws CoreException {
-		IPluginBase plugin = model.getPluginBase();
-		IPluginExtension extension = createExtension(getUsedExtensionPoint(), true);
-		IPluginModelFactory factory = model.getPluginFactory();
-
-		IPluginElement objectContributionElement = factory.createElement(extension);
-		objectContributionElement.setName("objectContribution"); //$NON-NLS-1$
-		objectContributionElement.setAttribute(
-			"objectClass", //$NON-NLS-1$
-			getStringOption(KEY_TARGET_OBJECT));
-		objectContributionElement.setAttribute(
-			"nameFilter", //$NON-NLS-1$
-			getStringOption(KEY_NAME_FILTER));
-		objectContributionElement.setAttribute(
-			"id", //$NON-NLS-1$
-			model.getPluginBase().getId() + ".contribution1"); //$NON-NLS-1$
-
-		IPluginElement menuElement = factory.createElement(objectContributionElement);
-		menuElement.setName("menu"); //$NON-NLS-1$
-		menuElement.setAttribute("label", getStringOption(KEY_SUBMENU_LABEL)); //$NON-NLS-1$
-		menuElement.setAttribute("path", "additions"); //$NON-NLS-1$ //$NON-NLS-2$
-		menuElement.setAttribute("id", model.getPluginBase().getId() + ".menu1"); //$NON-NLS-1$ //$NON-NLS-2$
-
-		IPluginElement separatorElement = factory.createElement(menuElement);
-		separatorElement.setName("separator"); //$NON-NLS-1$
-		separatorElement.setAttribute("name", "group1"); //$NON-NLS-1$ //$NON-NLS-2$
-		menuElement.add(separatorElement);
-		objectContributionElement.add(menuElement);
-
-		IPluginElement actionElement = factory.createElement(objectContributionElement);
-		actionElement.setName("action"); //$NON-NLS-1$
-		actionElement.setAttribute("label", getStringOption(KEY_ACTION_LABEL)); //$NON-NLS-1$
-		actionElement.setAttribute(
-			"class", //$NON-NLS-1$
-			getStringOption(KEY_PACKAGE_NAME) + "." + getStringOption(KEY_ACTION_CLASS)); //$NON-NLS-1$
-		actionElement.setAttribute(
-			"menubarPath", //$NON-NLS-1$
-			model.getPluginBase().getId() + ".menu1/group1"); //$NON-NLS-1$
-		actionElement.setAttribute(
-			"enablesFor", //$NON-NLS-1$
-			getValue(KEY_SELECTION).toString().equals("singleSelection") //$NON-NLS-1$
-				? "1" //$NON-NLS-1$
-				: "multiple"); //$NON-NLS-1$
-		actionElement.setAttribute("id", model.getPluginBase().getId() + ".newAction"); //$NON-NLS-1$ //$NON-NLS-2$
-		objectContributionElement.add(actionElement);
-
-		extension.add(objectContributionElement);
-		if (!extension.isInTheModel())
-			plugin.add(extension);
-	}
-
-	/**
-	 * @see ITemplateSection#getUsedExtensionPoint()
-	 */
-	public String getUsedExtensionPoint() {
-		return "org.eclipse.ui.popupMenus"; //$NON-NLS-1$
-	}
-	
-	/* (non-Javadoc)
-     * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#formatPackageName(java.lang.String)
-     */
-	protected String getFormattedPackageName(String id) {
-	    String packageName = super.getFormattedPackageName(id);
-	    if (packageName.length() !=0)
-	        return packageName + ".popup.actions"; //$NON-NLS-1$
-	    return "popup.actions"; //$NON-NLS-1$
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PreferencePageTemplate.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PreferencePageTemplate.java
deleted file mode 100644
index d59fffc..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PreferencePageTemplate.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.ModelEntry;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.*;
-
-public class PreferencePageTemplate extends PDETemplateSection {
-	private static final String KEY_PAGE_NAME = "pageName"; //$NON-NLS-1$
-	private static final String KEY_PAGE_CLASS_NAME = "pageClassName"; //$NON-NLS-1$
-	private static final String KEY_PLUGIN_CLASS_NAME = "pluginClassName"; //$NON-NLS-1$
-	private static final String KEY_FULL_PLUGIN_CLASS_NAME = "fullPluginClassName"; //$NON-NLS-1$
-
-	private String mainClassName;
-	
-	public PreferencePageTemplate() {
-		setPageCount(1);
-		createOptions();
-	}
-
-	public String getSectionId() {
-		return "preferences"; //$NON-NLS-1$
-	}
-	/*
-	 * @see ITemplateSection#getNumberOfWorkUnits()
-	 */
-	public int getNumberOfWorkUnits() {
-		return super.getNumberOfWorkUnits() + 1;
-	}
-
-	private void createOptions() {
-		// first page
-		addOption(
-			KEY_PACKAGE_NAME,
-			PDEUIMessages.PreferencePageTemplate_packageName,
-			(String) null,
-			0);
-		addOption(
-			KEY_PAGE_CLASS_NAME,
-			PDEUIMessages.PreferencePageTemplate_className,
-			"SamplePreferencePage", //$NON-NLS-1$
-			0);
-		addOption(
-			KEY_PAGE_NAME,
-			PDEUIMessages.PreferencePageTemplate_pageName,
-			PDEUIMessages.PreferencePageTemplate_defaultPageName,
-			0);
-	}
-
-	protected void initializeFields(IFieldData data) {
-		// In a new project wizard, we don't know this yet - the
-		// model has not been created
-		String id = data.getId();
-		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(id)); 
-		mainClassName = id + ".PreferenceClass"; //$NON-NLS-1$
-	}
-	public void initializeFields(IPluginModelBase model) {
-		// In the new extension wizard, the model exists so 
-		// we can initialize directly from it
-		String pluginId = model.getPluginBase().getId();
-		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(pluginId)); 
-		if (model instanceof IPluginModel) {
-			IPlugin plugin = (IPlugin) model.getPluginBase();
-			mainClassName = plugin.getClassName();
-		} else if (model instanceof IFragmentModel) {
-			IFragment fragment = (IFragment) model.getPluginBase();
-			String pluginPluginId = fragment.getPluginId();
-			ModelEntry entry = PDECore.getDefault().getModelManager()
-					.findEntry(pluginPluginId);
-			if (entry != null) {
-				IPluginModelBase pluginModelBase = entry.getActiveModel();
-				if (pluginModelBase instanceof IPluginModel) {
-					IPlugin plugin = (IPlugin) pluginModelBase.getPluginBase();
-					mainClassName = plugin.getClassName();
-				}
-			}
-		}
-		if (mainClassName == null) {
-			mainClassName = pluginId + ".PreferenceClass"; //$NON-NLS-1$
-		}
-	}
-
-	protected String getTemplateDirectory() {
-		String schemaVersion = model.getPluginBase().getSchemaVersion();
-		if (PDECore.getDefault().getModelManager().isOSGiRuntime()
-				&& schemaVersion != null)
-			return "templates_" + schemaVersion; //$NON-NLS-1$
-		return "templates"; //$NON-NLS-1$
-	}
-	public String getReplacementString(String fileName, String key) {
-		if (key.equals(KEY_FULL_PLUGIN_CLASS_NAME))
-			return mainClassName;
-		if (key.equals(KEY_PLUGIN_CLASS_NAME))
-			return getPluginClassName();
-		
-		return super.getReplacementString(fileName, key);
-	}
-
-	private String getPluginClassName() {
-		int dot = mainClassName.lastIndexOf('.');
-		if (dot != -1) {
-			return mainClassName.substring(dot + 1);
-		}
-		return mainClassName;
-	}
-
-	public boolean isDependentOnParentWizard() {
-		return true;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getDependencies(java.lang.String)
-	 */
-	public IPluginReference[] getDependencies(String schemaVersion) {
-		if (schemaVersion == null)
-			return super.getDependencies(schemaVersion);
-		PluginReference[] deps = new PluginReference[2];
-		deps[0] = new PluginReference("org.eclipse.core.runtime", null, 0); //$NON-NLS-1$
-		deps[1] = new PluginReference("org.eclipse.ui", null, 0);		 //$NON-NLS-1$
-		return deps;
-	}
-
-	public void addPages(Wizard wizard) {
-		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_PREFERENCE_PAGE);
-		page.setTitle(PDEUIMessages.PreferencePageTemplate_title);
-		page.setDescription(PDEUIMessages.PreferencePageTemplate_desc);
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-
-	public void validateOptions(TemplateOption source) {
-		if (source.isRequired() && source.isEmpty()) {
-			flagMissingRequiredOption(source);
-		} else
-			resetPageState();
-	}
-
-	public String getUsedExtensionPoint() {
-		return "org.eclipse.ui.preferencePages"; //$NON-NLS-1$
-	}
-
-	protected void updateModel(IProgressMonitor monitor) throws CoreException {
-		IPluginBase plugin = model.getPluginBase();
-		IPluginExtension extension = createExtension(getUsedExtensionPoint(), true);
-		IPluginModelFactory factory = model.getPluginFactory();
-
-		String fullClassName =
-			getStringOption(KEY_PACKAGE_NAME) + "." + getStringOption(KEY_PAGE_CLASS_NAME); //$NON-NLS-1$
-
-		IPluginElement pageElement = factory.createElement(extension);
-		pageElement.setName("page"); //$NON-NLS-1$
-		pageElement.setAttribute("id", fullClassName); //$NON-NLS-1$
-		pageElement.setAttribute("name", getStringOption(KEY_PAGE_NAME)); //$NON-NLS-1$
-		pageElement.setAttribute("class", fullClassName); //$NON-NLS-1$
-		extension.add(pageElement);
-		if (!extension.isInTheModel())
-			plugin.add(extension);
-
-		if (PDECore.getDefault().getModelManager().isOSGiRuntime()
-				&& model.getPluginBase().getSchemaVersion() != null) {
-			IPluginExtension extension2 = createExtension("org.eclipse.core.runtime.preferences", true); //$NON-NLS-1$
-			IPluginElement prefElement = factory.createElement(extension);
-			prefElement.setName("initializer"); //$NON-NLS-1$
-			prefElement.setAttribute("class", getStringOption(KEY_PACKAGE_NAME)+".PreferenceInitializer"); //$NON-NLS-1$ //$NON-NLS-2$
-			extension2.add(prefElement);
-			if (!extension2.isInTheModel())
-				plugin.add(extension2);
-		}
-}
-	
-	/* (non-Javadoc)
-     * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#formatPackageName(java.lang.String)
-     */
-    protected String getFormattedPackageName(String id) {
-        String packageName = super.getFormattedPackageName(id);
-        if (packageName.length() != 0)
-            return packageName + ".preferences"; //$NON-NLS-1$
-        return "preferences"; //$NON-NLS-1$
-    }
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PreprocessorParser.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PreprocessorParser.java
deleted file mode 100644
index 62f590a..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PreprocessorParser.java
+++ /dev/null

@@ -1,402 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-import java.util.*;
-
-import org.eclipse.pde.ui.templates.*;
-
-public class PreprocessorParser {
-	private static final int T_VAR = 1;
-	private static final int T_LBR = 2;
-	private static final int T_RBR = 3;
-	private static final int T_NOT = 4;
-	private static final int T_AND = 5;
-	private static final int T_OR = 6;
-	private static final int T_EQ = 7;
-	private static final int T_NEQ = 8;
-	private static final int T_STRING = 9;
-	private static final int T_TRUE = 22;
-	private static final int T_FALSE = 23;
-	private static final int T_ERROR = 99;
-	private static final int T_EOF = 10;
-
-	//private static final int OP_LEAF = -1;
-	private static final int OP_AND = 1;
-	private static final int OP_OR = 2;
-	private static final int OP_EQ = 3;
-	private static final int OP_NEQ = 4;
-	private static final int OP_NOT = 5;
-	//private static final int OP_DEFER = 55;
-	
-	private IVariableProvider provider;
-	private String line;
-	private Stack exprStack;	
-	private int loc;
-	private String tvalue;
-
-	abstract class Node {
-		abstract Object getValue();
-	}
-	class LeafNode extends Node {
-		Object value;
-		LeafNode(Object value) {
-			this.value = value;
-		}
-		public Object getValue() {
-			return value;
-		}
-		public String toString() {
-			if (value != null)
-				return "leaf[" + value.toString() + "]"; //$NON-NLS-1$ //$NON-NLS-2$
-			return "leaf[null]"; //$NON-NLS-1$
-		}
-	}
-
-	class ExpressionNode extends Node {
-		int opcode;
-		Node left;
-		Node right;
-
-		public ExpressionNode(Node left, Node right, int opcode) {
-			this.opcode = opcode;
-			this.left = left;
-			this.right = right;
-		}
-
-		public Object getValue() {
-			boolean result = false;
-			Object leftValue = left != null ? left.getValue() : Boolean.FALSE;
-			Object rightValue = right != null ? right.getValue() : Boolean.FALSE;
-
-			if (opcode == OP_NOT && rightValue instanceof Boolean) {
-				result = rightValue.equals(Boolean.TRUE) ? false : true;
-			} else {
-
-				if (leftValue instanceof Boolean && rightValue instanceof Boolean) {
-					boolean bleft = ((Boolean) leftValue).booleanValue();
-					boolean bright = ((Boolean) rightValue).booleanValue();
-
-					switch (opcode) {
-						case OP_AND :
-							result = bleft && bright;
-							break;
-						case OP_OR :
-							result = bleft || bright;
-							break;
-						case OP_EQ :
-							result = bleft == bright;
-							break;
-						case OP_NEQ :
-							result = bleft != bright;
-							break;
-					}
-				}
-				if (leftValue instanceof String && rightValue instanceof String) {
-					switch (opcode) {
-						case OP_EQ :
-							result = leftValue.equals(rightValue);
-							break;
-						case OP_NEQ :
-							result = leftValue.equals(rightValue);
-							break;
-					}
-				}
-			}
-			return result ? Boolean.TRUE : Boolean.FALSE;
-		}
-		public String toString() {
-			String lstring = left != null ? left.toString() : "*"; //$NON-NLS-1$
-			String rstring = right != null ? right.toString() : "*"; //$NON-NLS-1$
-			return "(" + lstring + "<" + opcode + ">" + rstring + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		}
-	}
-
-	class RootEntry {
-		Node root;
-	}
-	public PreprocessorParser() {
-		this(null);
-	}
-	
-	public PreprocessorParser(IVariableProvider provider) {
-		this.provider = provider;
-		exprStack = new Stack();
-	}
-
-	
-	public void setVariableProvider(IVariableProvider provider) {
-		this.provider = provider;
-	}
-
-	public static void main(String[] args) {
-		final Hashtable vars = new Hashtable();
-		vars.put("a", Boolean.FALSE); //$NON-NLS-1$
-		vars.put("b", "3"); //$NON-NLS-1$ //$NON-NLS-2$
-		vars.put("c", Boolean.TRUE); //$NON-NLS-1$
-		PreprocessorParser parser = new PreprocessorParser(new IVariableProvider() {
-			public Object getValue(String variable) {
-				return vars.get(variable);
-			}
-		});
-		try {
-			boolean value = parser.parseAndEvaluate("!a || (b==\"2\" && c)"); //$NON-NLS-1$
-			System.out.println("Result: "+value); //$NON-NLS-1$
-		} catch (Exception e) {
-			System.out.println(e);
-		}
-	}
-
-	public boolean parseAndEvaluate(String line) throws Exception {
-		reset();
-		this.line = line;
-		//System.out.println("Line: " + line);
-		parse();
-		//printExpression();
-		return evaluate();
-	}
-	
-	private boolean evaluate() {
-		boolean result = false;
-		if (exprStack.isEmpty()==false) {
-			RootEntry entry = (RootEntry)exprStack.peek();
-			if (entry.root != null) {
-				Object value = entry.root.getValue();
-				if (value!=null && value instanceof Boolean) {
-					if (((Boolean)value).equals(Boolean.TRUE)) 
-						result = true;
-				}
-			}
-		}
-		return result;
-	}
-
-
-	private void reset() {
-		loc = 0;
-		tvalue = null;
-		exprStack.clear();
-	}
-
-	private void parse() throws Exception {
-		for (;;) {
-			int token = getNextToken();
-			//System.out.println("Token: " + token + ", val=\"" + tvalue+"\"");
-			if (token == T_EOF)
-				break;
-
-			if (token == T_VAR) {
-				Node node = new LeafNode(provider.getValue(tvalue.toString()));
-				pushNode(node);
-				continue;
-			}
-			if (token == T_TRUE || token == T_FALSE) {
-				Object value = token==T_TRUE?Boolean.TRUE:Boolean.FALSE;
-				Node node = new LeafNode(value);
-				pushNode(node);
-				continue;
-			}
-			if (token == T_STRING) {
-				Node node = new LeafNode(tvalue);
-				pushNode(node);
-				continue;
-			}
-
-			if (token == T_NOT) {
-				pushNode(OP_NOT);
-				continue;
-			}
-
-			int opcode = 0;
-
-			switch (token) {
-				case T_AND :
-					opcode = OP_AND;
-					break;
-				case T_OR :
-					opcode = OP_OR;
-					break;
-				case T_EQ :
-					opcode = OP_EQ;
-					break;
-				case T_NEQ :
-					opcode = OP_NEQ;
-					break;
-			}
-			if (opcode != 0) {
-				pushNode(opcode);
-				continue;
-			}
-			if (token == T_LBR) {
-				pushRoot();
-				continue;
-			}
-			if (token == T_RBR) {
-				if (exprStack.isEmpty())
-					throwUnexpectedToken("not )", token); //$NON-NLS-1$
-				popRoot();
-				continue;
-			}
-		}
-	}
-
-	private RootEntry getCurrentRoot() {
-		if (exprStack.isEmpty()) {
-			RootEntry entry = new RootEntry();
-			exprStack.push(entry);
-		}
-		return (RootEntry) exprStack.peek();
-	}
-
-	private void replaceRoot(ExpressionNode newRoot) {
-		RootEntry entry = getCurrentRoot();
-		if (entry.root != null)
-			newRoot.left = entry.root;
-		entry.root = newRoot;
-	}
-
-	private void pushNode(Node node) {
-		RootEntry entry = getCurrentRoot();
-		if (entry.root == null)
-			entry.root = node;
-		else {
-			ExpressionNode enode = (ExpressionNode) entry.root;
-			if (enode.opcode == OP_NOT)
-				enode.right = node;
-			else {
-				if (enode.left == null)
-					enode.left = node;
-				else
-					enode.right = node;
-			}
-		}
-	}
-
-	private void pushNode(int opcode) {
-		ExpressionNode node = new ExpressionNode(null, null, opcode);
-		replaceRoot(node);
-	}
-
-	private void pushRoot() {
-		exprStack.push(new RootEntry());
-	}
-
-	private void popRoot() {
-		RootEntry entry = getCurrentRoot();
-		exprStack.pop();
-		pushNode(entry.root);
-	}
-
-	private void throwUnexpectedToken(String expected, int token)
-		throws Exception {
-		String message = "Expected " + expected + ", found " + token; //$NON-NLS-1$ //$NON-NLS-2$
-		throw new Exception(message);
-	}
-
-
-	private int getNextToken() {
-		boolean string = false;
-		boolean variable = false;
-		int vloc = loc;
-		tvalue = null;
-		for (;;) {
-			if (loc == line.length()) {
-				// check if we have panding identifier
-				if (variable) {
-					tvalue = line.substring(vloc, loc);
-					variable = false;
-					if (tvalue.equalsIgnoreCase("false")) //$NON-NLS-1$
-						return T_FALSE;
-					if (tvalue.equalsIgnoreCase("true")) //$NON-NLS-1$
-						return T_TRUE;
-					return T_VAR;
-				}
-				if (string) {
-					// EOF in string
-					string = false;
-					return T_ERROR;
-				}
-				// regular end of line
-				tvalue = "EOF"; //$NON-NLS-1$
-				return T_EOF;
-			}
-			char c = line.charAt(loc++);
-
-			if (c == '\"') {
-				if (string) {
-					tvalue = line.substring(vloc, loc - 1);
-					string = false;
-					return T_STRING;
-				} 
-				vloc = loc;
-				string = true;
-				continue;				
-			} else if (string)
-				continue;
-
-			if (!variable && Character.isJavaIdentifierStart(c)) {
-				variable = true;
-				vloc = loc - 1;
-				continue;
-			}
-			if (variable) {
-				if (!Character.isJavaIdentifierPart(c)) {
-					loc--;
-					tvalue = line.substring(vloc, loc);
-					variable = false;
-					if (tvalue.equalsIgnoreCase("false")) //$NON-NLS-1$
-						return T_FALSE;
-					if (tvalue.equalsIgnoreCase("true")) //$NON-NLS-1$
-						return T_TRUE;
-					return T_VAR;
-				} 
-				continue;
-			}
-
-			if (testDoubleToken(c, "!=")) //$NON-NLS-1$
-				return T_NEQ;
-			if (testDoubleToken(c, "==")) //$NON-NLS-1$
-				return T_EQ;
-			if (testDoubleToken(c, "&&")) //$NON-NLS-1$
-				return T_AND;
-			if (testDoubleToken(c, "||")) //$NON-NLS-1$
-				return T_OR;
-			if (testSingleToken(c, '!'))
-				return T_NOT;
-			if (testSingleToken(c, '('))
-				return T_LBR;
-			if (testSingleToken(c, ')'))
-				return T_RBR;
-			if (c == ' ' || c == '\t' || c == '\n')
-				continue;
-			tvalue = "" + c; //$NON-NLS-1$
-			return T_ERROR;
-		}
-	}
-	private boolean testSingleToken(char c, char expected) {
-		if (c == expected) {
-			tvalue = "" + expected; //$NON-NLS-1$
-			return true;
-		}
-		return false;
-	}
-	private boolean testDoubleToken(char c1, String pattern) {
-		if (c1 != pattern.charAt(0))
-			return false;
-		char c2 = line.charAt(loc);
-		if (c2 == pattern.charAt(1)) {
-			loc++;
-			tvalue = pattern;
-			return true;
-		}
-		return false;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PropertyPageNewWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PropertyPageNewWizard.java
deleted file mode 100644
index d233824..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PropertyPageNewWizard.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.ui.*;
-import org.eclipse.pde.ui.templates.*;
-
-public class PropertyPageNewWizard extends NewPluginTemplateWizard {
-	/**
-	 * Constructor for PropertyPageNewWizard.
-	 */
-	public PropertyPageNewWizard() {
-		super();
-	}
-
-	public void init(IFieldData data) {
-		super.init(data);
-		setWindowTitle(PDEUIMessages.PropertyPageNewWizard_wtitle);
-	}
-	/**
-	 * @see NewPluginTemplateWizard#createTemplateSections()
-	 */
-	public ITemplateSection[] createTemplateSections() {
-		return new ITemplateSection[] { new PropertyPageTemplate()};
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PropertyPageTemplate.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PropertyPageTemplate.java
deleted file mode 100644
index 8544dff..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/PropertyPageTemplate.java
+++ /dev/null

@@ -1,175 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.*;
-
-public class PropertyPageTemplate extends PDETemplateSection {
-	public static final String KEY_CLASSNAME = "className"; //$NON-NLS-1$
-	public static final String KEY_PAGE_NAME = "pageName"; //$NON-NLS-1$
-	public static final String KEY_TARGET_CLASS = "targetClass"; //$NON-NLS-1$
-	public static final String KEY_NAME_FILTER = "nameFilter"; //$NON-NLS-1$
-
-	/**
-	 * Constructor for PropertyPageTemplate.
-	 */
-	public PropertyPageTemplate() {
-		setPageCount(1);
-		createOptions();
-	}
-
-	public void addPages(Wizard wizard) {
-		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_PROPERTY_PAGE);
-		page.setTitle(PDEUIMessages.PropertyPageTemplate_title);
-		page.setDescription(PDEUIMessages.PropertyPageTemplate_desc);
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-
-	private void createOptions() {
-		addOption(
-			KEY_PACKAGE_NAME,
-			PDEUIMessages.PropertyPageTemplate_packageName,
-			(String) null,
-			0);
-		addOption(
-			KEY_CLASSNAME,
-			PDEUIMessages.PropertyPageTemplate_pageClass,
-			"SamplePropertyPage", //$NON-NLS-1$
-			0);
-		addOption(
-			KEY_PAGE_NAME,
-			PDEUIMessages.PropertyPageTemplate_pageName,
-			PDEUIMessages.PropertyPageTemplate_defaultPageName,
-			0);
-		addOption(
-			KEY_TARGET_CLASS,
-			PDEUIMessages.PropertyPageTemplate_targetClass,
-			"org.eclipse.core.resources.IFile", //$NON-NLS-1$
-			0);
-		addOption(
-			KEY_NAME_FILTER,
-			PDEUIMessages.PropertyPageTemplate_nameFilter,
-			"*.*", //$NON-NLS-1$
-			0);
-	}
-	/**
-	 * @see PDETemplateSection#getSectionId()
-	 */
-	public String getSectionId() {
-		return "propertyPages"; //$NON-NLS-1$
-	}
-
-	public boolean isDependentOnParentWizard() {
-		return true;
-	}
-	
-
-	protected void initializeFields(IFieldData data) {
-		// In a new project wizard, we don't know this yet - the
-		// model has not been created
-		String id = data.getId();
-		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(id)); 
-	}
-
-	public void initializeFields(IPluginModelBase model) {
-		// In the new extension wizard, the model exists so 
-		// we can initialize directly from it
-		String pluginId = model.getPluginBase().getId();
-		initializeOption(KEY_PACKAGE_NAME,getFormattedPackageName(pluginId)); 
-	}
-
-	/**
-	 * @see GenericTemplateSection#validateOptions(TemplateOption)
-	 */
-	public void validateOptions(TemplateOption source) {
-		if (source.isRequired() && source.isEmpty()) {
-			flagMissingRequiredOption(source);
-		} else {
-			validateContainerPage(source);
-		}
-	}
-
-	private void validateContainerPage(TemplateOption source) {
-		TemplateOption[] allPageOptions = getOptions(0);
-		for (int i = 0; i < allPageOptions.length; i++) {
-			TemplateOption nextOption = allPageOptions[i];
-			if (nextOption.isRequired() && nextOption.isEmpty()) {
-				flagMissingRequiredOption(nextOption);
-				return;
-			}
-		}
-		resetPageState();
-	}
-
-	/**
-	 * @see AbstractTemplateSection#updateModel(IProgressMonitor)
-	 */
-	protected void updateModel(IProgressMonitor monitor) throws CoreException {
-		IPluginBase plugin = model.getPluginBase();
-		IPluginExtension extension = createExtension(getUsedExtensionPoint(), true);
-		IPluginModelFactory factory = model.getPluginFactory();
-
-		IPluginElement pageElement = factory.createElement(extension);
-		pageElement.setName("page"); //$NON-NLS-1$
-		pageElement.setAttribute(
-			"id", //$NON-NLS-1$
-			getStringOption(KEY_PACKAGE_NAME) + ".samplePropertyPage"); //$NON-NLS-1$
-		pageElement.setAttribute("name", getStringOption(KEY_PAGE_NAME)); //$NON-NLS-1$
-		pageElement.setAttribute("objectClass", getStringOption(KEY_TARGET_CLASS)); //$NON-NLS-1$
-		pageElement.setAttribute(
-			"class", //$NON-NLS-1$
-			getStringOption(KEY_PACKAGE_NAME) + "." + getStringOption(KEY_CLASSNAME)); //$NON-NLS-1$
-		pageElement.setAttribute("nameFilter", getStringOption(KEY_NAME_FILTER)); //$NON-NLS-1$
-
-		extension.add(pageElement);
-		if (!extension.isInTheModel())
-			plugin.add(extension);
-	}
-
-	/**
-	 * @see ITemplateSection#getUsedExtensionPoint()
-	 */
-	public String getUsedExtensionPoint() {
-		return "org.eclipse.ui.propertyPages"; //$NON-NLS-1$
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getDependencies(java.lang.String)
-	 */
-	public IPluginReference[] getDependencies(String schemaVersion) {
-		ArrayList result = new ArrayList();
-		result.add(new PluginReference("org.eclipse.core.resources", null, 0)); //$NON-NLS-1$
-		if (schemaVersion != null)
-			result.add(new PluginReference("org.eclipse.core.runtime", null, 0));		 //$NON-NLS-1$
-		result.add(new PluginReference("org.eclipse.ui", null, 0));		 //$NON-NLS-1$
-			
-		return (IPluginReference[])result.toArray(new IPluginReference[result.size()]);
-	}
-	
-	/* (non-Javadoc)
-     * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#formatPackageName(java.lang.String)
-     */
-    protected String getFormattedPackageName(String id) {
-        String packageName = super.getFormattedPackageName(id);
-        if (packageName.length() != 0)
-            return packageName + ".properties"; //$NON-NLS-1$
-        return "properties"; //$NON-NLS-1$
-    }
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/TemplateSelectionPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/TemplateSelectionPage.java
deleted file mode 100644
index 871d01d..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/TemplateSelectionPage.java
+++ /dev/null

@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-import java.util.ArrayList;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ColumnWeightData;
-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.StructuredViewer;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
-import org.eclipse.pde.internal.ui.parts.FormBrowser;
-import org.eclipse.pde.internal.ui.parts.WizardCheckboxTablePart;
-import org.eclipse.pde.ui.templates.ITemplateSection;
-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.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-public class TemplateSelectionPage extends WizardPage {
-	private ITemplateSection[] fCandidates;
-	private ArrayList fVisiblePages;
-	private WizardCheckboxTablePart fTablePart;
-	private FormBrowser fDescriptionBrowser;
-	class TablePart extends WizardCheckboxTablePart {
-		public TablePart(String mainLabel) {
-			super(mainLabel);
-		}
-		protected StructuredViewer createStructuredViewer(
-			Composite parent,
-			int style,
-			FormToolkit toolkit) {
-			return super.createStructuredViewer(
-				parent,
-				style | SWT.FULL_SELECTION,
-				toolkit);
-		}
-		protected void updateCounter(int amount) {
-			super.updateCounter(amount);
-			if (getContainer() != null)
-				getContainer().updateButtons();
-		}
-	}
-
-	class ListContentProvider
-		extends DefaultContentProvider
-		implements IStructuredContentProvider {
-		public Object[] getElements(Object parent) {
-			return fCandidates;
-		}
-	}
-
-	class ListLabelProvider extends LabelProvider implements ITableLabelProvider {
-		public String getColumnText(Object obj, int index) {
-			ITemplateSection section = (ITemplateSection) obj;
-			if (index == 0)
-				return section.getLabel();
-			return section.getUsedExtensionPoint();
-		}
-		public Image getColumnImage(Object obj, int index) {
-			if (index == 0)
-				return PDEPlugin.getDefault().getLabelProvider().get(
-					PDEPluginImages.DESC_EXTENSION_OBJ);
-			return PDEPlugin.getDefault().getLabelProvider().get(
-					PDEPluginImages.DESC_EXT_POINT_OBJ);
-		}
-	}
-
-	/**
-	 * Constructor for TemplateSelectionPage.
-	 * @param pageName
-	 */
-	public TemplateSelectionPage(ITemplateSection[] candidates) {
-		super("templateSelection"); //$NON-NLS-1$
-        fCandidates = candidates;
-		setTitle(PDEUIMessages.TemplateSelectionPage_title);
-		setDescription(PDEUIMessages.TemplateSelectionPage_desc);
-		initializeTemplates();
-	}
-
-	private void initializeTemplates(){
-		fTablePart = new TablePart(PDEUIMessages.TemplateSelectionPage_table);
-		fDescriptionBrowser = new FormBrowser(SWT.BORDER | SWT.V_SCROLL);
-		fDescriptionBrowser.setText(""); //$NON-NLS-1$
-		PDEPlugin.getDefault().getLabelProvider().connect(this);
-		fVisiblePages = new ArrayList();
-	}
-
-	public void dispose() {
-		super.dispose();
-		PDEPlugin.getDefault().getLabelProvider().disconnect(this);
-	}
-
-	/**
-	 * @see IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		container.setLayout(layout);
-		layout.numColumns = 2;
-		fTablePart.createControl(container);
-		CheckboxTableViewer viewer = fTablePart.getTableViewer();
-		viewer.setContentProvider(new ListContentProvider());
-		viewer.setLabelProvider(new ListLabelProvider());
-		initializeTable(viewer.getTable());
-
-		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				IStructuredSelection sel = (IStructuredSelection) event.getSelection();
-				handleSelectionChanged((ITemplateSection) sel.getFirstElement());
-			}
-		});
-		fDescriptionBrowser.createControl(container);
-		Control c = fDescriptionBrowser.getControl();
-		GridData gd =
-			new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.FILL_VERTICAL);
-		gd.heightHint = 100;
-		//gd.horizontalSpan = 2;
-		c.setLayoutData(gd);
-		viewer.setInput(PDEPlugin.getDefault());
-		fTablePart.selectAll(true);
-		setControl(container);
-		Dialog.applyDialogFont(container);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(container, IHelpContextIds.TEMPLATE_SELECTION);
-	}
-
-	public ITemplateSection[] getSelectedTemplates() {
-        Object[] elements = fTablePart.getTableViewer().getCheckedElements();
-        ITemplateSection[] result = new ITemplateSection[elements.length];
-        System.arraycopy(elements, 0, result, 0, elements.length);
-        return result;
-	}
-
-	private void initializeTable(Table table) {
-		table.setHeaderVisible(true);
-		TableColumn column = new TableColumn(table, SWT.NULL);
-		column.setText(PDEUIMessages.TemplateSelectionPage_column_name);
-		column.setResizable(true);
-		column = new TableColumn(table, SWT.NULL);
-		column.setText(PDEUIMessages.TemplateSelectionPage_column_point);
-		column.setResizable(true);
-
-		TableLayout layout = new TableLayout();
-		layout.addColumnData(new ColumnWeightData(50));
-		layout.addColumnData(new ColumnWeightData(50));
-		table.setLayout(layout);
-	}
-
-	private void handleSelectionChanged(ITemplateSection section) {
-		String text = section != null ? section.getDescription() : ""; //$NON-NLS-1$
-		if (text.length() > 0)
-			text = "<p>" + text + "</p>"; //$NON-NLS-1$ //$NON-NLS-2$
-		fDescriptionBrowser.setText(text);
-	}
-
-	public boolean canFlipToNextPage() {
-		if (fTablePart.getSelectionCount() == 0)
-			return false;
-		return super.canFlipToNextPage();
-	}
-
-	public IWizardPage getNextPage() {
-		ITemplateSection[] sections = getSelectedTemplates();
-		fVisiblePages.clear();
-
-		for (int i = 0; i < sections.length; i++) {
-			ITemplateSection section = sections[i];
-			if (section.getPagesAdded() == false)
-				section.addPages((Wizard) getWizard());
-
-			for (int j = 0; j < section.getPageCount(); j++) {
-				fVisiblePages.add(section.getPage(j));
-			}
-		}
-		if (fVisiblePages.size() > 0)
-			return (IWizardPage) fVisiblePages.get(0);
-		
-		return null;
-	}
-
-	public IWizardPage getNextVisiblePage(IWizardPage page) {
-		if (page == this)
-			return page.getNextPage();
-		int index = fVisiblePages.indexOf(page);
-		if (index >= 0 && index < fVisiblePages.size() - 1)
-			return (IWizardPage) fVisiblePages.get(index + 1);
-		return null;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/ViewNewWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/ViewNewWizard.java
deleted file mode 100644
index 7379202..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/ViewNewWizard.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.ui.*;
-import org.eclipse.pde.ui.templates.*;
-
-public class ViewNewWizard extends NewPluginTemplateWizard {
-	/**
-	 * Constructor for ViewNewWizard.
-	 */
-	public ViewNewWizard() {
-		super();
-	}
-	public void init(IFieldData data) {
-		super.init(data);
-		setWindowTitle(PDEUIMessages.ViewNewWizard_wtitle);
-	}
-
-	/*
-	 * @see NewExtensionTemplateWizard#createTemplateSections()
-	 */
-	public ITemplateSection[] createTemplateSections() {
-		return new ITemplateSection [] {
-				new ViewTemplate() };
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/ViewRCPNewWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/ViewRCPNewWizard.java
deleted file mode 100644
index b0529da..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/ViewRCPNewWizard.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.ui.*;
-import org.eclipse.pde.ui.templates.*;
-
-
-public class ViewRCPNewWizard extends NewPluginTemplateWizard {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractNewPluginTemplateWizard#init(org.eclipse.pde.ui.IFieldData)
-	 */
-	public void init(IFieldData data) {
-		super.init(data);
-		setWindowTitle(PDEUIMessages.ViewRCPNewWizard_title); 
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.NewPluginTemplateWizard#createTemplateSections()
-	 */
-	public ITemplateSection[] createTemplateSections() {
-		return new ITemplateSection[] {new ViewRCPTemplate()};
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/ViewRCPTemplate.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/ViewRCPTemplate.java
deleted file mode 100644
index 7b597f9..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/ViewRCPTemplate.java
+++ /dev/null

@@ -1,187 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.ui.*;
-import org.eclipse.pde.ui.templates.*;
-
-
-public class ViewRCPTemplate extends PDETemplateSection {
-	
-	public static final String KEY_APPLICATION_CLASS = "applicationClass"; //$NON-NLS-1$
-	public static final String KEY_APPLICATION_ID = "applicationID"; //$NON-NLS-1$
-	public static final String KEY_WINDOW_TITLE = "windowTitle"; //$NON-NLS-1$
-	
-	public ViewRCPTemplate() {
-		setPageCount(1);
-		createOptions();
-	}
-	
-	public void addPages(Wizard wizard) {
-		WizardPage page = createPage(0, IHelpContextIds.TEMPLATE_RCP_MAIL);
-		page.setTitle(PDEUIMessages.ViewRCPTemplate_title); 
-		page.setDescription(PDEUIMessages.ViewRCPTemplate_desc);  
-		wizard.addPage(page);
-		markPagesAdded();
-	}
-
-	
-	private void createOptions() {
-		addOption(KEY_WINDOW_TITLE, PDEUIMessages.ViewRCPTemplate_windowTitle, "RCP Application", 0); //$NON-NLS-1$ 
-		
-		addOption(KEY_APPLICATION_ID, PDEUIMessages.ViewRCPTemplate_appId, "application", 0); //$NON-NLS-1$ 
-
-		addOption(KEY_PACKAGE_NAME, PDEUIMessages.ViewRCPTemplate_packageName, (String) null, 0); 
-		
-		addOption(KEY_APPLICATION_CLASS, PDEUIMessages.ViewRCPTemplate_appClass, "Application", 0); //$NON-NLS-1$ 
-	}
-	
-	protected void initializeFields(IFieldData data) {
-		// In a new project wizard, we don't know this yet - the
-		// model has not been created
-		String id = data.getId();
-		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(id));  
-	}
-	
-	public void initializeFields(IPluginModelBase model) {
-		// In the new extension wizard, the model exists so 
-		// we can initialize directly from it
-		String pluginId = model.getPluginBase().getId();
-		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(pluginId));
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.ui.templates.OptionTemplateSection#getSectionId()
-	 */
-	public String getSectionId() {
-		return "viewRCP"; //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#validateOptions(org.eclipse.pde.ui.templates.TemplateOption)
-	 */
-	public void validateOptions(TemplateOption source) {
-		if (source.isRequired() && source.isEmpty()) {
-			flagMissingRequiredOption(source);
-		} else {
-			validateContainerPage(source);
-		}
-	}
-	
-	private void validateContainerPage(TemplateOption source) {
-		TemplateOption[] allPageOptions = getOptions(0);
-		for (int i = 0; i < allPageOptions.length; i++) {
-			TemplateOption nextOption = allPageOptions[i];
-			if (nextOption.isRequired() && nextOption.isEmpty()) {
-				flagMissingRequiredOption(nextOption);
-				return;
-			}
-		}
-		resetPageState();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#updateModel(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void updateModel(IProgressMonitor monitor) throws CoreException {
-		createApplicationExtension();
-		createPerspectiveExtension();
-		createViewExtension();
-	}
-	
-	private void createApplicationExtension() throws CoreException {
-		IPluginBase plugin = model.getPluginBase();
-		
-		IPluginExtension extension = createExtension("org.eclipse.core.runtime.applications", true); //$NON-NLS-1$
-		extension.setId(getStringOption(KEY_APPLICATION_ID));
-		
-		IPluginElement element = model.getPluginFactory().createElement(extension);
-		element.setName("application"); //$NON-NLS-1$
-		extension.add(element);
-		
-		IPluginElement run = model.getPluginFactory().createElement(element);
-		run.setName("run"); //$NON-NLS-1$
-		run.setAttribute("class", getStringOption(KEY_PACKAGE_NAME) + "." + getStringOption(KEY_APPLICATION_CLASS)); //$NON-NLS-1$ //$NON-NLS-2$
-		element.add(run);
-		
-		if (!extension.isInTheModel())
-			plugin.add(extension);
-	}
-
-	private void createPerspectiveExtension() throws CoreException {
-		IPluginBase plugin = model.getPluginBase();
-		
-		IPluginExtension extension = createExtension("org.eclipse.ui.perspectives", true); //$NON-NLS-1$
-		IPluginElement element = model.getPluginFactory().createElement(extension);
-		element.setName("perspective"); //$NON-NLS-1$
-		element.setAttribute("class", getStringOption(KEY_PACKAGE_NAME) + ".Perspective"); //$NON-NLS-1$ //$NON-NLS-2$
-		element.setAttribute("name", "Perspective"); //$NON-NLS-1$ //$NON-NLS-2$
-		element.setAttribute("id", plugin.getId() + ".perspective"); //$NON-NLS-1$ //$NON-NLS-2$
-		extension.add(element);
-		
-		if (!extension.isInTheModel())
-			plugin.add(extension);
-	}
-	
-	private void createViewExtension() throws CoreException {
-		IPluginBase plugin = model.getPluginBase();
-		String id = plugin.getId();
-		IPluginExtension extension = createExtension("org.eclipse.ui.views", true); //$NON-NLS-1$
-		
-		IPluginElement view = model.getPluginFactory().createElement(extension);
-		view.setName("view"); //$NON-NLS-1$
-		view.setAttribute("class", getStringOption(KEY_PACKAGE_NAME) + ".View" ); //$NON-NLS-1$ //$NON-NLS-2$
-		view.setAttribute("name", "View"); //$NON-NLS-1$ //$NON-NLS-2$
-		view.setAttribute("id", id + ".view"); //$NON-NLS-1$ //$NON-NLS-2$
-		extension.add(view);
-		
-		if (!extension.isInTheModel())
-			plugin.add(extension);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.ITemplateSection#getUsedExtensionPoint()
-	 */
-	public String getUsedExtensionPoint() {
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.BaseOptionTemplateSection#isDependentOnParentWizard()
-	 */
-	public boolean isDependentOnParentWizard() {
-		return true;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getNumberOfWorkUnits()
-	 */
-	public int getNumberOfWorkUnits() {
-		return super.getNumberOfWorkUnits() + 1;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getDependencies(java.lang.String)
-	 */
-	public IPluginReference[] getDependencies(String schemaVersion) {
-		IPluginReference[] dep = new IPluginReference[2];
-		dep[0] = new PluginReference("org.eclipse.core.runtime", null, 0); //$NON-NLS-1$
-		dep[1] = new PluginReference("org.eclipse.ui", null, 0); //$NON-NLS-1$
-		return dep;
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/ViewTemplate.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/ViewTemplate.java
deleted file mode 100644
index f783f2a..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/templates/ViewTemplate.java
+++ /dev/null

@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.pde.internal.ui.wizards.templates;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.*;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.core.plugin.IPluginReference;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.jface.wizard.*;
-
-public class ViewTemplate extends PDETemplateSection {
-	private BooleanOption addToPerspective;
-	/**
-	 * Constructor for HelloWorldTemplate.
-	 */
-	public ViewTemplate() {
-		setPageCount(2);
-		createOptions();
-	}
-	
-	public String getSectionId() {
-		return "view"; //$NON-NLS-1$
-	}
-	/*
-	 * @see ITemplateSection#getNumberOfWorkUnits()
-	 */
-	public int getNumberOfWorkUnits() {
-		return super.getNumberOfWorkUnits()+1;
-	}
-	
-	private void createOptions() {
-		// first page	
-		addOption(KEY_PACKAGE_NAME, PDEUIMessages.ViewTemplate_packageName, (String)null, 0);
-		addOption("className", PDEUIMessages.ViewTemplate_className, "SampleView", 0); //$NON-NLS-1$ //$NON-NLS-2$
-		addOption("viewName", PDEUIMessages.ViewTemplate_name, PDEUIMessages.ViewTemplate_defaultName, 0); //$NON-NLS-1$
-		addOption("viewCategoryId", PDEUIMessages.ViewTemplate_categoryId, (String)null, 0); //$NON-NLS-1$
-		addOption("viewCategoryName", PDEUIMessages.ViewTemplate_categoryName, PDEUIMessages.ViewTemplate_defaultCategoryName, 0); //$NON-NLS-1$
-		addOption("viewType", PDEUIMessages.ViewTemplate_select,  //$NON-NLS-1$
-					new String [][] {
-						{"tableViewer", PDEUIMessages.ViewTemplate_table}, //$NON-NLS-1$
-						{"treeViewer", PDEUIMessages.ViewTemplate_tree}}, //$NON-NLS-1$
-						"tableViewer", 0); //$NON-NLS-1$
-		addToPerspective = (BooleanOption)addOption("addToPerspective",PDEUIMessages.ViewTemplate_addToPerspective,true,0); //$NON-NLS-1$
-		// second page
-		addOption("doubleClick", PDEUIMessages.ViewTemplate_doubleClick, true, 1); //$NON-NLS-1$
-		addOption("popup", PDEUIMessages.ViewTemplate_popup, true, 1); //$NON-NLS-1$
-		addOption("localToolbar", PDEUIMessages.ViewTemplate_toolbar, true, 1); //$NON-NLS-1$
-		addOption("localPulldown", PDEUIMessages.ViewTemplate_pulldown, true, 1); //$NON-NLS-1$
-		addOption("sorter", PDEUIMessages.ViewTemplate_sorting, true, 1); //$NON-NLS-1$
-		//addOption("filter", PDEPlugin.getResourceString(NL_FILTER), true, lists[1]);
-	}
-
-	protected void initializeFields(IFieldData data) {
-		// In a new project wizard, we don't know this yet - the
-		// model has not been created
-		String id = data.getId();
-		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(id)); 
-		initializeOption("viewCategoryId", id); //$NON-NLS-1$
-	}
-	public void initializeFields(IPluginModelBase model) {
-		// In the new extension wizard, the model exists so 
-		// we can initialize directly from it
-		String pluginId = model.getPluginBase().getId();
-		initializeOption(KEY_PACKAGE_NAME, getFormattedPackageName(pluginId));
-		initializeOption("viewCategoryId", pluginId); //$NON-NLS-1$
-	}
-	
-	public boolean isDependentOnParentWizard() {
-		return true;
-	}
-	
-	public void addPages(Wizard wizard) {
-		WizardPage page0 = createPage(0, IHelpContextIds.TEMPLATE_VIEW);
-		page0.setTitle(PDEUIMessages.ViewTemplate_title0);
-		page0.setDescription(PDEUIMessages.ViewTemplate_desc0);
-		wizard.addPage(page0);
-		
-		WizardPage page1 = createPage(1, IHelpContextIds.TEMPLATE_VIEW);
-		page1.setTitle(PDEUIMessages.ViewTemplate_title1);
-		page1.setDescription(PDEUIMessages.ViewTemplate_desc1);
-		wizard.addPage(page1);
-		markPagesAdded();
-	}
-
-	public void validateOptions(TemplateOption source) {
-		if (source.isRequired() && source.isEmpty()) {
-			flagMissingRequiredOption(source);
-		} else {
-			validateContainerPage(source);
-		}	
-	}
-
-	private void validateContainerPage(TemplateOption source) {
-		TemplateOption[] allPageOptions = getOptions(0);
-		for (int i = 0; i < allPageOptions.length; i++) {
-			TemplateOption nextOption = allPageOptions[i];
-			if (nextOption.isRequired() && nextOption.isEmpty()) {
-				flagMissingRequiredOption(nextOption);
-				return;
-			}
-		}
-		resetPageState();
-	}
-	
-	public String getUsedExtensionPoint() {
-		return "org.eclipse.ui.views"; //$NON-NLS-1$
-	}
-	
-	protected void updateModel(IProgressMonitor monitor) throws CoreException {
-		IPluginBase plugin = model.getPluginBase();
-		IPluginExtension extension = createExtension("org.eclipse.ui.views", true); //$NON-NLS-1$
-		IPluginModelFactory factory = model.getPluginFactory();
-		
-		String cid = getStringOption("viewCategoryId"); //$NON-NLS-1$
-
-		createCategory(extension, cid);
-		String fullClassName = getStringOption(KEY_PACKAGE_NAME)+"."+getStringOption("className"); //$NON-NLS-1$ //$NON-NLS-2$
-		
-		IPluginElement viewElement = factory.createElement(extension);
-		viewElement.setName("view"); //$NON-NLS-1$
-		viewElement.setAttribute("id", fullClassName); //$NON-NLS-1$
-		viewElement.setAttribute("name", getStringOption("viewName")); //$NON-NLS-1$ //$NON-NLS-2$
-		viewElement.setAttribute("icon", "icons/sample.gif"); //$NON-NLS-1$ //$NON-NLS-2$
-
-		viewElement.setAttribute("class", fullClassName); //$NON-NLS-1$
-		viewElement.setAttribute("category", cid); //$NON-NLS-1$
-		extension.add(viewElement);
-		if (!extension.isInTheModel())
-			plugin.add(extension);
-			
-		if (addToPerspective.isSelected()) {
-			IPluginExtension perspectiveExtension =
-				createExtension("org.eclipse.ui.perspectiveExtensions", true); //$NON-NLS-1$
-
-			IPluginElement perspectiveElement = factory.createElement(perspectiveExtension);
-			perspectiveElement.setName("perspectiveExtension"); //$NON-NLS-1$
-			perspectiveElement.setAttribute(
-				"targetID", //$NON-NLS-1$
-				"org.eclipse.ui.resourcePerspective"); //$NON-NLS-1$
-
-			IPluginElement view = factory.createElement(perspectiveElement);
-			view.setName("view"); //$NON-NLS-1$
-			view.setAttribute("id", fullClassName); //$NON-NLS-1$
-			view.setAttribute("relative", "org.eclipse.ui.views.TaskList"); //$NON-NLS-1$ //$NON-NLS-2$
-			view.setAttribute("relationship","right"); //$NON-NLS-1$ //$NON-NLS-2$
-			view.setAttribute("ratio", "0.5"); //$NON-NLS-1$ //$NON-NLS-2$
-			perspectiveElement.add(view);
-
-			perspectiveExtension.add(perspectiveElement);
-			if (!perspectiveExtension.isInTheModel())
-				plugin.add(perspectiveExtension);
-		}	
-	}
-
-	private void createCategory(IPluginExtension extension, String id) throws CoreException {
-		IPluginObject [] elements = extension.getChildren();
-		for (int i=0; i<elements.length; i++) {
-			IPluginElement element = (IPluginElement)elements[i];
-			if (element.getName().equalsIgnoreCase("category")) { //$NON-NLS-1$
-				IPluginAttribute att = element.getAttribute("id"); //$NON-NLS-1$
-				if (att!=null) {
-					String cid = att.getValue();
-					if (cid!=null && cid.equals(id))
-						return;
-				}
-			}
-		}
-		IPluginElement categoryElement = model.getFactory().createElement(extension);
-		categoryElement.setName("category"); //$NON-NLS-1$
-		categoryElement.setAttribute("name", getStringOption("viewCategoryName")); //$NON-NLS-1$ //$NON-NLS-2$
-		categoryElement.setAttribute("id", id); //$NON-NLS-1$
-		extension.add(categoryElement);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#getFoldersToInclude()
-	 */
-	public String[] getNewFiles() {
-		return new String[] {"icons/"}; //$NON-NLS-1$
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.AbstractTemplateSection#getDependencies(java.lang.String)
-	 */
-	public IPluginReference[] getDependencies(String schemaVersion) {
-		ArrayList result = new ArrayList();
-		if (schemaVersion != null)
-			result.add(new PluginReference("org.eclipse.core.runtime", null, 0)); //$NON-NLS-1$
-		result.add(new PluginReference("org.eclipse.ui", null, 0));	 //$NON-NLS-1$
-		return (IPluginReference[]) result.toArray(new IPluginReference[result.size()]);
-	}
-	
-	/* (non-Javadoc)
-     * @see org.eclipse.pde.internal.ui.wizards.templates.PDETemplateSection#formatPackageName(java.lang.String)
-     */
-    protected String getFormattedPackageName(String id) {
-        String packageName = super.getFormattedPackageName(id);
-        if (packageName.length() != 0)
-            return packageName + ".views"; //$NON-NLS-1$
-        return "views"; //$NON-NLS-1$
-    }
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/ConvertProjectsAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/ConvertProjectsAction.java
deleted file mode 100644
index 19f3b9e..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/ConvertProjectsAction.java
+++ /dev/null

@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.tools;
-
-import java.util.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.pde.internal.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.swt.custom.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-
-public class ConvertProjectsAction implements IObjectActionDelegate {
-
-	private ISelection fSelection;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction,
-	 *      org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		IProject[] unconverted = getUnconvertedProjects();
-		if (unconverted.length == 0) {
-			MessageDialog
-					.openInformation(
-							this.getDisplay().getActiveShell(),
-							PDEUIMessages.ConvertProjectsAction_find, PDEUIMessages.ConvertProjectsAction_none); // 
-			return;
-		}
-
-		if (fSelection instanceof IStructuredSelection) {
-			Object[] elems = ((IStructuredSelection) fSelection).toArray();
-			Vector initialSelection = new Vector(elems.length);
-
-			for (int i = 0; i < elems.length; i++) {
-				Object elem = elems[i];
-				IProject project = null;
-
-				if (elem instanceof IFile) {
-					IFile file = (IFile) elem;
-					project = file.getProject();
-				} else if (elem instanceof IProject) {
-					project = (IProject) elem;
-				} else if (elem instanceof IJavaProject) {
-					project = ((IJavaProject) elem).getProject();
-				}
-				if (project != null)
-					initialSelection.add(project);
-			}
-
-			ConvertedProjectWizard wizard = new ConvertedProjectWizard(
-					unconverted, initialSelection);
-
-			final Display display = getDisplay();
-			final WizardDialog dialog = new WizardDialog(display
-					.getActiveShell(), wizard);
-			BusyIndicator.showWhile(display, new Runnable() {
-				public void run() {
-					dialog.open();
-				}
-			});
-		}
-	}
-
-	/*
-	 * (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) {
-		fSelection = selection;
-	}
-
-	public Display getDisplay() {
-		Display display = Display.getCurrent();
-		if (display == null)
-			display = Display.getDefault();
-		return display;
-	}
-
-	private IProject[] getUnconvertedProjects() {
-		ArrayList unconverted = new ArrayList();
-		IProject[] projects = PDEPlugin.getWorkspace().getRoot().getProjects();
-		for (int i = 0; i < projects.length; i++) {
-			if (projects[i].isOpen() && !PDE.hasPluginNature(projects[i])
-					&& !PDE.hasFeatureNature(projects[i])
-					&& !PDE.hasUpdateSiteNature(projects[i]))
-				unconverted.add(projects[i]);
-		}
-		return (IProject[]) unconverted
-				.toArray(new IProject[unconverted.size()]);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/ConvertedProjectWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/ConvertedProjectWizard.java
deleted file mode 100644
index c8e315d..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/ConvertedProjectWizard.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.tools;
-
-import java.util.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.wizards.*;
-
-public class ConvertedProjectWizard extends NewWizard {
-	private ConvertedProjectsPage mainPage;
-	private Vector selected;
-	private IProject[] fUnconverted;
-	public ConvertedProjectWizard(IProject[] projects, Vector initialSelection) {
-	setDefaultPageImageDescriptor(PDEPluginImages.DESC_CONVJPPRJ_WIZ);
-	setWindowTitle(PDEUIMessages.ConvertedProjectWizard_title);
-	setDialogSettings(PDEPlugin.getDefault().getDialogSettings());
-	setNeedsProgressMonitor(true);
-	this.selected = initialSelection;
-	this.fUnconverted = projects;
-}
-
-public void addPages() {
-	mainPage = new ConvertedProjectsPage(fUnconverted, selected);
-	addPage(mainPage);
-}
-public boolean performFinish() {
-	return mainPage.finish();
-}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/ConvertedProjectsPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/ConvertedProjectsPage.java
deleted file mode 100644
index c3cd0c7..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/ConvertedProjectsPage.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.tools;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.pde.core.build.IBuild;
-import org.eclipse.pde.core.build.IBuildEntry;
-import org.eclipse.pde.core.plugin.IPlugin;
-import org.eclipse.pde.internal.PDE;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.PDEPluginConverter;
-import org.eclipse.pde.internal.core.TargetPlatform;
-import org.eclipse.pde.internal.core.WorkspaceModelManager;
-import org.eclipse.pde.internal.core.build.WorkspaceBuildModel;
-import org.eclipse.pde.internal.core.plugin.WorkspacePluginModel;
-import org.eclipse.pde.internal.core.util.CoreUtility;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
-import org.eclipse.pde.internal.ui.parts.WizardCheckboxTablePart;
-import org.eclipse.pde.internal.ui.wizards.plugin.ClasspathComputer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.ide.IDE;
-	
-public class ConvertedProjectsPage extends WizardPage  {
-	private CheckboxTableViewer projectViewer;
-	private TablePart tablePart;
-	private IProject[] fSelected;
-	private IProject[] fUnconverted;
-	
-	public class ProjectContentProvider
-		extends DefaultContentProvider
-		implements IStructuredContentProvider {
-		public Object[] getElements(Object parent) {	
-			if (fUnconverted!= null)
-				return fUnconverted;
-			return new Object[0];
-		}		
-	}
-
-	public class ProjectLabelProvider
-		extends LabelProvider
-		implements ITableLabelProvider {
-		public String getColumnText(Object obj, int index) {
-			if (index == 0) 
-				return ((IProject) obj).getName();
-			return ""; //$NON-NLS-1$
-		}
-		public Image getColumnImage(Object obj, int index) {
-			return PlatformUI.getWorkbench().getSharedImages().getImage(IDE.SharedImages.IMG_OBJ_PROJECT);
-		}
-	}
-
-	class TablePart extends WizardCheckboxTablePart {
-		public TablePart(String mainLabel) {
-			super(mainLabel);
-		}
-		public void updateCounter(int count) {
-			super.updateCounter(count);
-			setPageComplete(count > 0);
-		}
-	}
-
-	public ConvertedProjectsPage(IProject[] projects, Vector initialSelection) {
-		super("convertedProjects"); //$NON-NLS-1$
-		setTitle(PDEUIMessages.ConvertedProjectWizard_title);
-		setDescription(PDEUIMessages.ConvertedProjectWizard_desc);
-		tablePart = new TablePart(PDEUIMessages.ConvertedProjectWizard_projectList);
-		this.fSelected = (IProject[])initialSelection.toArray(new IProject[initialSelection.size()]);
-		this.fUnconverted = projects;
-	}
-	
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginHeight = 0;
-		layout.marginWidth = 5;
-		container.setLayout(layout);
-
-		tablePart.createControl(container);
-
-		projectViewer = tablePart.getTableViewer();
-		projectViewer.setContentProvider(new ProjectContentProvider());
-		projectViewer.setLabelProvider(new ProjectLabelProvider());
-		projectViewer.setInput(PDEPlugin.getWorkspace());
-	
-		tablePart.setSelection(fSelected);
-		tablePart.updateCounter(fSelected.length);
-
-		setControl(container);
-		Dialog.applyDialogFont(container);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(container, IHelpContextIds.CONVERTED_PROJECTS);
-	}
-
-
-	private static String createInitialName(String id) {
-		int loc = id.lastIndexOf('.');
-		if (loc == -1)
-			return id;
-		StringBuffer buf = new StringBuffer(id.substring(loc + 1));
-		buf.setCharAt(0, Character.toUpperCase(buf.charAt(0)));
-		return buf.toString();
-	}
-	private static void createManifestFile(IFile file, IProgressMonitor monitor)
-		throws CoreException {
-		WorkspacePluginModel model = new WorkspacePluginModel(file, false);
-		model.load();
-		IPlugin plugin = model.getPlugin();
-		if (PDECore.getDefault().getModelManager().isOSGiRuntime())
-			plugin.setSchemaVersion("3.0"); //$NON-NLS-1$
-		plugin.setId(file.getProject().getName());
-		plugin.setName(createInitialName(plugin.getId()));
-		plugin.setVersion("1.0.0"); //$NON-NLS-1$
-		model.save();
-		PDEPluginConverter.convertToOSGIFormat(file.getProject(), TargetPlatform.getTargetVersionString(), null, new SubProgressMonitor(monitor, 1));
-		file.delete(true, null);
-	}
-	
-	public boolean finish() {
-		final Object [] selected = tablePart.getSelection();
-		
-		IRunnableWithProgress operation = new WorkspaceModifyOperation() {
-			public void execute(IProgressMonitor monitor) {
-				try {
-					convertProjects(selected, monitor);
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				} finally {
-					monitor.done();
-				}
-			}
-		};
-		try {
-			getContainer().run(false, true, operation);
-		} catch (InvocationTargetException e) {
-			PDEPlugin.logException(e);
-			return false;
-		} catch (InterruptedException e) {
-			PDEPlugin.logException(e);
-			return false;
-		}
-		return true;
-	}
-	
-	public static void updateBuildPath(IProject project, IProgressMonitor monitor)
-		throws CoreException {
-		IPath manifestPath = project.getFullPath().append("plugin.xml"); //$NON-NLS-1$
-		IFile file = project.getWorkspace().getRoot().getFile(manifestPath);
-		if (!file.exists())
-			return;
-		WorkspacePluginModel model = new WorkspacePluginModel(file, true);
-		model.load();
-		if (!model.isLoaded())
-			return;
-			
-		ClasspathComputer.setClasspath(project, model);
-	}
-
-	public static void convertProject(
-		IProject project,
-		IProgressMonitor monitor)
-		throws CoreException {
-		CoreUtility.addNatureToProject(project, PDE.PLUGIN_NATURE, monitor);
-		if (!WorkspaceModelManager.isPluginProject(project))
-			createManifestFile(project.getFile("plugin.xml"), monitor); //$NON-NLS-1$
-		IFile buildFile = project.getFile("build.properties"); //$NON-NLS-1$
-		if (!buildFile.exists()) {
-			WorkspaceBuildModel model = new WorkspaceBuildModel(buildFile);
-			IBuild build = model.getBuild(true);
-			IBuildEntry entry = model.getFactory().createEntry("bin.includes"); //$NON-NLS-1$
-			if (project.getFile("plugin.xml").exists()) //$NON-NLS-1$
-				entry.addToken("plugin.xml"); //$NON-NLS-1$
-			if (project.getFile("META-INF/MANIFEST.MF").exists()) //$NON-NLS-1$
-				entry.addToken("META-INF/"); //$NON-NLS-1$
-			if (entry.getTokens().length > 0)
-				build.add(entry);
-			model.save();
-		}
-	}
-	
-	private void convertProjects(
-		Object[] selected,
-		IProgressMonitor monitor)
-		throws CoreException {
-		int totalCount = 2 * selected.length;
-		monitor.beginTask(
-			PDEUIMessages.ConvertedProjectWizard_converting,
-			totalCount);
-		for (int i = 0; i < selected.length; i++) {
-			convertProject((IProject) selected[i], monitor);
-			monitor.worked(1);
-		}
-		
-		// update build path
-		monitor.subTask(PDEUIMessages.ConvertedProjectWizard_updating);
-		for (int i = 0; i < selected.length; i++) {
-			if (((IProject) selected[i]).hasNature(JavaCore.NATURE_ID)) {
-				updateBuildPath((IProject) selected[i], new SubProgressMonitor(monitor,1));
-			} else {
-				monitor.worked(1);
-			}
-		}
-		monitor.done();
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/CreateHelpIndexAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/CreateHelpIndexAction.java
deleted file mode 100644
index 3c8def0..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/CreateHelpIndexAction.java
+++ /dev/null

@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.tools;
-
-import java.io.File;
-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.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.help.search.HelpIndexBuilder;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.pde.core.plugin.IFragment;
-import org.eclipse.pde.core.plugin.IPluginBase;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.ModelEntry;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.PluginModelManager;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Creates the help search index by parsing the selected
- * plugin.xml file and generating index for TOC extensions.
- *
- * @since 3.1
- */
-
-public class CreateHelpIndexAction implements IObjectActionDelegate {
-	private ISelection selection;
-
-	private HelpIndexBuilder indexBuilder;
-
-	public CreateHelpIndexAction() {
-	}
-
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-	}
-
-	public void run(IAction action) {
-		File file = getManifest();
-		if (file == null)
-			return;
-		if (indexBuilder == null)
-			indexBuilder = new HelpIndexBuilder();
-		indexBuilder.setManifest(file);
-		File target = getTarget();
-		if (target==null)
-			return;
-			indexBuilder.setDestination(target);
-		IRunnableWithProgress op = new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor)
-					throws InvocationTargetException {
-				try {
-					monitor.beginTask(PDEUIMessages.CreateHelpIndexAction_creating, 10);
-					indexBuilder.execute(new SubProgressMonitor(monitor, 9));
-				} catch (CoreException e) {
-					throw new InvocationTargetException(e);
-				}
-				finally {
-					try {
-						refreshTarget(new SubProgressMonitor(monitor, 1));
-					}
-					catch (CoreException e) {
-						throw new InvocationTargetException(e);
-					}
-				}
-			}
-		};
-		try {
-			PlatformUI.getWorkbench().getProgressService().busyCursorWhile(op);
-		} catch (InvocationTargetException e) {
-			PDEPlugin.logException(e);
-		} catch (InterruptedException e) {
-			PDEPlugin.logException(e);
-		}
-	}
-
-	private File getManifest() {
-		if (selection == null)
-			return null;
-		Object obj = ((IStructuredSelection) selection).getFirstElement();
-		if (obj instanceof IFile) {
-			IFile fileResource = (IFile) obj;
-			PluginModelManager manager = PDECore.getDefault().getModelManager();
-			ModelEntry entry = manager.findEntry(fileResource.getProject());
-			if (entry!=null) {
-				IPluginModelBase modelBase = entry.getActiveModel();
-				return getManifest(manager, fileResource, modelBase);
-			}
-		}
-		return null;
-	}
-	
-	private File getManifest(PluginModelManager manager, IFile file, IPluginModelBase modelBase) {
-		IPluginBase pluginBase = modelBase.getPluginBase();
-		if (pluginBase instanceof IFragment) {
-			// fragment
-			IFragment fragment = (IFragment)pluginBase;
-			String pluginId = fragment.getPluginId();
-			String pluginVersion = fragment.getPluginVersion();
-			int match = fragment.getRule();
-			IPluginModelBase pluginModel = manager.findPlugin(pluginId, pluginVersion, match);
-			if (pluginModel.getUnderlyingResource()==null) {
-				return null;
-			}
-			IFile pluginFile = pluginModel.getUnderlyingResource().getProject().getFile("plugin.xml"); //$NON-NLS-1$
-			return (pluginFile.exists()) ? pluginFile.getLocation().toFile() : null;
-		}
-		return file.getLocation().toFile();
-	}
-
-	private File getTarget() {
-		if (selection == null)
-			return null;
-		Object obj = ((IStructuredSelection) selection).getFirstElement();
-		if (obj instanceof IFile) {
-			IFile fileResource = (IFile) obj;
-			return fileResource.getProject().getLocation().toFile();
-		}
-		return null;
-	}
-	
-	private void refreshTarget(IProgressMonitor monitor) throws CoreException {
-		Object obj = ((IStructuredSelection) selection).getFirstElement();
-		IFile fileResource = (IFile) obj;
-		fileResource.getProject().refreshLocal(IResource.DEPTH_INFINITE, monitor);
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		this.selection = selection;
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/ExtensionPointMappings.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/ExtensionPointMappings.java
deleted file mode 100644
index 55179ec..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/ExtensionPointMappings.java
+++ /dev/null

@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.tools;
-
-import java.util.*;
-
-public class ExtensionPointMappings {
-	
-	private static HashMap fMap = new HashMap();
-	
-	private static void initialize() {
-		fMap.put("org.eclipse.ui.markerImageProvider", "org.eclipse.ui.ide.markerImageProvider"); //$NON-NLS-1$ //$NON-NLS-2$
-		fMap.put("org.eclipse.ui.markerHelp", "org.eclipse.ui.ide.markerHelp"); //$NON-NLS-1$ //$NON-NLS-2$
-		fMap.put("org.eclipse.ui.markerImageProviders", "org.eclipse.ui.ide.markerImageProviders"); //$NON-NLS-1$ //$NON-NLS-2$
-		fMap.put("org.eclipse.ui.markerResolution", "org.eclipse.ui.ide.markerResolution"); //$NON-NLS-1$ //$NON-NLS-2$
-		fMap.put("org.eclipse.ui.projectNatureImages", "org.eclipse.ui.ide.projectNatureImages"); //$NON-NLS-1$ //$NON-NLS-2$
-		fMap.put("org.eclipse.ui.resourceFilters", "org.eclipse.ui.ide.resourceFilters"); //$NON-NLS-1$ //$NON-NLS-2$
-		fMap.put("org.eclipse.ui.markerUpdaters", "org.eclipse.ui.editors.markerUpdaters"); //$NON-NLS-1$ //$NON-NLS-2$
-		fMap.put("org.eclipse.ui.documentProviders", "org.eclipse.ui.editors.documentProviders"); //$NON-NLS-1$ //$NON-NLS-2$
-		fMap.put("org.eclipse.ui.workbench.texteditor.markerAnnotationSpecification", "org.eclipse.ui.editors.markerAnnotationSpecification"); //$NON-NLS-1$ //$NON-NLS-2$
-		fMap.put("org.eclipse.help.browser", "org.eclipse.help.base.browser"); //$NON-NLS-1$ //$NON-NLS-2$
-		fMap.put("org.eclipse.help.luceneAnalyzer", "org.eclipse.help.base.luceneAnalyzer"); //$NON-NLS-1$ //$NON-NLS-2$
-		fMap.put("org.eclipse.help.webapp", "org.eclipse.help.base.webapp"); //$NON-NLS-1$ //$NON-NLS-2$
-		fMap.put("org.eclipse.help.support", "org.eclipse.ui.helpSupport"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public static boolean isDeprecated(String id) {
-		if (fMap.isEmpty())
-			initialize();
-		return fMap.containsKey(id);
-	}
-	
-	public static boolean hasMovedFromHelpToBase(String key) {
-		return key.equals("org.eclipse.help.browser") //$NON-NLS-1$
-			|| key.equals("org.eclipse.help.luceneAnalyzer") //$NON-NLS-1$
-			|| key.equals("org.eclipse.help.webapp"); //$NON-NLS-1$
-	}
-	
-	public static boolean hasMovedFromHelpToUI(String key) {
-		return key.equals("org.eclipse.help.support"); //$NON-NLS-1$
-	}
-	
-	public static String getNewId(String oldId) {
-		if (fMap.isEmpty())
-			initialize();
-		return fMap.containsKey(oldId) ? fMap.get(oldId).toString() : null;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/MigratePluginWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/MigratePluginWizard.java
deleted file mode 100644
index 494b848..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/MigratePluginWizard.java
+++ /dev/null

@@ -1,342 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.tools;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.util.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.operation.*;
-import org.eclipse.jface.text.*;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.ui.*;
-
-public class MigratePluginWizard extends Wizard {
-	private MigratePluginWizardPage page1;
-
-	private IPluginModelBase[] fSelected;
-	private IPluginModelBase[] fUnmigrated;
-
-	private static final String STORE_SECTION = "MigrationWizard"; //$NON-NLS-1$
-
-	public MigratePluginWizard(IPluginModelBase[] models,IPluginModelBase[] selected) {
-		IDialogSettings masterSettings = PDEPlugin.getDefault()
-				.getDialogSettings();
-		setDialogSettings(getSettingsSection(masterSettings));
-		setDefaultPageImageDescriptor(PDEPluginImages.DESC_MIGRATE_30_WIZ);
-		setWindowTitle(PDEUIMessages.MigrationWizard_title); 
-		setNeedsProgressMonitor(true);
-		this.fSelected = selected;
-		this.fUnmigrated = models;
-	}
-
-	public boolean performFinish() {
-		final IPluginModelBase[] models = page1.getSelected();
-		page1.storeSettings();
-		final boolean doUpdateClasspath = page1.isUpdateClasspathRequested();
-		final boolean doCleanProjects = page1.isCleanProjectsRequested();
-
-		IRunnableWithProgress operation = new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor)
-					throws InvocationTargetException, InterruptedException {
-
-				if (PDEPlugin.getWorkspace().validateEdit(
-						getFilesToValidate(models), getContainer().getShell())
-						.getSeverity() != IStatus.OK) {
-					monitor.done();
-					return;
-				}
-
-				int numUnits = doUpdateClasspath ? models.length * 2
-						: models.length;
-				monitor
-						.beginTask(
-								PDEUIMessages.MigrationWizard_progress, numUnits); 
-				try {
-					for (int i = 0; i < models.length; i++) {
-						monitor.subTask(models[i].getPluginBase().getId());
-						transform(models[i]);
-						models[i].getUnderlyingResource().refreshLocal(
-								IResource.DEPTH_ZERO, null);
-						monitor.worked(1);
-						if (doCleanProjects) {
-							IProject project = models[i]
-									.getUnderlyingResource().getProject();
-							IProjectDescription desc = project.getDescription();
-							desc.setReferencedProjects(new IProject[0]);
-							project.setDescription(desc, null);
-						}
-						monitor.worked(1);
-					}
-					if (doUpdateClasspath) {
-						Job j = new UpdateClasspathJob(models);
-						j.setUser(true);
-						j.schedule();
-					}
-				} catch (Exception e) {
-					PDEPlugin.logException(e);
-				} finally {
-					monitor.done();
-				}
-			}
-		};
-
-		try {
-			getContainer().run(true, false, operation);
-		} catch (InvocationTargetException e) {
-		} catch (InterruptedException e) {
-		}
-		return true;
-	}
-
-	private IFile[] getFilesToValidate(IPluginModelBase[] models) {
-		ArrayList files = new ArrayList();
-		for (int i = 0; i < models.length; i++) {
-			IProject project = models[i].getUnderlyingResource().getProject();
-			files.add(models[i].getUnderlyingResource());
-			files.add(project.getFile(".project")); //$NON-NLS-1$
-			files.add(project.getFile(".classpath")); //$NON-NLS-1$
-		}
-		return (IFile[]) files.toArray(new IFile[files.size()]);
-	}
-
-	private IDialogSettings getSettingsSection(IDialogSettings master) {
-		IDialogSettings setting = master.getSection(STORE_SECTION);
-		if (setting == null) {
-			setting = master.addNewSection(STORE_SECTION);
-		}
-		return setting;
-	}
-
-	public void addPages() {
-		page1 = new MigratePluginWizardPage(fUnmigrated, fSelected);
-		addPage(page1);
-	}
-
-	private void transform(IPluginModelBase model) throws Exception {
-		IResource file = model.getUnderlyingResource();
-		IDocument document = createDocument(file);
-		FindReplaceDocumentAdapter findAdapter = new FindReplaceDocumentAdapter(
-				document);
-		addEclipseProcessingInstruction(document, findAdapter);
-		updateExtensions(document, findAdapter);
-		if (model.getPluginBase().getImports().length > 0)
-			addNewImports(document, findAdapter, getAdditionalImports(model));
-		writeFile(document, file);
-	}
-
-	private IDocument createDocument(IResource file) throws Exception {
-		BufferedReader reader = new BufferedReader(new FileReader(file
-				.getLocation().toOSString()));
-		StringBuffer buffer = new StringBuffer();
-		while (reader.ready()) {
-			buffer.append((char) reader.read());
-		}
-		reader.close();
-		return new Document(buffer.toString());
-	}
-
-	private void writeFile(IDocument document, IResource file) throws Exception {
-		PrintWriter writer = new PrintWriter(new FileWriter(file.getLocation()
-				.toOSString()));
-		writer.write(document.get());
-		writer.close();
-	}
-
-	private void addEclipseProcessingInstruction(IDocument document,
-			FindReplaceDocumentAdapter adapter) {
-		try {
-			IRegion region = adapter.find(-1,
-					"<\\?xml.*\\?>", true, true, false, true); //$NON-NLS-1$
-			if (region != null) {
-				String text = document.get(region.getOffset(), region
-						.getLength());
-				adapter.replace(text + System.getProperty("line.separator") //$NON-NLS-1$
-						+ "<?eclipse version=\"3.0\"?>", //$NON-NLS-1$
-						false);
-			}
-		} catch (BadLocationException e) {
-		}
-	}
-
-	private void updateExtensions(IDocument document,
-			FindReplaceDocumentAdapter adapter) {
-		int start = 0;
-		for (;;) {
-			try {
-				IRegion region = findNextExtension(adapter, start);
-				if (region == null)
-					break;
-				IRegion idRegion = findPointAttributeRegion(adapter, region);
-				if (idRegion != null) {
-					String point = document.get(idRegion.getOffset(), idRegion
-							.getLength());
-					if (ExtensionPointMappings.isDeprecated(point.trim())) {
-						adapter.replace(ExtensionPointMappings.getNewId(point
-								.trim()), false);
-					}
-				}
-				start = region.getOffset() + region.getLength();
-			} catch (BadLocationException e) {
-			}
-		}
-	}
-
-	private IRegion findPointAttributeRegion(
-			FindReplaceDocumentAdapter adapter, IRegion parentRegion) {
-		try {
-			IRegion region = adapter.find(parentRegion.getOffset(),
-					"\\s+point\\s*=\\s*\"", //$NON-NLS-1$
-					true, true, false, true);
-			if (region != null
-					&& region.getOffset() + region.getLength() <= parentRegion
-							.getOffset()
-							+ parentRegion.getLength()) {
-				region = adapter.find(region.getOffset() + region.getLength(),
-						"[^\"]*", //$NON-NLS-1$
-						true, true, false, true);
-				if (region != null
-						&& region.getOffset() + region.getLength() < parentRegion
-								.getOffset()
-								+ parentRegion.getLength()) {
-					return region;
-				}
-			}
-		} catch (BadLocationException e) {
-		}
-		return null;
-	}
-
-	private IRegion findNextExtension(FindReplaceDocumentAdapter adapter,
-			int start) {
-		int offset = -1;
-		int length = -1;
-		try {
-			IRegion region = adapter.find(start,
-					"<extension\\s+", true, true, false, true); //$NON-NLS-1$
-			if (region != null) {
-				offset = region.getOffset();
-				region = adapter.find(offset, ">", true, true, false, false); //$NON-NLS-1$
-				if (region != null) {
-					length = region.getOffset() - offset + 1;
-				}
-			}
-		} catch (BadLocationException e) {
-		}
-		return (offset != -1 && length != -1) ? new Region(offset, length)
-				: null;
-	}
-
-	private String[] getAdditionalImports(IPluginModelBase model) {
-		ArrayList result = new ArrayList();
-		//TODO do no just add. If core.runtime exists, replace it.
-		//if (findImport(model, "org.eclipse.core.runtime") == null)
-		result
-				.add("<import plugin=\"org.eclipse.core.runtime.compatibility\"/>"); //$NON-NLS-1$
-		IPluginImport uiImport = findImport(model, "org.eclipse.ui"); //$NON-NLS-1$
-		if (uiImport != null) {
-			ArrayList list = new ArrayList();
-			list.add("org.eclipse.ui.ide"); //$NON-NLS-1$
-			list.add("org.eclipse.ui.views"); //$NON-NLS-1$
-			list.add("org.eclipse.jface.text"); //$NON-NLS-1$
-			list.add("org.eclipse.ui.workbench.texteditor"); //$NON-NLS-1$
-			list.add("org.eclipse.ui.editors"); //$NON-NLS-1$
-			IPluginImport[] imports = model.getPluginBase().getImports();
-			for (int i = 0; i < imports.length; i++) {
-				if (list.contains(imports[i].getId())) {
-					list.remove(imports[i].getId());
-				}
-			}
-			for (int i = 0; i < list.size(); i++) {
-				StringBuffer buffer = new StringBuffer("<import plugin=\""); //$NON-NLS-1$
-				buffer.append(list.get(i) + "\""); //$NON-NLS-1$
-				if (uiImport.isReexported())
-					buffer.append(" export=\"true\""); //$NON-NLS-1$
-				if (uiImport.isOptional())
-					buffer.append(" optional=\"true\""); //$NON-NLS-1$
-				buffer.append("/>"); //$NON-NLS-1$
-				result.add(buffer.toString());
-			}
-		} else if (needsAdditionalUIImport(model)) {
-			result.add("<import plugin=\"org.eclipse.ui\"/>"); //$NON-NLS-1$
-		}
-		if (needsHelpBaseImport(model))
-			result.add("<import plugin=\"org.eclipse.help.base\"/>"); //$NON-NLS-1$
-
-		return (String[]) result.toArray(new String[result.size()]);
-	}
-
-	private void addNewImports(IDocument document,
-			FindReplaceDocumentAdapter adapter, String[] imports) {
-		try {
-			if (imports.length == 0)
-				return;
-
-			String space = ""; //$NON-NLS-1$
-			IRegion requiresRegion = adapter.find(0,
-					"<requires>", true, false, false, false); //$NON-NLS-1$
-			if (requiresRegion != null) {
-				IRegion spacerRegion = adapter.find(requiresRegion.getOffset()
-						+ requiresRegion.getLength(),
-						"\\s*", true, true, false, true); //$NON-NLS-1$
-				if (spacerRegion != null) {
-					space = document.get(spacerRegion.getOffset(), spacerRegion
-							.getLength());
-				}
-			}
-			StringBuffer buffer = new StringBuffer(space);
-			for (int i = 0; i < imports.length; i++) {
-				buffer.append(imports[i] + space);
-			}
-			adapter.replace(buffer.toString(), false);
-		} catch (BadLocationException e) {
-		}
-	}
-
-	private boolean needsAdditionalUIImport(IPluginModelBase model) {
-		IPluginExtension[] extensions = model.getPluginBase().getExtensions();
-		for (int i = 0; i < extensions.length; i++) {
-			if (ExtensionPointMappings.hasMovedFromHelpToUI(extensions[i]
-					.getPoint())
-					&& findImport(model, "org.eclipse.ui") == null) //$NON-NLS-1$
-				return true;
-		}
-		return false;
-	}
-
-	private boolean needsHelpBaseImport(IPluginModelBase model) {
-		IPluginExtension[] extensions = model.getPluginBase().getExtensions();
-		for (int i = 0; i < extensions.length; i++) {
-			if (ExtensionPointMappings.hasMovedFromHelpToBase(extensions[i]
-					.getPoint())
-					&& findImport(model, "org.eclipse.help.base") == null) { //$NON-NLS-1$
-				return true;
-			}
-		}
-		return false;
-	}
-
-	private IPluginImport findImport(IPluginModelBase model, String importID) {
-		IPluginImport[] imports = model.getPluginBase().getImports();
-		for (int i = 0; i < imports.length; i++) {
-			if (imports[i].getId().equals(importID)) {
-				return imports[i];
-			}
-		}
-		return null;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/MigratePluginWizardPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/MigratePluginWizardPage.java
deleted file mode 100644
index f635f6a..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/MigratePluginWizardPage.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.tools;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
-import org.eclipse.pde.internal.ui.parts.WizardCheckboxTablePart;
-import org.eclipse.pde.internal.ui.wizards.ListUtil;
-import org.eclipse.swt.SWT;
-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.ui.PlatformUI;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-public class MigratePluginWizardPage extends WizardPage {
-	private IPluginModelBase[] fSelected;
-	private IPluginModelBase[] fUnmigrated;
-	private CheckboxTableViewer fPluginListViewer;	
-	private TablePart fTablePart;
-	private Button fUpdateClasspathButton;
-	private String S_UPDATE_CLASSATH = "updateClasspath"; //$NON-NLS-1$
-	private String S_CLEAN_PROJECTS = "cleanProjects"; //$NON-NLS-1$
-	private Button fCleanProjectsButton;
-
-	public class ContentProvider
-		extends DefaultContentProvider
-		implements IStructuredContentProvider {
-		public Object[] getElements(Object parent) {
-			if (fUnmigrated != null)
-				return fUnmigrated;
-			return new Object[0];
-		}
-	}
-
-	class TablePart extends WizardCheckboxTablePart {
-		public TablePart(String mainLabel) {
-			super(mainLabel);
-		}
-
-		public void updateCounter(int count) {
-			super.updateCounter(count);
-			dialogChanged();
-		}
-		protected StructuredViewer createStructuredViewer(
-			Composite parent,
-			int style,
-			FormToolkit toolkit) {
-			StructuredViewer viewer =
-				super.createStructuredViewer(parent, style, toolkit);
-			viewer.setSorter(ListUtil.PLUGIN_SORTER);
-			return viewer;
-		}
-	}
-
-	public MigratePluginWizardPage(IPluginModelBase[] models, IPluginModelBase[] selected) {
-		super("MigrateWizardPage"); //$NON-NLS-1$
-		setTitle(PDEUIMessages.MigrationWizard_title); 
-		setDescription(PDEUIMessages.MigrationWizardPage_desc); 
-		this.fUnmigrated = models;
-		this.fSelected = selected;
-		fTablePart = new TablePart(PDEUIMessages.MigrationWizardPage_label); 
-		PDEPlugin.getDefault().getLabelProvider().connect(this);
-	}
-	
-	public void dispose() {
-		super.dispose();
-		PDEPlugin.getDefault().getLabelProvider().disconnect(this);
-	}
-
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginHeight = 0;
-		layout.marginWidth = 5;
-		layout.verticalSpacing = 10;
-		container.setLayout(layout);
-
-		fTablePart.createControl(container);
-
-		fPluginListViewer = fTablePart.getTableViewer();
-		fPluginListViewer.setContentProvider(new ContentProvider());
-		fPluginListViewer.setLabelProvider(PDEPlugin.getDefault().getLabelProvider());
-
-		GridData gd = (GridData)fTablePart.getControl().getLayoutData();
-		gd.heightHint = 300;
-		gd.widthHint = 300;
-		
-		fPluginListViewer.setInput(PDEPlugin.getDefault());
-		fTablePart.setSelection(fSelected);
-		
-		fUpdateClasspathButton = new Button(container, SWT.CHECK);
-		fUpdateClasspathButton.setText(PDEUIMessages.MigrationWizard_update); 
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gd.horizontalSpan = 2;
-		fUpdateClasspathButton.setLayoutData(gd);
-		String update = getDialogSettings().get(S_UPDATE_CLASSATH);
-		boolean doUpdate = update == null ? true : getDialogSettings().getBoolean(S_UPDATE_CLASSATH);
-		fUpdateClasspathButton.setSelection(doUpdate);
-		
-		fCleanProjectsButton = new Button(container, SWT.CHECK);
-		fCleanProjectsButton.setText(PDEUIMessages.MigratePluginWizard_cleanProjects); 
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gd.horizontalSpan = 2;
-		fCleanProjectsButton.setLayoutData(gd);
-		String clean = getDialogSettings().get(S_CLEAN_PROJECTS);
-		boolean doClean = clean == null ? true : getDialogSettings().getBoolean(S_CLEAN_PROJECTS);
-		fCleanProjectsButton.setSelection(doClean);
-
-		setControl(container);
-		Dialog.applyDialogFont(container);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(container, IHelpContextIds.MIGRATE_3_0);
-	}
-
-	public IPluginModelBase[] getSelected() {
-		Object[] objects = fTablePart.getSelection();
-		IPluginModelBase [] models = new IPluginModelBase[objects.length];
-		System.arraycopy(objects, 0, models, 0, objects.length);
-		return models;
-	}
-
-	private void dialogChanged() {
-		setPageComplete(fTablePart.getSelectionCount() > 0);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()
-	 */
-	public boolean isPageComplete() {
-		return fTablePart.getSelectionCount() > 0;
-	}
-
-	public void storeSettings() {
-		IDialogSettings settings = getDialogSettings();
-		settings.put(S_UPDATE_CLASSATH, fUpdateClasspathButton.getSelection());
-		settings.put(S_CLEAN_PROJECTS, fCleanProjectsButton.getSelection());
-	}
-	
-	public boolean isUpdateClasspathRequested() {
-		return fUpdateClasspathButton.getSelection();
-	}
-	
-	public boolean isCleanProjectsRequested() {
-		return fCleanProjectsButton.getSelection();
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/MigrationAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/MigrationAction.java
deleted file mode 100644
index 8a20b41..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/MigrationAction.java
+++ /dev/null

@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.tools;
-
-import java.util.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.swt.custom.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-
-public class MigrationAction implements IObjectActionDelegate {
-
-	private ISelection fSelection;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction,
-	 *      org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		IPluginModelBase[] modelsToMigrate = getModelsToMigrate();
-		if (modelsToMigrate.length == 0) {
-			MessageDialog
-					.openInformation(
-							this.getDisplay().getActiveShell(),
-							PDEUIMessages.MigrationAction_find, PDEUIMessages.MigrationAction_none);// 
-			return;
-		}
-
-		if (fSelection instanceof IStructuredSelection) {
-			Object[] elems = ((IStructuredSelection) fSelection).toArray();
-			ArrayList models = new ArrayList(elems.length);
-
-			PluginModelManager manager = PDECore.getDefault().getModelManager();
-			for (int i = 0; i < elems.length; i++) {
-				Object elem = elems[i];
-				IProject project = null;
-
-				if (elem instanceof IFile) {
-					IFile file = (IFile) elem;
-					project = file.getProject();
-				} else if (elem instanceof IProject) {
-					project = (IProject) elem;
-				} else if (elem instanceof IJavaProject) {
-					project = ((IJavaProject) elem).getProject();
-				}
-				if (project != null) {
-					IPluginModelBase model = manager.findModel(project);
-					if (model != null) {
-						models.add(model);
-					}
-				}
-			}
-
-			final IPluginModelBase[] modelArray = (IPluginModelBase[]) models
-					.toArray(new IPluginModelBase[models.size()]);
-
-			MigratePluginWizard wizard = new MigratePluginWizard(
-					modelsToMigrate, modelArray);
-			final Display display = getDisplay();
-			final WizardDialog dialog = new WizardDialog(display
-					.getActiveShell(), wizard);
-			BusyIndicator.showWhile(display, new Runnable() {
-				public void run() {
-					dialog.open();
-				}
-			});
-		}
-	}
-
-	/*
-	 * (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) {
-		fSelection = selection;
-	}
-
-	private Display getDisplay() {
-		Display display = Display.getCurrent();
-		if (display == null) {
-			display = Display.getDefault();
-		}
-		return display;
-	}
-
-	private IPluginModelBase[] getModelsToMigrate() {
-		Vector result = new Vector();
-		IPluginModelBase[] models = PDECore.getDefault()
-				.getModelManager().getWorkspaceModels();
-		for (int i = 0; i < models.length; i++) {
-			if (!models[i].getUnderlyingResource().isLinked()
-					&& models[i].isLoaded()
-					&& models[i].getPluginBase().getSchemaVersion() == null)
-				result.add(models[i]);
-		}
-		return (IPluginModelBase[]) result.toArray(new IPluginModelBase[result
-				.size()]);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/UpdateBuildpathWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/UpdateBuildpathWizard.java
deleted file mode 100644
index 275de8f..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/UpdateBuildpathWizard.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.tools;
-
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.jface.dialogs.IDialogSettings;
-
-public class UpdateBuildpathWizard extends Wizard {
-	private UpdateBuildpathWizardPage page1;
-	private IPluginModelBase[] fSelected;
-	private IPluginModelBase[] fUnupdated;
-	private static final String STORE_SECTION = "UpdateBuildpathWizard"; //$NON-NLS-1$
-	public UpdateBuildpathWizard(IPluginModelBase[] models, IPluginModelBase[] selected) {
-		IDialogSettings masterSettings = PDEPlugin.getDefault().getDialogSettings();
-		setDialogSettings(getSettingsSection(masterSettings));
-		setDefaultPageImageDescriptor(PDEPluginImages.DESC_CONVJPPRJ_WIZ);
-		setWindowTitle(PDEUIMessages.UpdateBuildpathWizard_wtitle);
-		setNeedsProgressMonitor(true);
-		this.fSelected = selected;
-		this.fUnupdated = models;
-	}
-	
-	private IDialogSettings getSettingsSection(IDialogSettings master) {
-		IDialogSettings setting = master.getSection(STORE_SECTION);
-		if (setting == null) {
-			setting = master.addNewSection(STORE_SECTION);
-		}
-		return setting;
-	}
-	
-	public boolean performFinish() {
-		if (!PlatformUI.getWorkbench().saveAllEditors(true))
-			return false;
-		
-		Object [] finalSelected = page1.getSelected();
-		page1.storeSettings();
-		IPluginModelBase [] modelArray = new IPluginModelBase[finalSelected.length];
-		System.arraycopy(finalSelected, 0, modelArray, 0, finalSelected.length);
-		Job j = new UpdateClasspathJob(modelArray);
-		j.setUser(true);
-		j.schedule();
-		return true;
-	}
-	
-	public void addPages() {
-		page1 = new UpdateBuildpathWizardPage(fUnupdated, fSelected);
-		addPage(page1);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/UpdateBuildpathWizardPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/UpdateBuildpathWizardPage.java
deleted file mode 100644
index 201488a..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/UpdateBuildpathWizardPage.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.tools;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
-import org.eclipse.pde.internal.ui.parts.WizardCheckboxTablePart;
-import org.eclipse.pde.internal.ui.wizards.ListUtil;
-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.ui.PlatformUI;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-public class UpdateBuildpathWizardPage extends WizardPage {
-	private IPluginModelBase[] fSelected;
-	private IPluginModelBase[] fUnmigrated;
-	private CheckboxTableViewer pluginListViewer;
-	private TablePart tablePart;
-
-	public class BuildpathContentProvider
-		extends DefaultContentProvider
-		implements IStructuredContentProvider {
-		public Object[] getElements(Object parent) {
-			if (fUnmigrated != null)
-				return fUnmigrated;
-			return new Object[0];
-		}
-	}
-
-	class TablePart extends WizardCheckboxTablePart {
-		public TablePart(String mainLabel) {
-			super(mainLabel);
-		}
-
-		public void updateCounter(int count) {
-			super.updateCounter(count);
-			dialogChanged();
-		}
-		protected StructuredViewer createStructuredViewer(
-			Composite parent,
-			int style,
-			FormToolkit toolkit) {
-			StructuredViewer viewer =
-				super.createStructuredViewer(parent, style, toolkit);
-			viewer.setSorter(ListUtil.PLUGIN_SORTER);
-			return viewer;
-		}
-	}
-
-	public UpdateBuildpathWizardPage(IPluginModelBase[] models, IPluginModelBase[] selected) {
-		super("UpdateBuildpathWizardPage"); //$NON-NLS-1$
-		setTitle(PDEUIMessages.UpdateBuildpathWizard_title);
-		setDescription(PDEUIMessages.UpdateBuildpathWizard_desc);
-		this.fUnmigrated = models;
-		this.fSelected = selected;
-		tablePart = new TablePart(PDEUIMessages.UpdateBuildpathWizard_availablePlugins);
-		PDEPlugin.getDefault().getLabelProvider().connect(this);
-	}
-	
-	public void dispose() {
-		super.dispose();
-		PDEPlugin.getDefault().getLabelProvider().disconnect(this);
-	}
-
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginHeight = 0;
-		layout.marginWidth = 5;
-		container.setLayout(layout);
-
-		tablePart.createControl(container);
-
-		pluginListViewer = tablePart.getTableViewer();
-		pluginListViewer.setContentProvider(new BuildpathContentProvider());
-		pluginListViewer.setLabelProvider(PDEPlugin.getDefault().getLabelProvider());
-
-		GridData gd = (GridData)tablePart.getControl().getLayoutData();
-		gd.heightHint = 300;
-		gd.widthHint = 300;
-		
-		pluginListViewer.setInput(PDEPlugin.getDefault());
-		tablePart.setSelection(fSelected);
-
-		setControl(container);
-		Dialog.applyDialogFont(container);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(container, IHelpContextIds.UPDATE_CLASSPATH);
-	}
-
-	public void storeSettings() {
-	}
-
-	public Object[] getSelected() {
-		return tablePart.getSelection();
-	}
-	
-	private void dialogChanged() {
-		setPageComplete(tablePart.getSelectionCount() > 0);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()
-	 */
-	public boolean isPageComplete() {
-		return tablePart.getSelectionCount() > 0;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/UpdateClasspathAction.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/UpdateClasspathAction.java
deleted file mode 100644
index 31bb4da..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/UpdateClasspathAction.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.tools;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-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.jface.wizard.WizardDialog;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.PluginModelManager;
-import org.eclipse.pde.internal.core.WorkspaceModelManager;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-
-public class UpdateClasspathAction implements IViewActionDelegate {
-	private ISelection fSelection;
-
-	/*
-	 * @see IActionDelegate#run(IAction)
-	 */
-	public void run(IAction action) {
-		IPluginModelBase[] fUnupdated = getModelsToUpdate();
-		if (fUnupdated.length == 0) {
-			MessageDialog.openInformation(
-					PDEPlugin.getActiveWorkbenchShell(),
-					PDEUIMessages.UpdateClasspathAction_find,  
-					PDEUIMessages.UpdateClasspathAction_none); 
-			return;
-		}
-		if (fSelection instanceof IStructuredSelection) {
-			Object[] elems = ((IStructuredSelection) fSelection).toArray();
-			ArrayList models = new ArrayList(elems.length);
-			PluginModelManager manager = PDECore.getDefault().getModelManager();
-			for (int i = 0; i < elems.length; i++) {
-				Object elem = elems[i];
-				IProject project = null;
-
-				if (elem instanceof IFile) {
-					IFile file = (IFile) elem;
-					project = file.getProject();
-				} else if (elem instanceof IProject) {
-					project = (IProject) elem;
-				} else if (elem instanceof IJavaProject) {
-					project = ((IJavaProject) elem).getProject();
-				}
-				if (project != null
-						&& WorkspaceModelManager.isJavaPluginProject(project)) {
-					IPluginModelBase model = manager.findModel(project);
-					if (model != null) {
-						models.add(model);
-					}
-				}
-			}
-
-			final IPluginModelBase[] modelArray = (IPluginModelBase[]) models
-					.toArray(new IPluginModelBase[models.size()]);
-
-			UpdateBuildpathWizard wizard = new UpdateBuildpathWizard(fUnupdated, modelArray);
-			final WizardDialog dialog = new WizardDialog(PDEPlugin
-					.getActiveWorkbenchShell(), wizard);
-			BusyIndicator.showWhile(PDEPlugin.getActiveWorkbenchShell()
-					.getDisplay(), new Runnable() {
-				public void run() {
-					dialog.open();
-				}
-			});
-		}
-	}
-
-	/*
-	 * @see IWorkbenchWindowActionDelegate#init(IWorkbenchWindow)
-	 */
-	public void init(IViewPart view) {
-	}
-
-	/*
-	 * @see IActionDelegate#selectionChanged(IAction, ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		fSelection = selection;
-	}
-	
-	private IPluginModelBase[] getModelsToUpdate(){
-		IPluginModelBase[] models =
-			PDECore.getDefault().getModelManager().getWorkspaceModels();
-		ArrayList modelArray = new ArrayList();
-		try{
-			for (int i = 0; i < models.length; i++) {
-				if (models[i].getUnderlyingResource().getProject().hasNature(JavaCore.NATURE_ID))
-					modelArray.add(models[i]);
-			}
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-		return (IPluginModelBase[])modelArray.toArray(new IPluginModelBase[modelArray.size()]);
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/UpdateClasspathJob.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/UpdateClasspathJob.java
deleted file mode 100644
index 3c40bbf..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/tools/UpdateClasspathJob.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.wizards.tools;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-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.jobs.Job;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.ui.IPDEUIConstants;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.wizards.plugin.ClasspathComputer;
-
-public class UpdateClasspathJob extends Job {
-	IPluginModelBase[] fModels;
-
-	/**
-	 * @param name
-	 */
-	public UpdateClasspathJob(IPluginModelBase[] models) {
-		super(PDEUIMessages.UpdateClasspathJob_title);
-		setPriority(Job.LONG);
-		fModels = models;
-	}
-	/*
-	 * return canceled
-	 */
-	public boolean doUpdateClasspath(IProgressMonitor monitor,
-			IPluginModelBase[] models) throws CoreException {
-		monitor.beginTask(PDEUIMessages.UpdateClasspathJob_task,
-				models.length);
-		try {
-			for (int i = 0; i < models.length; i++) {
-				IPluginModelBase model = models[i];
-				monitor.subTask(models[i].getPluginBase().getId());
-				// no reason to compile classpath for a non-Java model
-				IProject project = model.getUnderlyingResource().getProject();
-				if (!project.hasNature(JavaCore.NATURE_ID)) {
-					monitor.worked(1);
-					continue;
-				}
-				ClasspathComputer.setClasspath(project, model);
-				monitor.worked(1);
-				if (monitor.isCanceled())
-					return false;
-			}
-		} finally {
-			monitor.done();
-		}
-		return true;
-	}
-
-	class UpdateClasspathWorkspaceRunnable implements IWorkspaceRunnable {
-		boolean fCanceled = false;
-		public void run(IProgressMonitor monitor)
-				throws CoreException {
-			fCanceled = doUpdateClasspath(monitor, fModels);
-		}
-		public boolean isCanceled(){
-			return fCanceled;
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.internal.jobs.InternalJob#run(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected IStatus run(IProgressMonitor monitor) {
-		try {
-			UpdateClasspathWorkspaceRunnable runnable = new UpdateClasspathWorkspaceRunnable();
-			PDEPlugin.getWorkspace().run(runnable, monitor);
-			if(runnable.isCanceled()){
-				return new Status(IStatus.CANCEL, IPDEUIConstants.PLUGIN_ID, IStatus.CANCEL, "",null); //$NON-NLS-1$
-			}
-
-		} catch (CoreException e) {
-			String title = PDEUIMessages.UpdateClasspathJob_error_title;
-			String message = PDEUIMessages.UpdateClasspathJob_error_message;
-			PDEPlugin.logException(e, title, message);
-			return new Status(IStatus.ERROR, IPDEUIConstants.PLUGIN_ID, IStatus.OK, message, e);
-		}
-		return new Status(IStatus.OK, IPDEUIConstants.PLUGIN_ID, IStatus.OK, "",null); //$NON-NLS-1$
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/IBasePluginWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/IBasePluginWizard.java
deleted file mode 100644
index 7a655e7..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/IBasePluginWizard.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui;
-
-import org.eclipse.jface.wizard.IWizard;
-
-/**
- * This is a tagging interface that should be implemented by all wizards that
- * are plugged into one of PDE extension points.
- * 
- * @since 1.0
- */
-public interface IBasePluginWizard extends IWizard {
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/IBundleContentWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/IBundleContentWizard.java
deleted file mode 100644
index 20a6265..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/IBundleContentWizard.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui;
-
-/**
- * Classes that implement this interface are contributed via the extension point
- * <code>org.eclipse.pde.ui.pluginContent</code>. The expectation is that
- * classes also extend JFace Wizard class.  This wizard must be used when plug-in 
- * dependencies are to be specified via the Import-Package header of a manifest.mf.  
- * The role of this wizard is to provide additional plug-in content after the 
- * project and the critical plug-in project files have been created. 
- * The wizard is nested in the overall 'New' wizard and can contribute one or 
- * more pages that allow users to configure how this content will be generated. 
- * A typical implementation of this interface would be a template wizard that 
- * populates the plug-in project with content that can be useful right away 
- * (for example, a view or an editor extension).
- * <p>
- * Due to the call order of the method <code>performFinish</code> in nested
- * wizards, classes that implement this interface should not place the code that
- * generates new content in the implementation of the abstract method
- * <code>Wizard.performFinish()</code>. Instead, they should simply return
- * <code>true</code> and have all the real code in <code>performFinish</code>
- * defined in this interface. This version of the method passes all the context
- * required for the content generation and is called AFTER the project and vital
- * plug-in files have been already created.
- * 
- * @since 3.2
- */
-public interface IBundleContentWizard extends IPluginContentWizard {
-
-	/**
-	 * Returns names of packages that are required by this wizard. 
-	 * This information will be used to compose the Import-Package header of 
-	 * the manifest.mf being generated, so that the plug-in compiles without 
-	 * errors in the first build after creation.
-	 * 
-	 * @return an array of package names required by this wizard
-	 */
-	String[] getImportPackages();
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/IExtensionEditorWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/IExtensionEditorWizard.java
deleted file mode 100644
index 9d77c58..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/IExtensionEditorWizard.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-/**
- * An interface for extension editor wizards. Clients should implement this
- * interface if they are plugging into PDE using
- * <samp>org.eclipse.pde.ui.newExtension </samp> extension point and want to
- * register wizards for custom editing of the selected extensions and extension
- * elements in the plug-in manifest wizard.
- * 
- * @since 3.0
- */
-public interface IExtensionEditorWizard extends IBasePluginWizard {
-	/**
-	 * Initializes the wizard with the project of the plug-in and the model
-	 * object for the plug-in manifest file. Java code and other resorces should
-	 * be created in the source folder under the provided project. Changes in
-	 * the plug-in manifest should be made using the APIs of the provided model.
-	 * Changing the model will make the model dirty. This will show up in the UI
-	 * indicating that the currently opened manifest file is modified and needs
-	 * to be saved.
-	 * <p>
-	 * The wizard is opened on a current selection in the extension tree. It is
-	 * supposed to modify the selected element and/or its children using plug-in
-	 * model APIs. The setters on the APIs will cause the model to be dirty and
-	 * make the editor dirty as well. Saving the editor will commit the changes
-	 * made by the wizard to the edited file.
-	 * 
-	 * @param project
-	 *            the plug-in project resource where the new code and resources
-	 *            should go
-	 * @param pluginModel
-	 *            the model instance that should be used to modify the plug-in
-	 *            manifest
-	 * @param selection
-	 *            the currently selected extension or extension element in the
-	 *            manifest editor extension tree
-	 *  
-	 */
-	public void init(IProject project, IPluginModelBase pluginModel,
-			IStructuredSelection selection);
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/IExtensionWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/IExtensionWizard.java
deleted file mode 100644
index 83fd58c..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/IExtensionWizard.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-/**
- * An interface for extension wizards. Clients should implement this interface
- * if they are plugging into PDE using <samp>org.eclipse.pde.ui.newExtension
- * </samp> extension point.
- * 
- * @since 2.0
- */
-public interface IExtensionWizard extends IBasePluginWizard {
-	/**
-	 * Initializes the wizard with the project of the plug-in and the model
-	 * object for the plug-in manifest file. Java code and other resorces should
-	 * be created in the source folder under the provided project. Changes in
-	 * the plug-in manifest should be made using the APIs of the provided model.
-	 * Changing the model will make the model dirty. This will show up in the UI
-	 * indicating that the currently opened manifest file is modified and needs
-	 * to be saved.
-	 * <p>
-	 * Although the wizard is launched to create an extension, there is no
-	 * reason a wizard cannot create several at once.
-	 * 
-	 * @param project
-	 *            the plug-in project resource where the new code and resources
-	 *            should go
-	 * @param pluginModel
-	 *            the model instance that should be used to modify the plug-in
-	 *            manifest
-	 */
-	public void init(IProject project, IPluginModelBase pluginModel);
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/IFieldData.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/IFieldData.java
deleted file mode 100644
index d738010..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/IFieldData.java
+++ /dev/null

@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui;
-
-/**
- * The class that implements this interface is used to provide information
- * captured in the 'New Plug-in Project' wizard pages as entered by the user.
- * The information is the provided to other consumers when generating content so
- * that the content can be configured/customized according to the data.
- * 
- * @since 2.0
- */
-public interface IFieldData {
-	/**
-	 * Plug-in identifier field.
-	 * 
-	 * @return plug-in identifier as entered in the wizard
-	 */
-	String getId();
-	/**
-	 * Plug-in version field.
-	 * 
-	 * @return plug-in version as entered in the wizard
-	 */
-	String getVersion();
-	/**
-	 * Plug-in name field
-	 * 
-	 * @return plug-in name as entered in the wizard
-	 */
-	String getName();
-	/**
-	 * Plug-in provider field
-	 * 
-	 * @return plug-in provider as entered in the wizard
-	 */
-	String getProvider();
-	/**
-	 * Plug-in library field
-	 * 
-	 * @return the name of the initial Java library
-	 */
-	String getLibraryName();
-	/**
-	 * Source folder field
-	 * 
-	 * @return the name of the Java source folder
-	 */
-	String getSourceFolderName();
-	/**
-	 * Output folder field
-	 * 
-	 * @return the name of the Java output folder
-	 */
-	String getOutputFolderName();
-	/**
-	 * Legacy selection
-	 * 
-	 * @return <code>true</code> if the plug-in is created for use with
-	 *         products based on Eclipse before release 3.0, <code>false</code>
-	 *         if the plug-ins is compatible with Eclipse 3.0.
-	 */
-	boolean isLegacy();
-	
-	/**
-	 * OSGi bundle selection
-	 * 
-	 * @return <code>true</code> if the plug-in has structure as expected by
-	 *         OSGi framework in Eclipse 3.0 runtime, <code>false</code> if
-	 *         the plug-in has standard pre-3.0 layout.
-	 */
-	boolean hasBundleStructure();
-	/**
-	 * Simple project selection
-	 * 
-	 * @return <code>true</code> if the plug-in should have no Java code and
-	 *         nature, <code>false</code> otherwise.
-	 */
-	boolean isSimple();
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/IFragmentFieldData.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/IFragmentFieldData.java
deleted file mode 100644
index 458ac63..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/IFragmentFieldData.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui;
-
-/**
- * In addition to field data from the 'New Project' wizard pages, this interface
- * provides choices made by the user that are unique to creating a new fragment
- * project.
- * 
- * @since 3.0
- */
-public interface IFragmentFieldData extends IFieldData {
-	/**
-	 * Referenced plug-in id field
-	 * 
-	 * @return the id of the fragment's plug-in
-	 */
-	String getPluginId();
-	/**
-	 * Referenced plug-in version field
-	 * 
-	 * @return the version of the fragment's plug-in
-	 */
-	String getPluginVersion();
-	/**
-	 * Referenced plug-in version match choice
-	 * 
-	 * @return the rule for matching the version of the referenced plug-in that
-	 *         can be one of the values defined in <code>IMatchRules</code>
-	 * 
-	 */
-	int getMatch();
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/IPluginContentWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/IPluginContentWizard.java
deleted file mode 100644
index 4698e5f..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/IPluginContentWizard.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.pde.core.plugin.*;
-/**
- * Classes that implement this interface are contributed via the extension point
- * <code>org.eclipse.pde.ui.pluginContent</code>. The expectation is that
- * classes also extend JFace Wizard class. The role of this wizard is to provide
- * additional plug-in content after the project and the critical plug-in project
- * files have been created. The wizard is nested in the overall 'New' wizard and
- * can contribute one or more pages that allow users to configure how this
- * content will be generated. A typical implementation of this interface would
- * be a template wizard that populates the plug-in project with content that can
- * be useful right away (for example, a view or an editor extension).
- * <p>
- * Due to the call order of the method <code>performFinish</code> in nested
- * wizards, classes that implement this interface should not place the code that
- * generates new content in the implementation of the abstract method
- * <code>Wizard.performFinish()</code>. Instead, they should simply return
- * <code>true</code> and have all the real code in <code>performFinish</code>
- * defined in this interface. This version of the method passes all the context
- * required for the content generation and is called AFTER the project and vital
- * plug-in files have been already created.
- * 
- * @since 3.0
- */
-public interface IPluginContentWizard extends IBasePluginWizard {
-	/**
-	 * Initializes the wizard with the data collected from the parent wizard
-	 * pages. The data can be used to customize the generated content.
-	 * 
-	 * @param data
-	 *            all the information collected in the parent wizard that can be
-	 *            used in configuring the generated content
-	 */
-	void init(IFieldData data);
-	/**
-	 * Returns new dependencies that are required by this wizard. If the wizard
-	 * adds extensions or code to the plug-in that depend on other plug-ins, it
-	 * must report it by returning a reference to that plug-in. This information
-	 * will be used to compose a correct list of plug-in dependencies so that
-	 * the plug-in compiles without errors in the first build after creation.
-	 * 
-	 * @param schemaVersion
-	 *            version of the plug-in manifest, or <samp>null </samp> if
-	 *            older manifest (prior to 3.0) has been created. Depending on
-	 *            the manifest version, the list of dependencies may vary.
-	 * @return the array of plug-in dependencies required by this wizard
-	 */
-	IPluginReference[] getDependencies(String schemaVersion);
-	/**
-	 * The wizard is required to return an array of new file and folder names
-	 * that are generated by it for the purpose of inclusion in
-	 * <code>build.properties</code> file. All files and folders that must be
-	 * part of the binary build must be listed in <code>bin.includes</code>
-	 * variable. Since the tokens obtained by this method will be passed to the
-	 * variable as-is, it is legal to use all wild cards also legal in
-	 * <code>build.properties,
-	 * such as "*.gif".
-	 * 
-	 * @return an array of new file and folder names
-	 */
-	String[] getNewFiles();
-
-	/**
-	 * Executes the wizard when 'Finish' button has been pressed. Note that you
-	 * should put all your working code in this method and not in
-	 * 'performFinish' of the Wizard class due to the wrong calling order. In
-	 * addition, this method provides progress monitor so that the execution of
-	 * the content wizard can be reported as a part of the overall new project
-	 * creation operation.
-	 * 
-	 * @param project
-	 *            the newly created plug-in project handle
-	 * @param model
-	 *            the model of the plug-in manifest that can be used to add
-	 *            extension markup
-	 * @param monitor
-	 *            the progress monitor to track progress of the content
-	 *            generation
-	 * @return <code>true</code> if the content has been generated
-	 *         successfully, <code>false</code> otherwise. In case of failure,
-	 *         the wizard dialog will stay open.
-	 */
-	boolean performFinish(IProject project, IPluginModelBase model,
-			IProgressMonitor monitor);
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/IPluginFieldData.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/IPluginFieldData.java
deleted file mode 100644
index d11b2c1..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/IPluginFieldData.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui;
-
-/**
- * In addition to field data from the 'New Project' wizard pages, this interface
- * provides choices made by the user that are unique to creating a new plug-in
- * project.
- * 
- * @since 3.0
- */
-public interface IPluginFieldData extends IFieldData {
-	/**
-	 * The class name field.
-	 * 
-	 * @return the name of the plug-in class
-	 */
-	String getClassname();
-	/**
-	 * UI plug-in selection.
-	 * 
-	 * @return <code>true</code> if the plug-in contains UI code and
-	 *         extensions, <code>false</code> otherwise.
-	 */
-	boolean isUIPlugin();
-	/**
-	 * Plug-in class generation selection.
-	 * 
-	 * @return <code>true</code> if the plug-in class is to be generated by
-	 *         the plug-in wizard, <code>false</code> otherwise.
-	 */
-	boolean doGenerateClass();
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/AbstractLauncherTab.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/AbstractLauncherTab.java
deleted file mode 100644
index 5199cf7..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/AbstractLauncherTab.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.launcher;
-
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-
-/**
- * An abstract class subclassed by all PDE tabs.
- * <p>
- * This class may be subclassed by clients.
- * </p>
- * @since 3.2
- */
-public abstract class AbstractLauncherTab extends AbstractLaunchConfigurationTab {
-	
-	/**
-	 * Creates an empty label and hence a space in the tab
-	 * 
-	 * @param parent the parent of the label
-	 * @param span the span of the label
-	 */
-	protected void createStartingSpace(Composite parent, int span) {
-		Label label = new Label(parent, SWT.NULL);
-		GridData data = new GridData();
-		data.horizontalSpan = span;
-		label.setLayoutData(data);
-	}
-
-	/**
-	 * 
-	 * 
-	 * @return <code>true</code> if the tab is valid, <code>false</code> otherwise
-	 * 
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public boolean isValid(ILaunchConfiguration config) {
-		return getErrorMessage() == null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#activated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void activated(ILaunchConfigurationWorkingCopy workingCopy) {
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#deactivated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void deactivated(ILaunchConfigurationWorkingCopy workingCopy) {
-	}
-
-	/**
-	 * Validates the page and updates the buttons and message of the launch configuration dialog.
-	 * 
-	 * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#updateLaunchConfigurationDialog()
-	 */
-	public void updateLaunchConfigurationDialog() {
-		validateTab();
-		super.updateLaunchConfigurationDialog();
-	}
-	
-	/**
-	 * Validates the data entered on the tab.
-	 *
-	 */
-	public abstract void validateTab();
-		
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/AbstractPDELaunchConfiguration.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/AbstractPDELaunchConfiguration.java
deleted file mode 100644
index 8cc3adf..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/AbstractPDELaunchConfiguration.java
+++ /dev/null

@@ -1,304 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.launcher;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.model.LaunchConfigurationDelegate;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMRunner;
-import org.eclipse.jdt.launching.VMRunnerConfiguration;
-import org.eclipse.pde.internal.core.TargetPlatform;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.launcher.LaunchArgumentsHelper;
-import org.eclipse.pde.internal.ui.launcher.LaunchConfigurationHelper;
-import org.eclipse.pde.internal.ui.launcher.LaunchPluginValidator;
-import org.eclipse.pde.internal.ui.launcher.VMHelper;
-import org.eclipse.pde.internal.ui.launcher.LauncherUtils;
-
-/**
- * An abstract launch delegate for PDE-based launch configurations
- * <p>
- * Clients may subclass this class.
- * </p>
- * @since 3.2
- */
-public abstract class AbstractPDELaunchConfiguration extends LaunchConfigurationDelegate {
-
-	protected File fConfigDir = null;
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate#launch(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String, org.eclipse.debug.core.ILaunch, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch,
-			IProgressMonitor monitor) throws CoreException {
-		try {
-			fConfigDir = null;
-			monitor.beginTask("", 4); //$NON-NLS-1$
-						
-			preLaunchCheck(configuration, launch, new SubProgressMonitor(monitor, 2));
-			
-			// Program arguments
-			String[] programArgs = getProgramArguments(configuration);
-			if (programArgs == null) {
-				monitor.setCanceled(true);
-				return;
-			}
-	
-			VMRunnerConfiguration runnerConfig = new VMRunnerConfiguration(
-														"org.eclipse.core.launcher.Main",  //$NON-NLS-1$
-														getClasspath(configuration)); 
-			runnerConfig.setVMArguments(getVMArguments(configuration));
-			runnerConfig.setProgramArguments(programArgs);
-			runnerConfig.setWorkingDirectory(getWorkingDirectory(configuration).getAbsolutePath());
-			runnerConfig.setEnvironment(getEnvironment(configuration));
-			runnerConfig.setVMSpecificAttributesMap(getVMSpecificAttributesMap(configuration));
-
-			monitor.worked(1);
-					
-			setDefaultSourceLocator(configuration);
-			LaunchConfigurationHelper.synchronizeManifests(configuration, getConfigDir(configuration));
-			PDEPlugin.getDefault().getLaunchListener().manage(launch);
-			IVMRunner runner = getVMRunner(configuration, mode);
-			if (runner != null)
-				runner.run(runnerConfig, launch, monitor);
-			else
-				monitor.setCanceled(true);
-			monitor.worked(1);
-		} catch (CoreException e) {
-			monitor.setCanceled(true);
-			throw e;
-		}
-	}
-	
-	/**
-	 * Returns the VM runner for the given launch mode to use when launching the
-	 * given configuration.
-	 *  
-	 * @param configuration launch configuration
-	 * @param mode launch node
-	 * @return VM runner to use when launching the given configuration in the given mode
-	 * @throws CoreException if a VM runner cannot be determined
-	 */
-	public IVMRunner getVMRunner(ILaunchConfiguration configuration, String mode) throws CoreException {
-		IVMInstall launcher = VMHelper.createLauncher(configuration);
-		return launcher.getVMRunner(mode);
-	}
-	
-	/**
-	 * Assigns a default source locator to the given launch if a source locator
-	 * has not yet been assigned to it, and the associated launch configuration
-	 * does not specify a source locator.
-	 * 
-	 * @param configuration
-	 *            configuration being launched
-	 * @exception CoreException
-	 *                if unable to set the source locator
-	 */
-	protected void setDefaultSourceLocator(ILaunchConfiguration configuration) throws CoreException {
-		LauncherUtils.setDefaultSourceLocator(configuration);		
-	}
-	
-	/**
-	 * Returns the entries that should appear on boot classpath.
-	 * 
-	 * @param configuration
-	 *            launch configuration
-	 * @return the location of startup.jar and 
-	 * 		the bootstrap classpath specified by the given launch configuration
-	 *        
-	 * @exception CoreException
-	 *                if unable to find startup.jar
-	 */
-	public String[] getClasspath(ILaunchConfiguration configuration) throws CoreException {
-		String[] classpath = LaunchArgumentsHelper.constructClasspath(configuration);
-		if (classpath == null) {
-			String message = PDEUIMessages.WorkbenchLauncherConfigurationDelegate_noStartup;
-			throw new CoreException(VMHelper.createErrorStatus(message));
-		}
-		return classpath;
-	}
-	
-	/** 
-	 * Returns an array of environment variables to be used when
-	 * launching the given configuration or <code>null</code> if unspecified.
-	 * 
-	 * @param configuration launch configuration
-	 * @throws CoreException if unable to access associated attribute or if
-	 * unable to resolve a variable in an environment variable's value
-	 */	
-	public String[] getEnvironment(ILaunchConfiguration configuration) throws CoreException {
-		return DebugPlugin.getDefault().getLaunchManager().getEnvironment(configuration);
-	}
-	
-	/**
-	 * Returns the working directory path specified by the given launch
-	 * configuration, or <code>null</code> if none.
-	 * 
-	 * @param configuration
-	 *            launch configuration
-	 * @return the working directory path specified by the given launch
-	 *         configuration, or <code>null</code> if none
-	 * @exception CoreException
-	 *                if unable to retrieve the attribute
-	 */
-	public File getWorkingDirectory(ILaunchConfiguration configuration) throws CoreException {
-		return LaunchArgumentsHelper.getWorkingDirectory(configuration);
-	}
-	
-	/**
-	 * Returns the Map of VM-specific attributes specified by the given launch
-	 * configuration, or <code>null</code> if none.
-	 * 
-	 * @param configuration
-	 *            launch configuration
-	 * @return the <code>Map</code> of VM-specific attributes
-	 * @exception CoreException
-	 *                if unable to retrieve the attribute
-	 */
-	public Map getVMSpecificAttributesMap(ILaunchConfiguration configuration) throws CoreException {
-		return LaunchArgumentsHelper.getVMSpecificAttributesMap(configuration);
-	}
-	
-	/**
-	 * Returns the VM arguments specified by the given launch configuration, as
-	 * an array of strings. 
-	 * 
-	 * @param configuration
-	 *            launch configuration
-	 * @return the VM arguments specified by the given launch configuration,
-	 *         possibly an empty array
-	 * @exception CoreException
-	 *                if unable to retrieve the attribute
-	 */
-	public String[] getVMArguments(ILaunchConfiguration configuration) throws CoreException {
-		return LaunchArgumentsHelper.getUserVMArgumentArray(configuration);
-	}
-
-	/**
-	 * Returns the program arguments to launch with.
-	 * This list is a combination of arguments computed by PDE based on attributes
-	 * specified in the given launch configuration, followed by the program arguments
-	 * that the entered directly into the launch configuration.
-	 * 
-	 * This computation may require user interaction (i.e an answer to a question), etc.
-	 * If the answer is to not proceed, then this method returns null.
-	 * 
-	 * @param configuration
-	 *            launch configuration
-	 * @return the program arguments necessar for launching
-	 * 				 or <code>null</null>
-	 * @exception CoreException
-	 *                if unable to retrieve the attribute or if self-hosting could not
-	 *                proceed due to a bad setup, missing plug-ins, inability to create the
-	 *                necessary configuration files.
-	 *              
-	 */
- 	public String[] getProgramArguments(ILaunchConfiguration configuration) throws CoreException {
- 		ArrayList programArgs = new ArrayList();
- 
- 		// add tracing, if turned on	
- 		if (configuration.getAttribute(IPDELauncherConstants.TRACING, false)
-				&& !IPDELauncherConstants.TRACING_NONE.equals(configuration.getAttribute(IPDELauncherConstants.TRACING_CHECKED, (String) null))) {
-			programArgs.add("-debug"); //$NON-NLS-1$
-			programArgs.add(
-					LaunchArgumentsHelper.getTracingFileArgument(
-					configuration,
-					getConfigDir(configuration).toString() + Path.SEPARATOR + ".options")); //$NON-NLS-1$
-		}
-
-		// add the program args specified by the user
-		String[] userArgs = LaunchArgumentsHelper.getUserProgramArgumentArray(configuration);
-		for (int i = 0; i < userArgs.length; i++) {
-			// be forgiving if people have tracing turned on and forgot
-			// to remove the -debug from the program args field.
-			if (userArgs[i].equals("-debug") && programArgs.contains("-debug")) //$NON-NLS-1$ //$NON-NLS-2$
-				continue;
-			programArgs.add(userArgs[i]);
-		}
-
-		if (!programArgs.contains("-os")) { //$NON-NLS-1$
-			programArgs.add("-os"); //$NON-NLS-1$
-			programArgs.add(TargetPlatform.getOS());
-		}
-		if (!programArgs.contains("-ws")) { //$NON-NLS-1$
-			programArgs.add("-ws"); //$NON-NLS-1$
-			programArgs.add(TargetPlatform.getWS());
-		}
-		if (!programArgs.contains("-arch")) { //$NON-NLS-1$
-			programArgs.add("-arch"); //$NON-NLS-1$
-			programArgs.add(TargetPlatform.getOSArch());
-		}
-		return (String[])programArgs.toArray(new String[programArgs.size()]);
- 	}
- 	
- 	/**
- 	 * Does sanity checking before launching.  The criteria whether the launch should 
- 	 * proceed or not is specific to the launch configuration type.
- 	 * 
- 	 * @param configuration launch configuration
- 	 * @param launch the launch object to contribute processes and debug targets to
- 	 * @param monitor a progress monitor
- 	 * 
- 	 * @throws CoreException exception thrown if launch fails or if unable to retrieve attributes
- 	 * from the launch configuration
- 	 * 				
- 	 */
-	protected abstract void preLaunchCheck(ILaunchConfiguration configuration, ILaunch launch, IProgressMonitor monitor) 
-			throws CoreException;
-
-	/**
-	 * Returns the configuration area specified by the given launch
-	 * configuration.
-	 * 
-	 * @param configuration
-	 *            launch configuration
-	 * @return the directory path specified by the given launch
-	 *         configuration
-	 */
-	protected File getConfigDir(ILaunchConfiguration configuration) {
-		if (fConfigDir == null)
-			fConfigDir = LaunchConfigurationHelper.getConfigurationArea(configuration);
-	
-		return fConfigDir;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.LaunchConfigurationDelegate#getBuildOrder(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String)
-	 */
-	protected IProject[] getBuildOrder(ILaunchConfiguration configuration,
-			String mode) throws CoreException {
-		return computeBuildOrder(LaunchPluginValidator.getAffectedProjects(configuration));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.LaunchConfigurationDelegate#getProjectsForProblemSearch(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String)
-	 */
-	protected IProject[] getProjectsForProblemSearch(
-			ILaunchConfiguration configuration, String mode)
-			throws CoreException {
-		return LaunchPluginValidator.getAffectedProjects(configuration);
-	}
-	
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/ConfigurationTab.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/ConfigurationTab.java
deleted file mode 100644
index b046966..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/ConfigurationTab.java
+++ /dev/null

@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.launcher;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.launcher.ConfigurationAreaBlock;
-import org.eclipse.pde.internal.ui.launcher.ConfigurationTemplateBlock;
-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.Composite;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * A launch configuration tab that displays and edits the configuration area
- * location and template for a PDE launch configuration.
- * <p>
- * This class may be instantiated. This class is not intended to be subclassed by clients.
- * </p>
- * @since 3.2
- */
-public class ConfigurationTab extends AbstractLauncherTab implements IPDELauncherConstants {
-	
-	private ConfigurationAreaBlock fConfigurationArea;
-	private ConfigurationTemplateBlock fTemplateArea;
-	private Image fImage;
-	private boolean fJUnitConfig;
-	
-	/**
-	 * Constructor.  Equivalent to ConfigurationTab(false).
-	 * 
-	 * @see #ConfigurationTab(boolean)
-	 */
-	public ConfigurationTab() {
-		this(false);
-	}
-	
-	/**
-	 * Constructor
-	 * 
-	 * @param isJUnitConfig  a flag to indicate if the tab is to be used with a Plug-in JUnit launch configuration.
-	 */
-	public ConfigurationTab(boolean isJUnitConfig) {
-		fImage = PDEPluginImages.DESC_PLUGIN_CONFIG_OBJ.createImage();
-		fConfigurationArea = new ConfigurationAreaBlock(this);
-		fTemplateArea = new ConfigurationTemplateBlock(this);
-		fJUnitConfig = isJUnitConfig;
-	}
-	
-	/*
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		container.setLayout(new GridLayout());
-		container.setLayoutData(new GridData(GridData.FILL_BOTH));
-		
-		createStartingSpace(container, 1);
-		fConfigurationArea.createControl(container);
-		createStartingSpace(container, 1);
-		fTemplateArea.createControl(container);
-		
-		Dialog.applyDialogFont(container);
-		setControl(container);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IHelpContextIds.LAUNCHER_CONFIGURATION);
-	}
-	
-	/*
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
-		fConfigurationArea.setDefaults(configuration, fJUnitConfig);
-		fTemplateArea.setDefaults(configuration);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		try {
-			fConfigurationArea.initializeFrom(configuration);
-			fTemplateArea.initializeFrom(configuration);
-		} catch (CoreException e) {
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		fConfigurationArea.performApply(configuration);
-		fTemplateArea.performApply(configuration);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
-	 */
-	public String getName() {
-		return PDEUIMessages.ConfigurationTab_name; 
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#getImage()
-	 */
-	public Image getImage() {
-		return fImage;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#dispose()
-	 */
-	public void dispose() {
-		if (fImage != null)
-			fImage.dispose();
-	}
-
-	/**
-	 * Validates the page and flags an error if the configuration area
-	 * location or the configuration template location does not exist.
-	 * 
-	 * @see org.eclipse.pde.ui.launcher.AbstractLauncherTab#validateTab()
-	 */
-	public void validateTab() {
-		String error = fConfigurationArea.validate();
-		if (error == null)
-			error = fTemplateArea.validate();
-		setErrorMessage(error);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/EclipseApplicationLaunchConfiguration.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/EclipseApplicationLaunchConfiguration.java
deleted file mode 100644
index 2176b96..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/EclipseApplicationLaunchConfiguration.java
+++ /dev/null

@@ -1,259 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.launcher;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.Properties;
-
-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.core.runtime.SubProgressMonitor;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.ClasspathHelper;
-import org.eclipse.pde.internal.core.ExternalModelManager;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.TargetPlatform;
-import org.eclipse.pde.internal.core.util.CoreUtility;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.launcher.LaunchArgumentsHelper;
-import org.eclipse.pde.internal.ui.launcher.LaunchConfigurationHelper;
-import org.eclipse.pde.internal.ui.launcher.LaunchPluginValidator;
-import org.eclipse.pde.internal.ui.launcher.VMHelper;
-import org.eclipse.pde.internal.ui.launcher.LauncherUtils;
-
-/**
- * A launch delegate for launching Eclipse applications
- * <p>
- * Clients may subclass and instantiate this class.
- * </p>
- * @since 3.2
- */
-public class EclipseApplicationLaunchConfiguration extends AbstractPDELaunchConfiguration {
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.pde.ui.launcher.AbstractPDELaunchConfiguration#getProgramArguments(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public String[] getProgramArguments(ILaunchConfiguration configuration) throws CoreException {
-		ArrayList programArgs = new ArrayList();
-		
-		// If a product is specified, then add it to the program args
-		if (configuration.getAttribute(IPDELauncherConstants.USE_PRODUCT, false)) {
-			programArgs.add("-product"); //$NON-NLS-1$
-			programArgs.add(configuration.getAttribute(IPDELauncherConstants.PRODUCT, "")); //$NON-NLS-1$
-		} else {
-			// specify the application to launch
-			programArgs.add("-application"); //$NON-NLS-1$
-			programArgs.add(configuration.getAttribute(IPDELauncherConstants.APPLICATION, LaunchConfigurationHelper.getDefaultApplicationName()));
-		}
-		
-		// specify the workspace location for the runtime workbench
-		String targetWorkspace = LaunchArgumentsHelper.getWorkspaceLocation(configuration);
-		if (targetWorkspace.length() > 0) {
-			programArgs.add("-data"); //$NON-NLS-1$
-			programArgs.add(targetWorkspace);
-		}
-		
-		boolean isOSGI = PDECore.getDefault().getModelManager().isOSGiRuntime();
-		boolean showSplash = true;
-		if (configuration.getAttribute(IPDELauncherConstants.USEFEATURES, false)) {
-			validateFeatures();
-			IPath installPath = PDEPlugin.getWorkspace().getRoot().getLocation();
-			programArgs.add("-install"); //$NON-NLS-1$
-			programArgs.add("file:" + installPath.removeLastSegments(1).addTrailingSeparator().toString()); //$NON-NLS-1$
-			if (isOSGI && !configuration.getAttribute(IPDELauncherConstants.CONFIG_USE_DEFAULT_AREA, true)) {
-				programArgs.add("-configuration"); //$NON-NLS-1$
-				programArgs.add("file:" + new Path(getConfigDir(configuration).getPath()).addTrailingSeparator().toString()); //$NON-NLS-1$
-			}
-			programArgs.add("-update"); //$NON-NLS-1$
-            // add the output folder names
-            programArgs.add("-dev"); //$NON-NLS-1$
-            if (PDECore.getDefault().getModelManager().isOSGiRuntime())
-                programArgs.add(ClasspathHelper.getDevEntriesProperties(getConfigDir(configuration).toString() + "/dev.properties", true)); //$NON-NLS-1$
-            else
-                programArgs.add(ClasspathHelper.getDevEntries(true));
-    		// necessary for PDE to know how to load plugins when target platform = host platform
-    		// see PluginPathFinder.getPluginPaths()
-     		programArgs.add("-pdelaunch"); //$NON-NLS-1$           
-		} else {
-			Map pluginMap = LaunchPluginValidator.getPluginsToRun(configuration);
-			if (pluginMap == null) 
-				return null;
-				
-			if (isOSGI) {
-				String productID = LaunchConfigurationHelper.getProductID(configuration);
-				Properties prop = LaunchConfigurationHelper.createConfigIniFile(configuration,
-						productID, pluginMap, getConfigDir(configuration));
-				showSplash = prop.containsKey("osgi.splashPath") || prop.containsKey("splashLocation"); //$NON-NLS-1$ //$NON-NLS-2$
-				TargetPlatform.createPlatformConfigurationArea(
-						pluginMap,
-						getConfigDir(configuration),
-						LaunchConfigurationHelper.getContributingPlugin(productID));
-			} else {
-				String primaryPlugin = LaunchConfigurationHelper.getPrimaryPlugin();
-				TargetPlatform.createPlatformConfigurationArea(
-						pluginMap,
-						getConfigDir(configuration),
-						primaryPlugin);
-				if (primaryPlugin != null) {
-					programArgs.add("-feature"); //$NON-NLS-1$
-					programArgs.add(primaryPlugin);					
-				}
-				IPluginModelBase bootModel = (IPluginModelBase)pluginMap.get("org.eclipse.core.boot"); //$NON-NLS-1$
-				String bootPath = LaunchConfigurationHelper.getBootPath(bootModel);
-				if (bootPath != null && !bootPath.endsWith(".jar")) { //$NON-NLS-1$
-					programArgs.add("-boot"); //$NON-NLS-1$
-					programArgs.add("file:" + bootPath); //$NON-NLS-1$
-				}				
-			}
-			
-			programArgs.add("-configuration"); //$NON-NLS-1$
-			if (isOSGI)
-				programArgs.add("file:" + new Path(getConfigDir(configuration).getPath()).addTrailingSeparator().toString()); //$NON-NLS-1$
-			else
-				programArgs.add("file:" + new Path(getConfigDir(configuration).getPath()).append("platform.cfg").toString()); //$NON-NLS-1$ //$NON-NLS-2$
-			
-            // add the output folder names
-            programArgs.add("-dev"); //$NON-NLS-1$
-            if (PDECore.getDefault().getModelManager().isOSGiRuntime())
-                programArgs.add(ClasspathHelper.getDevEntriesProperties(getConfigDir(configuration).toString() + "/dev.properties", pluginMap)); //$NON-NLS-1$
-            else
-                programArgs.add(ClasspathHelper.getDevEntries(true));            
-
-    		// necessary for PDE to know how to load plugins when target platform = host platform
-    		// see PluginPathFinder.getPluginPaths()
-    		if (pluginMap.containsKey(PDECore.getPluginId()))
-    			programArgs.add("-pdelaunch"); //$NON-NLS-1$	
-		}
-		
-		String[] args = super.getProgramArguments(configuration);
-		for (int i = 0; i < args.length; i++) {
-			programArgs.add(args[i]);
-		}
-		
-		if (!programArgs.contains("-nosplash") && showSplash) { //$NON-NLS-1$
-			if (TargetPlatform.getTargetVersion() >= 3.1) {
-				programArgs.add(0, "-launcher");  //$NON-NLS-1$
-				IPath path = ExternalModelManager.getEclipseHome().append("eclipse"); //$NON-NLS-1$
-				programArgs.add(1, path.toOSString()); //This could be the branded launcher if we want (also this does not bring much)
-				programArgs.add(2, "-name"); //$NON-NLS-1$
-				programArgs.add(3, "Eclipse");	//This should be the name of the product //$NON-NLS-1$
-				programArgs.add(4, "-showsplash"); //$NON-NLS-1$
-				programArgs.add(5, "600"); //$NON-NLS-1$
-			} else {
-				programArgs.add(0, "-showsplash"); //$NON-NLS-1$
-				programArgs.add(1, computeShowsplashArgument());
-			}
-		}
-		return (String[])programArgs.toArray(new String[programArgs.size()]);
-	}
-	
-	private void validateFeatures() throws CoreException {
-		IPath installPath = PDEPlugin.getWorkspace().getRoot().getLocation();
-		String lastSegment = installPath.lastSegment();
-		boolean badStructure = lastSegment == null;
-		if (!badStructure) {
-			IPath featuresPath = installPath.removeLastSegments(1).append("features"); //$NON-NLS-1$
-			badStructure = !lastSegment.equalsIgnoreCase("plugins") //$NON-NLS-1$
-					|| !featuresPath.toFile().exists();
-		}
-		if (badStructure) {
-			throw new CoreException(VMHelper.createErrorStatus(PDEUIMessages.WorkbenchLauncherConfigurationDelegate_badFeatureSetup));
-		}
-		// Ensure important files are present
-		ensureProductFilesExist(getProductPath());		
-	}
-	
-	private IPath getProductPath() {
-		return PDEPlugin.getWorkspace().getRoot().getLocation().removeLastSegments(1);
-	}
-
-	private String computeShowsplashArgument() {
-		IPath eclipseHome = ExternalModelManager.getEclipseHome();
-		IPath fullPath = eclipseHome.append("eclipse"); //$NON-NLS-1$
-		return fullPath.toOSString() + " -showsplash 600"; //$NON-NLS-1$
-	}
-
-	private void ensureProductFilesExist(IPath productArea) {
-		File productDir = productArea.toFile();		
-		File marker = new File(productDir, ".eclipseproduct"); //$NON-NLS-1$
-		IPath eclipsePath = ExternalModelManager.getEclipseHome();
-		if (!marker.exists()) 
-			CoreUtility.copyFile(eclipsePath, ".eclipseproduct", marker); //$NON-NLS-1$
-		
-		if (PDECore.getDefault().getModelManager().isOSGiRuntime()) {
-			File configDir = new File(productDir, "configuration"); //$NON-NLS-1$
-			if (!configDir.exists())
-				configDir.mkdirs();		
-			File ini = new File(configDir, "config.ini");			 //$NON-NLS-1$
-			if (!ini.exists())
-				CoreUtility.copyFile(eclipsePath.append("configuration"), "config.ini", ini); //$NON-NLS-1$ //$NON-NLS-2$
-		} else {
-			File ini = new File(productDir, "install.ini"); //$NON-NLS-1$
-			if (!ini.exists()) 
-				CoreUtility.copyFile(eclipsePath, "install.ini", ini);		 //$NON-NLS-1$
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.pde.ui.launcher.AbstractPDELaunchConfiguration#getConfigDir(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	protected File getConfigDir(ILaunchConfiguration config) {
-		if (fConfigDir == null) {
-			try {
-				if (config.getAttribute(IPDELauncherConstants.USEFEATURES, false) 
-						&& config.getAttribute(IPDELauncherConstants.CONFIG_USE_DEFAULT_AREA, true)) {
-					String root = getProductPath().toString();
-					if (PDECore.getDefault().getModelManager().isOSGiRuntime())
-						root += "/configuration"; //$NON-NLS-1$
-					fConfigDir = new File(root);
-					if (!fConfigDir.exists())
-						fConfigDir.mkdirs();
-				} else {
-					fConfigDir = LaunchConfigurationHelper.getConfigurationArea(config);
-				}
-			} catch (CoreException e) {
-				fConfigDir = LaunchConfigurationHelper.getConfigurationArea(config);
-			}
-		}
-		return fConfigDir;
-	}
-
-	/**
-	 * Prompts and clears the workspace area and/or the configuration area, if appropriate
-	 * 
-	 * @see org.eclipse.pde.ui.launcher.AbstractPDELaunchConfiguration#preLaunchCheck(org.eclipse.debug.core.ILaunchConfiguration, org.eclipse.debug.core.ILaunch, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void preLaunchCheck(ILaunchConfiguration configuration, ILaunch launch, IProgressMonitor monitor) 
-		throws CoreException {		
-		String workspace = LaunchArgumentsHelper.getWorkspaceLocation(configuration);
-		// Clear workspace and prompt, if necessary
-		if (!LauncherUtils.clearWorkspace(configuration, workspace, new SubProgressMonitor(monitor, 1))) {
-			monitor.setCanceled(true);
-			return;
-		}
-
-		// clear config area, if necessary
-		if (configuration.getAttribute(IPDELauncherConstants.CONFIG_CLEAR_AREA, false))
-			CoreUtility.deleteContent(getConfigDir(configuration));
-		launch.setAttribute(IPDELauncherConstants.CONFIG_LOCATION, getConfigDir(configuration).toString());
-			
-		monitor.worked(1);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/EquinoxLaunchConfiguration.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/EquinoxLaunchConfiguration.java
deleted file mode 100644
index 5ebc420..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/EquinoxLaunchConfiguration.java
+++ /dev/null

@@ -1,194 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.launcher;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-import java.util.TreeMap;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.ClasspathHelper;
-import org.eclipse.pde.internal.core.ExternalModelManager;
-import org.eclipse.pde.internal.core.ModelEntry;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.PluginModelManager;
-import org.eclipse.pde.internal.core.TargetPlatform;
-import org.eclipse.pde.internal.core.util.CoreUtility;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.launcher.EquinoxPluginBlock;
-import org.eclipse.pde.internal.ui.launcher.LaunchConfigurationHelper;
-import org.eclipse.pde.internal.ui.launcher.LaunchPluginValidator;
-
-/**
- * A launch delegate for launching the Equinox framework
- * <p>
- * Clients may subclass and instantiate this class.
- * </p>
- * @since 3.2
- */
-public class EquinoxLaunchConfiguration extends AbstractPDELaunchConfiguration {
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.pde.ui.launcher.AbstractPDELaunchConfiguration#getProgramArguments(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public String[] getProgramArguments(ILaunchConfiguration configuration) throws CoreException {
-		ArrayList programArgs = new ArrayList();
-
-		Map workspace = EquinoxPluginBlock.retrieveWorkspaceMap(configuration);
-		Map target = EquinoxPluginBlock.retrieveTargetMap(configuration);
-		
-		Map plugins = getPluginsToRun(workspace, target);
-		if (plugins == null)
-			return null;
-		
-		programArgs.add("-dev"); //$NON-NLS-1$
-        programArgs.add(ClasspathHelper.getDevEntriesProperties(getConfigDir(configuration).toString() + "/dev.properties", plugins)); //$NON-NLS-1$
-
-		saveConfigurationFile(configuration, plugins, workspace, target);
-		
-		programArgs.add("-configuration"); //$NON-NLS-1$
-		programArgs.add("file:" + new Path(getConfigDir(configuration).getPath()).addTrailingSeparator().toString()); //$NON-NLS-1$
-
-		if (plugins.containsKey("org.eclipse.pde.core")) //$NON-NLS-1$
-			programArgs.add("-pdelaunch"); //$NON-NLS-1$
-
-		String[] args = super.getProgramArguments(configuration);
-		for (int i = 0; i < args.length; i++) {
-			programArgs.add(args[i]);
-		}
-		return (String[])programArgs.toArray(new String[programArgs.size()]);
-	}
-	
-	private void saveConfigurationFile(ILaunchConfiguration configuration, Map map, Map workspace, Map target) throws CoreException {
-		Properties properties = new Properties();
-		properties.setProperty("osgi.install.area", "file:" + ExternalModelManager.getEclipseHome().toOSString()); //$NON-NLS-1$ //$NON-NLS-2$
-		properties.setProperty("osgi.configuration.cascaded", "false"); //$NON-NLS-1$ //$NON-NLS-2$
-		properties.put("osgi.framework", TargetPlatform.getBundleURL("org.eclipse.osgi", map)); //$NON-NLS-1$ //$NON-NLS-2$
-		int start = configuration.getAttribute(IPDELauncherConstants.DEFAULT_START_LEVEL, 4);
-		properties.put("osgi.bundles.defaultStartLevel", Integer.toString(start)); //$NON-NLS-1$
-		boolean autostart = configuration.getAttribute(IPDELauncherConstants.DEFAULT_AUTO_START, true);
-		String bundles = getBundles(map, workspace, target, autostart);
-		if (bundles.length() > 0)
-			properties.put("osgi.bundles", bundles); //$NON-NLS-1$
-		properties.put("eclipse.ignoreApp", "true"); //$NON-NLS-1$ //$NON-NLS-2$
-		properties.put("osgi.noShutdown", "true"); //$NON-NLS-1$ //$NON-NLS-2$
-		LaunchConfigurationHelper.save(new File(getConfigDir(configuration), "config.ini"), properties); //$NON-NLS-1$
-	}
-	
-	private String getBundles(Map plugins, Map workspace, Map target, boolean defaultAuto) {
-		StringBuffer buffer = new StringBuffer();
-		Iterator iter = plugins.values().iterator();
-		while (iter.hasNext()) {
-			IPluginModelBase model = (IPluginModelBase)iter.next();
-			String id = model.getPluginBase().getId();
-			if (!"org.eclipse.osgi".equals(id)) { //$NON-NLS-1$
-				if (buffer.length() > 0)
-					buffer.append(","); //$NON-NLS-1$
-				buffer.append("reference:"); //$NON-NLS-1$
-				buffer.append(TargetPlatform.getBundleURL(id, plugins));
-				
-				String data = model.getUnderlyingResource() == null ? target.get(id).toString() : workspace.get(id).toString();
-				int index = data.indexOf(':');
-				String level = index > 0 ? data.substring(0, index) : "default"; //$NON-NLS-1$
-				String auto = index > 0 && index < data.length() - 1 ? data.substring(index + 1) : "default"; //$NON-NLS-1$
-				if ("default".equals(auto)) //$NON-NLS-1$
-					auto = Boolean.toString(defaultAuto);
-				if (!level.equals("default") || "true".equals(auto)) //$NON-NLS-1$ //$NON-NLS-2$
-					buffer.append("@"); //$NON-NLS-1$
-				
-				if (!level.equals("default")) { //$NON-NLS-1$
-					buffer.append(level);
-					if ("true".equals(auto))  //$NON-NLS-1$
-						buffer.append(":"); //$NON-NLS-1$
-				}
-				if ("true".equals(auto)) { //$NON-NLS-1$
-					buffer.append("start"); //$NON-NLS-1$
-				}			
-			}
-		}
-		return buffer.toString();
-	}
-	
-
-	private Map getPluginsToRun(Map workspace, Map target) throws CoreException {
-		Map plugins = new TreeMap();
-		Iterator iter = workspace.keySet().iterator();
-		PluginModelManager manager = PDECore.getDefault().getModelManager();
-		while (iter.hasNext()) {
-			String id = iter.next().toString();
-			IPluginModelBase model = manager.findModel(id);
-			if (model != null && model.getUnderlyingResource() != null) {
-				plugins.put(id, model);
-			}
-		}
-			
-		iter = target.keySet().iterator();
-		while (iter.hasNext()) {
-			String id = iter.next().toString();
-			if (!plugins.containsKey(id)) {
-				ModelEntry entry = manager.findEntry(id);
-				if (entry != null && entry.getExternalModel() != null) {
-					plugins.put(id, entry.getExternalModel());
-				}
-			}
-		}
-		
-		ArrayList statusEntries = new ArrayList();
-		iter = plugins.values().iterator();
-		while (iter.hasNext()) {
-			IPluginModelBase model = (IPluginModelBase) iter.next();
-			if (!model.isLoaded()) {
-				statusEntries.add(new Status(IStatus.WARNING, 
-						PDEPlugin.getPluginId(), 
-						IStatus.OK, 
-						model.getPluginBase().getId(), 
-						null));
-			}
-		}	
-		return LaunchPluginValidator.validatePluginsToRun(plugins, statusEntries);
-	}
-
-	/**
-	 * checks that the target platform is >= 3.0 before proceeding.
-	 * 
-	 * @see org.eclipse.pde.ui.launcher.AbstractPDELaunchConfiguration#preLaunchCheck(org.eclipse.debug.core.ILaunchConfiguration, org.eclipse.debug.core.ILaunch, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void preLaunchCheck(ILaunchConfiguration configuration, ILaunch launch, IProgressMonitor monitor) throws CoreException {
-		if (!TargetPlatform.isOSGi()) {
-			IStatus status = new Status(
-					IStatus.ERROR, 
-					"org.eclipse.pde.ui",  //$NON-NLS-1$
-					IStatus.OK,
-					PDEUIMessages.EquinoxLaunchConfiguration_oldTarget,
-					null);
-			throw new CoreException(status);
-		}
-		// clear config area, if necessary
-		if (configuration.getAttribute(IPDELauncherConstants.CONFIG_CLEAR_AREA, false))
-			CoreUtility.deleteContent(getConfigDir(configuration));
-		launch.setAttribute(IPDELauncherConstants.CONFIG_LOCATION, getConfigDir(configuration).toString());
-			
-		monitor.worked(1);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/EquinoxPluginsTab.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/EquinoxPluginsTab.java
deleted file mode 100644
index 9c620a4..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/EquinoxPluginsTab.java
+++ /dev/null

@@ -1,199 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.launcher;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.launcher.EquinoxPluginBlock;
-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.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Spinner;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * A launch configuration tab that lets the user customize the list of plug-ins to launch with,
- * their start level and their auto-start attributes.
- * <p>
- * This class may be instantiated. This class is not intended to be subclassed by clients.
- * </p>
- * @since 3.2
- */
-public class EquinoxPluginsTab extends AbstractLauncherTab {
-
-	private Image fImage;
-	private EquinoxPluginBlock fPluginBlock;
-	private Listener fListener = new Listener();
-	private Combo fDefaultAutoStart;
-	private Spinner fDefaultStartLevel;
-	
-	class Listener extends SelectionAdapter implements ModifyListener{
-		public void widgetSelected(SelectionEvent e) {
-			updateLaunchConfigurationDialog();
-		}
-
-		public void modifyText(ModifyEvent e) {
-			updateLaunchConfigurationDialog();
-		}
-	}
-
-	/*
-	 * Constructor
-	 */
-	public EquinoxPluginsTab() {
-		fImage = PDEPluginImages.DESC_REQ_PLUGINS_OBJ.createImage();
-		fPluginBlock = new EquinoxPluginBlock(this);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#dispose()
-	 */
-	public void dispose() {
-		fPluginBlock.dispose();
-		fImage.dispose();
-		super.dispose();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(new GridLayout());
-
-		createDefaultsGroup(composite);
-		fPluginBlock.createControl(composite);
-
-		setControl(composite);
-		Dialog.applyDialogFont(composite);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.LAUNCHER_ADVANCED);
-	}
-	
-	private void createDefaultsGroup(Composite container) {
-		Composite defaults = new Composite(container, SWT.NONE);
-		GridLayout layout = new GridLayout(5, false);
-		defaults.setLayout(layout);
-		defaults.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
-		
-		Label startLevelLabel = new Label(defaults, SWT.NONE);
-		startLevelLabel.setText(PDEUIMessages.EquinoxPluginsTab_defaultStart);
-		
-		fDefaultStartLevel = new Spinner(defaults, SWT.BORDER);
-		fDefaultStartLevel.setMinimum(1);
-		fDefaultStartLevel.addModifyListener(fListener);
-		
-		Label label = new Label(defaults, SWT.NONE);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.minimumWidth = 50;
-		label.setLayoutData(gd);
-		
-		Label autoStartLabel = new Label(defaults, SWT.NONE);
-		autoStartLabel.setText(PDEUIMessages.EquinoxPluginsTab_defaultAuto);
-		
-		fDefaultAutoStart = new Combo(defaults, SWT.BORDER | SWT.READ_ONLY);
-		fDefaultAutoStart.setItems(new String[] {Boolean.toString(true), Boolean.toString(false)});
-		fDefaultAutoStart.select(0);
-		fDefaultAutoStart.addSelectionListener(fListener);
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration config) {
-		try {
-			boolean auto = config.getAttribute(IPDELauncherConstants.DEFAULT_AUTO_START, true);
-			fDefaultAutoStart.setText(Boolean.toString(auto));
-			int level = config.getAttribute(IPDELauncherConstants.DEFAULT_START_LEVEL, 4);
-			fDefaultStartLevel.setSelection(level);
-			fPluginBlock.initializeFrom(config);
-		} catch (CoreException e) {
-			PDEPlugin.log(e);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
-		config.setAttribute(IPDELauncherConstants.DEFAULT_AUTO_START, true);
-		config.setAttribute(IPDELauncherConstants.DEFAULT_START_LEVEL, 4);
-		fPluginBlock.setDefaults(config);
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy config) {
-		config.setAttribute(IPDELauncherConstants.DEFAULT_AUTO_START, 
-				Boolean.toString(true).equals(fDefaultAutoStart.getText()));
-		config.setAttribute(IPDELauncherConstants.DEFAULT_START_LEVEL, fDefaultStartLevel.getSelection());
-		fPluginBlock.performApply(config);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
-	 */
-	public String getName() {
-		return PDEUIMessages.AdvancedLauncherTab_name; 
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage()
-	 */
-	public Image getImage() {
-		return fImage;
-	}
-	
-	/**
-	 * Returns the default start level for the launch configuration
-	 * 
-	 * @return the default start level
-	 */
-	public int getDefaultStartLevel() {
-		return fDefaultStartLevel.getSelection();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#activated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void activated(ILaunchConfigurationWorkingCopy config) {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.pde.ui.launcher.AbstractLauncherTab#validateTab()
-	 */
-	public void validateTab() {
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/EquinoxSettingsTab.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/EquinoxSettingsTab.java
deleted file mode 100644
index 67e21e5..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/EquinoxSettingsTab.java
+++ /dev/null

@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.launcher;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.launcher.ConfigurationAreaBlock;
-import org.eclipse.pde.internal.ui.launcher.JREBlock;
-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.Composite;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * A launch configuration tab that displays and edits the VM install 
- * launch configuration attributes.
- * <p>
- * This class may be instantiated. This class is not intended to be subclassed.
- * </p>
- * @since 3.2
- */
-public class EquinoxSettingsTab extends AbstractLauncherTab {
-	
-	private JREBlock fJREBlock;
-	private ConfigurationAreaBlock fConfigurationBlock;
-	private Image fImage;
-	
-	/**
-	 * Constructor
-	 *
-	 */
-	public EquinoxSettingsTab() {
-		fImage = PDEPluginImages.DESC_PLUGIN_CONFIG_OBJ.createImage();
-		fJREBlock = new JREBlock(this);
-		fConfigurationBlock = new ConfigurationAreaBlock(this);
-	}
-	/*
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NONE);
-		container.setLayout(new GridLayout());
-		container.setLayoutData(new GridData(GridData.FILL_BOTH));
-		
-		createStartingSpace(container, 1);
-		fJREBlock.createControl(container);
-		createStartingSpace(container, 1);
-		fConfigurationBlock.createControl(container);
-		
-		Dialog.applyDialogFont(container);
-		setControl(container);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IHelpContextIds.LAUNCHER_CONFIGURATION);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
-		fJREBlock.setDefaults(configuration);
-		fConfigurationBlock.setDefaults(configuration, false);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		try {
-			fJREBlock.initializeFrom(configuration);
-			fConfigurationBlock.initializeFrom(configuration);
-		} catch (CoreException e) {
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		fJREBlock.performApply(configuration);
-		fConfigurationBlock.performApply(configuration);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
-	 */
-	public String getName() {
-		return PDEUIMessages.EquinoxSettingsTab_name; 
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#getImage()
-	 */
-	public Image getImage() {
-		return fImage;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#dispose()
-	 */
-	public void dispose() {
-		if (fImage != null)
-			fImage.dispose();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.pde.ui.launcher.AbstractLauncherTab#validateTab()
-	 */
-	public void validateTab() {
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/IPDELauncherConstants.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/IPDELauncherConstants.java
deleted file mode 100644
index 8632624..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/IPDELauncherConstants.java
+++ /dev/null

@@ -1,279 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.launcher;
-
-/**
- * Constant definitions for PDE launch configurations.
- * <p>
- * Constant definitions only; not to be implemented.
- * </p>
- * @since 3.2
- */
-public interface IPDELauncherConstants {
-	
-	/**
-	 * Launch configuration attribute key. The value is a string specifying
-	 * workspace data location for an Eclipse application.
-	 */
-	String LOCATION = "location"; //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute key. The value is a boolean specifying
-	 * workspace data location for an Eclipse application should be cleared
-	 * prior to launching.
-	 */
-	String DOCLEAR = "clearws"; //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute key. The value is a boolean specifying
-	 * whether the user should be prompted prior to clearing the workspace.
-	 * 
-	 * @see IPDELauncherConstants#DOCLEAR
-	 */	
-	String ASKCLEAR = "askclear"; //$NON-NLS-1$
-		
-	/**
-	 * Launch configuration attribute key. The value is a string specifying
-	 * the application to run.  If the value is <code>null</code>, the default 
-	 * application as specified in the target platform will be used.
-	 */	
-	String APPLICATION = "application"; //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute key. The value is a string specifying
-	 * the product to run.
-	 * 
-	 * @see IPDELauncherConstants#APPLICATION
-	 */		
-	String PRODUCT = "product"; //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute key. The value is a boolean specifying
-	 * if the launch should appear in product-mode.  If the value is <code>false</code>,
-	 * the launch takes place in application-mode.
-	 * 
-	 * @see IPDELauncherConstants#PRODUCT
-	 * @see IPDELauncherConstants#APPLICATION
-	 */	
-	String USE_PRODUCT = "useProduct"; //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute key used in Plug-in JUnit launch configurations only. 
-	 * The value is a string specifying the application to be tested.  
-	 * If the value is <code>null</code>, the default UI workbench application is tested.
-	 */		
-	String APP_TO_TEST = "testApplication"; //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute key. The value is a string specifying
-	 * the name of the VM to launch with.  If the value is <code>null</code>,
-	 * the default workspace VM is used.
-	 */	
-	String VMINSTALL = "vminstall"; //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute key. The value is a string specifying
-	 * the user-entered bootstrap classpath entries. 
-	 */	
-	String BOOTSTRAP_ENTRIES = "bootstrap"; //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute key. The value is a boolean specifying
-	 * if the default self-hosting mode should be used when launching.
-	 * The default being to launch with all workspace plug-ins and all the 
-	 * plug-ins that are explicitly checked on the Target Platform preference page.
-	 */	
-	String USE_DEFAULT = "default"; //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute key. The value is a boolean specifying
-	 * if the feature-based self-hosting mode should be used.
-	 * The workspace must be set up properly for the feature-based self-hosting
-	 * to succeed.
-	 * Check the PDE Tips and Tricks section for how to set up feature-based self-hosting.
-	 */		
-	String USEFEATURES = "usefeatures"; //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute key. The value is a string specifying
-	 * a comma-separated list of IDs of workspace plug-ins to launch with.
-	 * This value is only used when the Automatic Add option is off.
-	 * 
-	 * @see IPDELauncherConstants#AUTOMATIC_ADD
-	 */				
-	String SELECTED_WORKSPACE_PLUGINS = "selected_workspace_plugins"; //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute key. The value is a string specifying
-	 * a comma-separated list of IDs of workspace plug-ins that are to be excluded from
-	 * the launch.
-	 * This value is only used when the Automatic Add option is on.
-	 * 
-	 * @see IPDELauncherConstants#AUTOMATIC_ADD
-	 */					
-	String DESELECTED_WORKSPACE_PLUGINS = "deselected_workspace_plugins"; //$NON-NLS-1$
-
-	/**
-	 * Launch configuration attribute key. The value is a boolean specifying
-	 * whether workspace plug-in created after the creation of a launch configuration
-	 * should be added to the list of plug-ins to launch with.
-	 * 
-	 * If the value is <code>true</code>, then DESELECTED_WORKSPACE_PLUGINS should be used.
-	 * Otherwise, SELECTED_WORKSPACE_PLUGINS should be used.
-	 * 
-	 * @see IPDELauncherConstants#DESELECTED_WORKSPACE_PLUGINS
-	 * @see IPDELauncherConstants#SELECTED_WORKSPACE_PLUGINS
-	 */					
-	String AUTOMATIC_ADD = "automaticAdd"; //$NON-NLS-1$
-	/**
-	 * Launch configuration attribute key. The value is a string specifying
-	 * a comma-separated list of IDs of target platform plug-ins to launch with.
-	 * This value is only used when the Automatic Add option is off.
-	 */					
-	String SELECTED_TARGET_PLUGINS = "selected_target_plugins"; //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute key. The value is a boolean indicating
-	 * whether the computation of required plug-ins on the Plug-ins tab should include
-	 * the traversal of optional dependencies.
-	 */		
-	String INCLUDE_OPTIONAL = "includeOptional"; //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute key. The value is a boolean indicating
-	 * whether tracing is enabled or disabled.
-	 */		
-	String TRACING = "tracing"; //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute key. The value is a map containing the list
-	 * of options to debug with.
-	 */			
-	String TRACING_OPTIONS = "tracingOptions"; //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute key. The value is the id of the last plug-in 
-	 * that was selected on the Tracing tab.
-	 */				
-	String TRACING_SELECTED_PLUGIN = "selectedPlugin"; //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute key. The value is the IDs of all plug-ins
-	 * checked on the Tracing tab.  The value may also be "[NONE]"
-	 * 
-	 * @see IPDELauncherConstants#TRACING_NONE
-	 */
-	String TRACING_CHECKED = "checked"; //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute value indicating that, although tracing is enabled,
-	 * no plug-ins have been selected to be traced.
-	 */
-	String TRACING_NONE = "[NONE]"; //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute key. The value is a boolean specifying 
-	 * if PDE should generate a default configuration area for the launch.
-	 * 
-	 * If <code>true</code>, a configuration location in the PDE metadata area 
-	 * is created.  Otherwise, the user is expected to specify a location.
-	 * 
-	 * @see IPDELauncherConstants#CONFIG_LOCATION
-	 */				
-	String CONFIG_USE_DEFAULT_AREA = "useDefaultConfigArea"; //$NON-NLS-1$
-
-	/**
-	 * Launch configuration attribute key. The value is a string specifying 
-	 * the configuration area location for an Eclipse application launch.
-	 * 
-	 * This key is only used when CONFIG_USE_DEFAULT_AREA is <code>false</code>.
-	 * 
-	 * @see IPDELauncherConstants#CONFIG_USE_DEFAULT_AREA
-	 */				
-	String CONFIG_LOCATION = "configLocation"; //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute key. The value is a boolean specifying 
-	 * if the configuration area location should be cleared prior to launching
-	*/
-	String CONFIG_CLEAR_AREA = "clearConfig"; //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration atribute key.  The value is a boolean specifying
-	 * if PDE should generate a default config.ini file for the launch.
-	 * 
-	 * If <code>true</code>, a configuration file is created.  
-	 * Otherwise, the user is expected to specify a config.ini to be used as a template.
-	 * 
-	 * @see IPDELauncherConstants#CONFIG_TEMPLATE_LOCATION
-	 */
-	String CONFIG_GENERATE_DEFAULT = "useDefaultConfig"; //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute key. The value is a string specifying 
-	 * the location of the config.ini file to be used as a template for an 
-	 * Eclipse application launch.
-	 * 
-	 * This key is only used when CONFIG_GENERATE_DEFAULT is <code>false</code>.
-	 * 
-	 * @see IPDELauncherConstants#CONFIG_GENERATE_DEFAULT
-	 */					
-	String CONFIG_TEMPLATE_LOCATION = "templateConfig";	 //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute key. The value is a string specifying 
-	 * the location of the .product file with which this launch configuration 
-	 * is associated.
-	 */					
-	String PRODUCT_FILE = "productFile"; //$NON-NLS-1$
-
-	/**
-	 * Launch configuration attribute key.  The value is a boolean specifying
-	 * if the default Auto-Start for an Equinox Framework launch configuration 
-	 * is <code>true</code> or <code>false</code>
-	 * 
-	 * @see IPDELauncherConstants#DEFAULT_START_LEVEL
-	 */
-	String DEFAULT_AUTO_START = "default_auto_start"; //$NON-NLS-1$
-	
-	/**
-	 * Launch configuration attribute key.  The value is an integer specifying
-	 * the default start level for bundles in an Equinox Framework launch configuration.
-	 * 
-	 * @see IPDELauncherConstants#DEFAULT_AUTO_START
-	 */
-	String DEFAULT_START_LEVEL = "default_start_level"; //$NON-NLS-1$
-
-	/**
-	 * Launch configuration attribute key.  The value is a comma-separated list
-	 * of workspace bundles to launch with the Equinox framework.
-	 * 
-	 * Each token in the list is of the format:
-	 * <plugin-id>@<start-level>:<auto-start>
-	 * 
-	 * @see IPDELauncherConstants#DEFAULT_AUTO_START
-	 * @see IPDELauncherConstants#DEFAULT_START_LEVEL
-	 */
-	String WORKSPACE_BUNDLES = "workspace_bundles"; //$NON-NLS-1$
-
-	/**
-	 * Launch configuration attribute key.  The value is a comma-separated list
-	 * of non-workspace bundles to launch with the Equinox framework.
-	 * 
-	 * Each token in the list is of the format:
-	 * <plugin-id>@<start-level>:<auto-start>
-	 * 
-	 * @see IPDELauncherConstants#DEFAULT_AUTO_START
-	 * @see IPDELauncherConstants#DEFAULT_START_LEVEL
-	 */
-	String TARGET_BUNDLES = "target_bundles"; //$NON-NLS-1$
-			
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/MainTab.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/MainTab.java
deleted file mode 100644
index cdc7727..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/MainTab.java
+++ /dev/null

@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.launcher;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.launcher.JREBlock;
-import org.eclipse.pde.internal.ui.launcher.ProgramBlock;
-import org.eclipse.pde.internal.ui.launcher.WorkspaceDataBlock;
-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.Composite;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * A launch configuration tab that displays and edits the main launching arguments
- * of an Eclipse application.
- * <p>
- * This class may be instantiated. This class is not intended to be subclassed by clients.
- * </p>
- * @since 3.2
- */
-public class MainTab extends AbstractLauncherTab implements IPDELauncherConstants {
-	
-	protected WorkspaceDataBlock fDataBlock;
-	protected ProgramBlock fProgramBlock;
-	protected JREBlock fJreBlock;
-	
-	private Image fImage;
-
-	public MainTab() {
-		fDataBlock = new WorkspaceDataBlock(this);
-		createProgramBlock();
-		fJreBlock = new JREBlock(this);
-		fImage = PDEPluginImages.DESC_MAIN_TAB.createImage();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#dispose()
-	 */
-	public void dispose() {
-		super.dispose();
-		fImage.dispose();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.verticalSpacing = 15;
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		fDataBlock.createControl(composite);		
-		fProgramBlock.createControl(composite);
-		fJreBlock.createControl(composite);
-		
-		setControl(composite);
-		Dialog.applyDialogFont(composite);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.LAUNCHER_BASIC);
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration config) {
-		try {
-			fDataBlock.initializeFrom(config, false);
-			fProgramBlock.initializeFrom(config);
-			fJreBlock.initializeFrom(config);
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		} finally {
-		}
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
-		fDataBlock.setDefaults(config, false);
-		fProgramBlock.setDefaults(config);
-		fJreBlock.setDefaults(config);
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy config) {
-		fDataBlock.performApply(config);
-		fProgramBlock.performApply(config);
-		fJreBlock.performApply(config);
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
-	 */
-	public String getName() {
-		return PDEUIMessages.MainTab_name;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage()
-	 */
-	public Image getImage() {
-		return fImage;
-	}
-	
-	/**
-	 * Creates the Program To Run group on the tab
-	 *
-	 */
-	protected void createProgramBlock() {
-		fProgramBlock = new ProgramBlock(this);		
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.pde.ui.launcher.AbstractLauncherTab#validateTab()
-	 */
-	public void validateTab() {
-		setErrorMessage(fDataBlock.validate());
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/PluginJUnitMainTab.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/PluginJUnitMainTab.java
deleted file mode 100644
index b46bb39..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/PluginJUnitMainTab.java
+++ /dev/null

@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.launcher;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.launcher.JUnitProgramBlock;
-
-/**
- * A launch configuration tab that displays and edits the main launching arguments
- * of a Plug-in JUnit test.
- * <p>
- * This class may be instantiated. This class is not intended to be subclassed by clients.
- * </p>
- * @since 3.2
- */
-public class PluginJUnitMainTab extends MainTab {
-
-	/**
-	 * Overrides the implementation of the basis MainTab.
-	 */
-	protected void createProgramBlock() {
-		fProgramBlock = new JUnitProgramBlock(this);
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration config) {
-		try {
-			fDataBlock.initializeFrom(config, true);
-			fProgramBlock.initializeFrom(config);
-			fJreBlock.initializeFrom(config);
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-		} finally {
-		}
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
-		fDataBlock.setDefaults(config, true);
-		fProgramBlock.setDefaults(config);
-		fJreBlock.setDefaults(config);
-	}
-	
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/PluginsTab.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/PluginsTab.java
deleted file mode 100644
index 774a82b..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/PluginsTab.java
+++ /dev/null

@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.launcher;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.launcher.PluginBlock;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * A launch configuration tab that displays the different self-hosting modes,
- * and lets the user customize the list of plug-ins to launch with.
- * <p>
- * This class may be instantiated. This class is not intended to be subclassed by clients.
- * </p>
- * @since 3.2
- */
-public class PluginsTab extends AbstractLauncherTab {
-
-	private Button fUseDefaultRadio;
-	private Button fUseFeaturesRadio;
-	private Button fUseListRadio;
-	private Image fImage;
-	private boolean fShowFeatures = true;
-	private PluginBlock fPluginBlock;
-	private Listener fListener = new Listener();
-	
-	class Listener extends SelectionAdapter {
-		public void widgetSelected(SelectionEvent e) {
-			fPluginBlock.enableViewer(fUseListRadio.getSelection());
-			updateLaunchConfigurationDialog();
-		}
-	}
-
-	/**
-	 * Constructor. Equivalent to PluginsTab(true).
-	 * 
-	 * @see #PluginsTab(boolean)
-	 *
-	 */
-	public PluginsTab() {
-		this(true);
-	}
-
-	/**
-	 * Constructor
-	 * 
-	 * @param showFeatures  a flag indicating if the tab should present the feature-based 
-	 * self-hosting option.
-	 */
-	public PluginsTab(boolean showFeatures) {
-		fShowFeatures = showFeatures;
-		fImage = PDEPluginImages.DESC_REQ_PLUGINS_OBJ.createImage();
-		fPluginBlock = new PluginBlock(this);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#dispose()
-	 */
-	public void dispose() {
-		fPluginBlock.dispose();
-		fImage.dispose();
-		super.dispose();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(new GridLayout());
-
-		fUseDefaultRadio = new Button(composite, SWT.RADIO);
-		fUseDefaultRadio.setText(PDEUIMessages.AdvancedLauncherTab_useDefault);
-		fUseDefaultRadio.addSelectionListener(fListener);
-
-		if (fShowFeatures) {
-			fUseFeaturesRadio = new Button(composite, SWT.RADIO);
-			fUseFeaturesRadio.setText(PDEUIMessages.AdvancedLauncherTab_useFeatures); 
-			fUseFeaturesRadio.addSelectionListener(fListener);
-		}
-
-		fUseListRadio = new Button(composite, SWT.RADIO);
-		fUseListRadio.setText(PDEUIMessages.AdvancedLauncherTab_useList); 
-		fUseListRadio.addSelectionListener(fListener);
-
-		fPluginBlock.createControl(composite);
-
-		setControl(composite);
-		Dialog.applyDialogFont(composite);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.LAUNCHER_ADVANCED);
-	}
-	
-	/*
-	 * (non-Javadoc) 
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		try {
-			fUseDefaultRadio.setSelection(configuration.getAttribute(IPDELauncherConstants.USE_DEFAULT, true));
-			if (fShowFeatures) {
-				fUseFeaturesRadio.setSelection(configuration.getAttribute(IPDELauncherConstants.USEFEATURES, false));
-				fUseListRadio.setSelection(!fUseDefaultRadio.getSelection()
-											&& !fUseFeaturesRadio.getSelection());
-			} else {
-				fUseListRadio.setSelection(!fUseDefaultRadio.getSelection());
-			}
-			fPluginBlock.initializeFrom(configuration, fUseDefaultRadio.getSelection());
-		} catch (CoreException e) {
-			PDEPlugin.log(e);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
-		configuration.setAttribute(IPDELauncherConstants.USE_DEFAULT, true);
-		if (fShowFeatures)
-			configuration.setAttribute(IPDELauncherConstants.USEFEATURES, false);
-		fPluginBlock.setDefaults(configuration);
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		configuration.setAttribute(IPDELauncherConstants.USE_DEFAULT, fUseDefaultRadio.getSelection());
-		if (fShowFeatures)
-			configuration.setAttribute(IPDELauncherConstants.USEFEATURES, fUseFeaturesRadio.getSelection());
-		fPluginBlock.performApply(configuration);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
-	 */
-	public String getName() {
-		return PDEUIMessages.AdvancedLauncherTab_name; 
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage()
-	 */
-	public Image getImage() {
-		return fImage;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#activated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void activated(ILaunchConfigurationWorkingCopy configuration) {
-		fPluginBlock.activated(configuration, !fShowFeatures);
-	}
-
-	/**
-	 * Validates the tab.  If the feature option is chosen, and the workspace is not correctly set up,
-	 * the error message is set.
-	 * 
-	 * @see org.eclipse.pde.ui.launcher.AbstractLauncherTab#validateTab()
-	 */
-	public void validateTab() {
-		String errorMessage = null;
-		if (fShowFeatures && fUseFeaturesRadio.getSelection()) {
-			IPath workspacePath = PDEPlugin.getWorkspace().getRoot().getLocation();
-			IPath featurePath = workspacePath.removeLastSegments(1).append("features"); //$NON-NLS-1$
-			if (!workspacePath.lastSegment().equalsIgnoreCase("plugins") //$NON-NLS-1$
-				|| !featurePath.toFile().exists())
-				errorMessage = PDEUIMessages.AdvancedLauncherTab_error_featureSetup; 
-		} 
-		setErrorMessage(errorMessage);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/TracingTab.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/TracingTab.java
deleted file mode 100644
index 24aa8c9..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/launcher/TracingTab.java
+++ /dev/null

@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.launcher;
-
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.launcher.TracingBlock;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * A launch configuration tab that enables tracing and displays all plug-ins that support
- * tracing.
- * <p>
- * This class may be instantiated. This class is not intended to be subclassed by clients.
- * </p>
- * @since 3.2
- */
-public class TracingTab extends AbstractLauncherTab {
-	
-	private Image fImage;
-	private TracingBlock fTracingBlock;
-	
-	/**
-	 * Constructor
-	 *
-	 */
-	public TracingTab() {
-		fTracingBlock = new TracingBlock(this);
-		PDEPlugin.getDefault().getLabelProvider().connect(this);
-		fImage = PDEPluginImages.DESC_DOC_SECTION_OBJ.createImage();
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NULL);
-		container.setLayout(new GridLayout());
-		fTracingBlock.createControl(container);
-		setControl(container);
-		Dialog.applyDialogFont(container);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(container, IHelpContextIds.LAUNCHER_TRACING);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#activated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void activated(ILaunchConfigurationWorkingCopy workingCopy) {
-		fTracingBlock.activated(workingCopy);
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#dispose()
-	 */
-	public void dispose() {
-		fTracingBlock.dispose();
-		if (fImage != null)
-			fImage.dispose();
-		PDEPlugin.getDefault().getLabelProvider().disconnect(this);
-		super.dispose();
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration config) {
-		fTracingBlock.initializeFrom(config);
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy config) {
-		fTracingBlock.performApply(config);
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
-		fTracingBlock.setDefaults(config);
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
-	 */
-	public String getName() {
-		return PDEUIMessages.TracingLauncherTab_name; 
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage()
-	 */
-	public Image getImage() {
-		return fImage;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.pde.ui.launcher.AbstractLauncherTab#validateTab()
-	 */
-	public void validateTab() {
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/AbstractNewPluginTemplateWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/AbstractNewPluginTemplateWizard.java
deleted file mode 100644
index 53c35a6..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/AbstractNewPluginTemplateWizard.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.templates;
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.ui.*;
-/**
- * This class is used as a common base for plug-in content wizards that are
- * implemented using PDE template support. The assumption is that one or more
- * templates will be used to generate plug-in content. Dependencies, new files
- * and wizard pages are all computed based on the templates.
- * 
- * @since 2.0
- */
-public abstract class AbstractNewPluginTemplateWizard extends Wizard
-		implements
-			IBundleContentWizard {
-	private IFieldData data;
-	/**
-	 * Creates a new template wizard.
-	 */
-	public AbstractNewPluginTemplateWizard() {
-		super();
-		setDialogSettings(PDEPlugin.getDefault().getDialogSettings());
-		setDefaultPageImageDescriptor(PDEPluginImages.DESC_NEWEXPRJ_WIZ);
-		setNeedsProgressMonitor(true);
-	}
-	/**
-	 * @see org.eclipse.pde.ui.IPluginContentWizard#init(IFieldData)
-	 */
-	public void init(IFieldData data) {
-		this.data = data;
-		setWindowTitle(PDEUIMessages.PluginCodeGeneratorWizard_title);
-	}
-	/**
-	 * Returns the field data passed to the wizard during the initialization.
-	 * 
-	 * @return the parent wizard field data
-	 */
-	public IFieldData getData() {
-		return data;
-	}
-	/**
-	 * This wizard adds a mandatory first page. Subclasses implement this method
-	 * to add additional pages to the wizard.
-	 */
-	protected abstract void addAdditionalPages();
-	/**
-	 * Implements wizard method. Subclasses cannot override it.
-	 */
-	public final void addPages() {
-		addAdditionalPages();
-	}
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#performFinish()
-	 */
-	public boolean performFinish() {
-		// do nothing - all the work is in the other 'performFinish'
-		return true;
-	}
-	/**
-	 * Implements the interface method by looping through template sections and
-	 * executing them sequentially.
-	 * 
-	 * @param project
-	 *            the project
-	 * @param model
-	 *            the plug-in model
-	 * @param monitor
-	 *            the progress monitor to track the execution progress as part
-	 *            of the overall new project creation operation
-	 * @return <code>true</code> if the wizard completed the operation with
-	 *         success, <code>false</code> otherwise.
-	 */
-	public boolean performFinish(IProject project, IPluginModelBase model,
-			IProgressMonitor monitor) {
-		try {
-			ITemplateSection[] sections = getTemplateSections();
-			monitor.beginTask("", sections.length); //$NON-NLS-1$
-			for (int i = 0; i < sections.length; i++) {
-				sections[i].execute(project, model, new SubProgressMonitor(
-						monitor, 1));
-			}
-			//No reason to do this any more with the new editors
-			//saveTemplateFile(project, null);
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-			return false;
-		} finally {
-			monitor.done();
-		}
-		return true;
-	}
-	/**
-	 * Returns the template sections used in this wizard.
-	 * 
-	 * @return the array of template sections
-	 */
-	public abstract ITemplateSection[] getTemplateSections();
-	/**
-	 * @see org.eclipse.pde.ui.IPluginContentWizard#getDependencies(String)
-	 */
-	public IPluginReference[] getDependencies(String schemaVersion) {
-		ArrayList result = new ArrayList();
-		ITemplateSection[] sections = getTemplateSections();
-		for (int i = 0; i < sections.length; i++) {
-			IPluginReference[] refs = sections[i]
-					.getDependencies(schemaVersion);
-			for (int j = 0; j < refs.length; j++) {
-				if (!result.contains(refs[j]))
-					result.add(refs[j]);
-			}
-		}
-		return (IPluginReference[]) result.toArray(new IPluginReference[result
-				.size()]);
-	}
-	/**
-	 * @see org.eclipse.pde.ui.IPluginContentWizard#getNewFiles()
-	 */
-	public String[] getNewFiles() {
-		ArrayList result = new ArrayList();
-		ITemplateSection[] sections = getTemplateSections();
-		for (int i = 0; i < sections.length; i++) {
-			String[] newFiles = sections[i].getNewFiles();
-			for (int j = 0; j < newFiles.length; j++) {
-				if (!result.contains(newFiles[j]))
-					result.add(newFiles[j]);
-			}
-		}
-		return (String[]) result.toArray(new String[result.size()]);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.IPluginContentWizard#hasPages()
-	 */
-	public boolean hasPages() {
-		return getTemplateSections().length > 0;
-	}
-	
-	public String[] getImportPackages() {
-		return new String[0];
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/AbstractTemplateSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/AbstractTemplateSection.java
deleted file mode 100644
index c27d31f..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/AbstractTemplateSection.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.templates;
-import java.io.*;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.*;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipException;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.wizards.templates.*;
-
-/**
- * Common function for template sections. It is recommended to subclass this
- * class rather than implementing ITemplateSection directly when providing
- * extension templates.
- * 
- * @since 2.0
- */
-
-public abstract class AbstractTemplateSection
-		implements
-			ITemplateSection,
-			IVariableProvider {
-
-	/**
-	 * The project handle.
-	 */
-	protected IProject project;
-	/**
-	 * The plug-in model.
-	 */
-	protected IPluginModelBase model;
-	/**
-	 * The key for the main plug-in class of the plug-in that the template is
-	 * used for (value="pluginClass");
-	 */
-	public static final String KEY_PLUGIN_CLASS = "pluginClass"; //$NON-NLS-1$
-	/**
-	 * The key for the plug-in id of the plug-in that the template is used for
-	 * (value="pluginId").
-	 */
-	public static final String KEY_PLUGIN_ID = "pluginId"; //$NON-NLS-1$
-	/**
-	 * The key for the plug-in name of the plug-in that the template is used for
-	 * (value="pluginName").
-	 */
-	public static final String KEY_PLUGIN_NAME = "pluginName"; //$NON-NLS-1$
-	/**
-	 * The key for the package name that will be created by this teamplate
-	 * (value="packageName").
-	 */
-	public static final String KEY_PACKAGE_NAME = "packageName"; //$NON-NLS-1$
-
-	private boolean pagesAdded = false;
-	/**
-	 * The default implementation of this method provides values of the
-	 * following keys: <samp>pluginClass </samp>, <samp>pluginId </samp> and
-	 * <samp>pluginName </samp>.
-	 * 
-	 * @see ITemplateSection#getReplacementString(String,String)
-	 */
-	public String getReplacementString(String fileName, String key) {
-		if (key.equals(KEY_PLUGIN_CLASS) && model != null) {
-			if (model instanceof IPluginModel) {
-				IPlugin plugin = (IPlugin) model.getPluginBase();
-				return plugin.getClassName();
-			}
-		}
-		if (key.equals(KEY_PLUGIN_ID) && model != null) {
-			IPluginBase plugin = model.getPluginBase();
-			return plugin.getId();
-		}
-		if (key.equals(KEY_PLUGIN_NAME) && model != null) {
-			IPluginBase plugin = model.getPluginBase();
-			return plugin.getTranslatedName();
-		}
-		return key;
-	}
-
-	/**
-	 * @see IVariableProvider#getValue(String)
-	 */
-
-	public Object getValue(String key) {
-		return null;
-	}
-	/**
-	 * @see ITemplateSection#getTemplateLocation()
-	 */
-	public URL getTemplateLocation() {
-		return null;
-	}
-	/**
-	 * @see ITemplateSection#getDescription()
-	 */
-	public String getDescription() {
-		return ""; //$NON-NLS-1$
-	}
-	/**
-	 * Returns the translated version of the resource string represented by the
-	 * provided key.
-	 * 
-	 * @param key
-	 *            the key of the required resource string
-	 * @return the translated version of the required resource string
-	 * @see #getPluginResourceBundle()
-	 */
-	public String getPluginResourceString(String key) {
-		ResourceBundle bundle = getPluginResourceBundle();
-		if (bundle == null)
-			return key;
-		try {
-			return bundle.getString(key);
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-	/**
-	 * An abstract method that returns the resource bundle that corresponds to
-	 * the best match of <samp>plugin.properties </samp> file for the current
-	 * locale (in case of fragments, the file is <samp>fragment.properties
-	 * </samp>).
-	 * 
-	 * @return resource bundle for plug-in properties file or <samp>null </samp>
-	 *         if not found.
-	 */
-	protected abstract ResourceBundle getPluginResourceBundle();
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.ITemplateSection#addPages(org.eclipse.jface.wizard.Wizard)
-	 */
-	public void addPages(Wizard wizard) {
-	}
-	
-	/**
-	 * Tests if wizard pages for this template section have been added.
-	 * 
-	 * @return <code>true</code> if wizard pages for this section have been
-	 *         added, <code>false</code> otherwise.
-	 */
-	public boolean getPagesAdded() {
-		return pagesAdded;
-	}
-
-	/**
-	 * Marks that pages have been added to the wizard by this template. Call
-	 * this method in 'addPages'.
-	 * 
-	 * @see #addPages(Wizard)
-	 */
-	protected void markPagesAdded() {
-		pagesAdded = true;
-	}
-
-	/**
-	 * The default implementation of the interface method. The returned value is
-	 * 1.
-	 * 
-	 * @see ITemplateSection#getNumberOfWorkUnits()
-	 */
-	public int getNumberOfWorkUnits() {
-		return 1;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.ITemplateSection#getDependencies(java.lang.String)
-	 */
-	public IPluginReference[] getDependencies(String schemaVersion) {
-		return new IPluginReference[]{new PluginReference("org.eclipse.ui", //$NON-NLS-1$
-				null, 0)};
-	}
-	
-	/**
-	 * Returns the folder with Java files in the target project. The default
-	 * implementation looks for source folders in the classpath of the target
-	 * folders and picks the first one encountered. Subclasses may override this
-	 * behaviour.
-	 * 
-	 * @param monitor
-	 *            progress monitor to use
-	 * @return source folder that will be used to generate Java files or
-	 *         <samp>null </samp> if none found.
-	 */
-
-	protected IFolder getSourceFolder(IProgressMonitor monitor)
-			throws CoreException {
-		IFolder sourceFolder = null;
-
-		try {
-			IJavaProject javaProject = JavaCore.create(project);
-			IClasspathEntry[] classpath = javaProject.getRawClasspath();
-			for (int i = 0; i < classpath.length; i++) {
-				IClasspathEntry entry = classpath[i];
-				if (entry.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
-					IPath path = entry.getPath().removeFirstSegments(1);
-					if (path.segmentCount() > 0)
-						sourceFolder = project.getFolder(path);
-					break;
-				}
-			}
-		} catch (JavaModelException e) {
-		}
-		return sourceFolder;
-	}
-
-	/**
-	 * Generates files as part of the template execution. The default
-	 * implementation uses template location as a root of the file templates.
-	 * The files found in the location are processed in the following way:
-	 * <ul>
-	 * <li>Files and folders found in the directory <samp>bin </samp> are
-	 * copied into the target project without modification.</li>
-	 * <li>Files found in the directory <samp>java </samp> are copied into the
-	 * Java source folder by creating the folder structure that corresponds to
-	 * the package name (variable <samp>packageName </samp>). Java files are
-	 * subject to conditional generation and variable replacement.</li>
-	 * <li>All other files and folders are copied directly into the target
-	 * folder with the conditional generation and variable replacement for
-	 * files. Variable replacement also includes file names.</li>
-	 * </ul>
-	 * 
-	 * @param monitor
-	 *            progress monitor to use to indicate generation progress
-	 */
-	protected void generateFiles(IProgressMonitor monitor) throws CoreException {
-		monitor.setTaskName(PDEUIMessages.AbstractTemplateSection_generating);
-
-		URL locationUrl = getTemplateLocation();
-		if (locationUrl == null) {
-			return;
-		}
-		try {
-			locationUrl = Platform.resolve(locationUrl);
-			locationUrl = Platform.asLocalURL(locationUrl);
-		} catch (IOException e) {
-			return;
-		}
-		if ("file".equals(locationUrl.getProtocol())) { //$NON-NLS-1$
-			File templateDirectory = new File(locationUrl.getFile());
-			if (!templateDirectory.exists())
-				return;
-			generateFiles(templateDirectory, project, true, false, monitor);
-		} else if ("jar".equals(locationUrl.getProtocol())) { //$NON-NLS-1$
-			String file = locationUrl.getFile();
-			int exclamation = file.indexOf('!');
-			if (exclamation < 0)
-				return;
-			URL fileUrl = null;
-			try {
-				fileUrl = new URL(file.substring(0, exclamation));
-			} catch (MalformedURLException mue) {
-				return;
-			}
-			File pluginJar = new File(fileUrl.getFile());
-			if (!pluginJar.exists())
-				return;
-			String templateDirectory = file.substring(exclamation + 1); // "/some/path/"
-			IPath path = new Path(templateDirectory);
-			ZipFile zipFile = null;
-			try {
-				zipFile = new ZipFile(pluginJar);
-				generateFiles(zipFile, path, project, true, false, monitor);
-			} catch (ZipException ze) {
-			} catch (IOException ioe) {
-			} finally {
-				if (zipFile != null) {
-					try {
-						zipFile.close();
-					} catch (IOException e) {
-					}
-				}
-			}
-
-		}
-		monitor.subTask(""); //$NON-NLS-1$
-		monitor.worked(1);
-	}
-	
-	/**
-	 * Tests if the folder found in the template location should be created in
-	 * the target project. Subclasses may use this method to conditionally block
-	 * creation of the entire directories (subject to user choices).
-	 * 
-	 * @param sourceFolder
-	 *            the folder that is tested
-	 * @return <code>true</code> if the provided folder should be created in
-	 *         the workspace, <code>false</code> if the values of the
-	 *         substitution variables indicate otherwise.
-	 */
-	protected boolean isOkToCreateFolder(File sourceFolder) {
-		return true;
-	}
-
-	/**
-	 * Tests if the file found in the template location should be created in the
-	 * target project. Subclasses may use this method to conditionally block
-	 * createion of the file (subject to user choices).
-	 * 
-	 * @param sourceFile
-	 *            the file found in the template location that needs to be
-	 *            created.
-	 * @return <samp>true </samp> if the specified file should be created in the
-	 *         project or <samp>false </samp> to skip it. The default
-	 *         implementation is <samp>true </samp>.
-	 */
-	protected boolean isOkToCreateFile(File sourceFile) {
-		return true;
-	}
-
-	/**
-	 * Subclass must implement this method to add the required entries in the
-	 * plug-in model.
-	 * 
-	 * @param monitor
-	 *            the progress monitor to be used
-	 */
-	protected abstract void updateModel(IProgressMonitor monitor)
-			throws CoreException;
-
-	/**
-	 * The default implementation of the interface method. It will generate
-	 * required files found in the template location and then call
-	 * <samp>updateModel </samp> to add the required manifest entires.
-	 * 
-	 * @see ITemplateSection#execute(IProject, IPluginModelBase,
-	 *      IProgressMonitor)
-	 */
-	public void execute(IProject project, IPluginModelBase model,
-			IProgressMonitor monitor) throws CoreException {
-		this.project = project;
-		this.model = model;
-		generateFiles(monitor);
-		updateModel(monitor);
-	}
-	/**
-	 * A utility method to create an extension object for the plug-in model from
-	 * the provided extension point id.
-	 * 
-	 * @param pointId
-	 *            the identifier of the target extension point
-	 * @param reuse
-	 *            if true, new extension object will be created only if an
-	 *            extension with the same Id does not exist.
-	 * @return an existing extension (if exists and <samp>reuse </samp> is
-	 *         <samp>true </samp>), or a new extension object otherwise.
-	 */
-	protected IPluginExtension createExtension(String pointId, boolean reuse)
-			throws CoreException {
-		if (reuse) {
-			IPluginExtension[] extensions = model.getPluginBase()
-					.getExtensions();
-			for (int i = 0; i < extensions.length; i++) {
-				IPluginExtension extension = extensions[i];
-				if (extension.getPoint().equalsIgnoreCase(pointId)) {
-					return extension;
-				}
-			}
-		}
-		IPluginExtension extension = model.getFactory().createExtension();
-		extension.setPoint(pointId);
-		return extension;
-	}
-
-	private void generateFiles(File src, IContainer dst, boolean firstLevel,
-			boolean binary, IProgressMonitor monitor) throws CoreException {
-		File[] members = src.listFiles();
-
-		for (int i = 0; i < members.length; i++) {
-			File member = members[i];
-			if (member.isDirectory()) {
-				IContainer dstContainer = null;
-
-				if (firstLevel) {
-					binary = false;
-					if (member.getName().equals("java")) { //$NON-NLS-1$
-						IFolder sourceFolder = getSourceFolder(monitor);
-						dstContainer = generateJavaSourceFolder(sourceFolder, monitor);
-					} else if (member.getName().equals("bin")) { //$NON-NLS-1$
-						binary = true;
-						dstContainer = dst;
-					}
-				}
-				if (dstContainer == null) {
-					if (isOkToCreateFolder(member) == false)
-						continue;
-					String folderName = getProcessedString(member.getName(),
-							member.getName());
-					dstContainer = dst.getFolder(new Path(folderName));
-				}
-				if (dstContainer instanceof IFolder && !dstContainer.exists())
-					((IFolder) dstContainer).create(true, true, monitor);
-				generateFiles(member, dstContainer, false, binary, monitor);
-			} else {
-				if (isOkToCreateFile(member)) {
-					if (firstLevel)
-						binary = false;
-					InputStream in = null;
-					try {
-						in = new FileInputStream(member);
-						copyFile(member.getName(), in, dst, binary, monitor);
-					} catch (IOException ioe) {
-					} finally {
-						if (in != null)
-							try {
-								in.close();
-							} catch (IOException ioe2) {
-							}
-					}
-				}
-			}
-		}
-	}
-
-	private void generateFiles(ZipFile zipFile, IPath path, IContainer dst,
-			boolean firstLevel, boolean binary, IProgressMonitor monitor)
-			throws CoreException {
-		int pathLength = path.segmentCount();
-		// Immidiate children
-		Map childZipEntries = new HashMap(); // "dir/" or "dir/file.java"
-
-		for (Enumeration zipEntries = zipFile.entries(); zipEntries
-				.hasMoreElements();) {
-			ZipEntry zipEntry = (ZipEntry) zipEntries.nextElement();
-			IPath entryPath = new Path(zipEntry.getName());
-			if (entryPath.segmentCount() <= pathLength) {
-				// ancestor or current directory
-				continue;
-			}
-			if (!path.isPrefixOf(entryPath)) {
-				// not a descendant
-				continue;
-			}
-			if (entryPath.segmentCount() == pathLength + 1) {
-				childZipEntries.put(zipEntry.getName(), zipEntry);
-			} else {
-				String name = entryPath.uptoSegment(
-						pathLength + 1).addTrailingSeparator().toString();
-				if(!childZipEntries.containsKey(name)){	
-					ZipEntry dirEntry = new ZipEntry(name);
-					childZipEntries.put(name, dirEntry);
-				}
-			}
-		}
-
-		for (Iterator it = childZipEntries.values().iterator(); it.hasNext();) {
-			ZipEntry zipEnry = (ZipEntry) it.next();
-			String name = new Path(zipEnry.getName()).lastSegment().toString();
-			if (zipEnry.isDirectory()) {
-				IContainer dstContainer = null;
-
-				if (firstLevel) {
-					binary = false;
-					if (name.equals("java")) { //$NON-NLS-1$
-						IFolder sourceFolder = getSourceFolder(monitor);
-						dstContainer = generateJavaSourceFolder(sourceFolder,
-								monitor);
-					} else if (name.equals("bin")) { //$NON-NLS-1$
-						binary = true;
-						dstContainer = dst;
-					}
-				}
-				if (dstContainer == null) {
-					if (isOkToCreateFolder(new File(path.toFile(), name)) == false)
-						continue;
-					String folderName = getProcessedString(name, name);
-					dstContainer = dst.getFolder(new Path(folderName));
-				}
-				if (dstContainer instanceof IFolder && !dstContainer.exists())
-					((IFolder) dstContainer).create(true, true, monitor);
-				generateFiles(zipFile, path.append(name), dstContainer, false,
-						binary, monitor);
-			} else {
-				if (isOkToCreateFile(new File(path.toFile(), name))) {
-					if (firstLevel)
-						binary = false;
-					InputStream in = null;
-					try {
-						in = zipFile.getInputStream(zipEnry);
-						copyFile(name, in, dst, binary, monitor);
-					} catch (IOException ioe) {
-					} finally {
-						if (in != null)
-							try {
-								in.close();
-							} catch (IOException ioe2) {
-							}
-					}
-				}
-			}
-		}
-	}
-
-	private IFolder generateJavaSourceFolder(IFolder sourceFolder,
-			IProgressMonitor monitor) throws CoreException {
-		Object packageValue = getValue(KEY_PACKAGE_NAME);
-		String packageName = packageValue != null
-				? packageValue.toString()
-				: null;
-		if (packageName == null)
-			packageName = model.getPluginBase().getId();
-		IPath path = new Path(packageName.replace('.', File.separatorChar));
-		if (sourceFolder != null)
-			path = sourceFolder.getProjectRelativePath().append(path);
-
-		for (int i = 1; i <= path.segmentCount(); i++) {
-			IPath subpath = path.uptoSegment(i);
-			IFolder subfolder = project.getFolder(subpath);
-			if (subfolder.exists() == false)
-				subfolder.create(true, true, monitor);
-		}
-		return project.getFolder(path);
-	}
-
-	private void copyFile(String fileName, InputStream input, IContainer dst, boolean binary,
-			IProgressMonitor monitor) throws CoreException {
-		String targetFileName = getProcessedString(fileName, fileName);
-
-		monitor.subTask(targetFileName);
-		IFile dstFile = dst.getFile(new Path(targetFileName));
-
-		try {
-			InputStream stream = getProcessedStream(fileName, input, binary);
-			if (dstFile.exists()) {
-				dstFile.setContents(stream, true, true, monitor);
-			} else {
-				dstFile.create(stream, true, monitor);
-			}
-			stream.close();
-
-		} catch (IOException e) {
-		}
-	}
-
-	private String getProcessedString(String fileName, String source) {
-		if (source.indexOf('$') == -1)
-			return source;
-		int loc = -1;
-		StringBuffer buffer = new StringBuffer();
-		boolean replacementMode = false;
-		for (int i = 0; i < source.length(); i++) {
-			char c = source.charAt(i);
-			if (c == '$') {
-				if (replacementMode) {
-					String key = source.substring(loc, i);
-					String value = key.length() == 0 ? "$" //$NON-NLS-1$
-							: getReplacementString(fileName, key);
-					buffer.append(value);
-					replacementMode = false;
-				} else {
-					replacementMode = true;
-					loc = i + 1;
-					continue;
-				}
-			} else if (!replacementMode)
-				buffer.append(c);
-		}
-		return buffer.toString();
-	}
-
-	private InputStream getProcessedStream(String fileName, InputStream stream, boolean binary)
-			throws IOException, CoreException {
-		if (binary)
-			return stream;
-
-		InputStreamReader reader = new InputStreamReader(stream);
-		int bufsize = 1024;
-		char[] cbuffer = new char[bufsize];
-		int read = 0;
-		StringBuffer keyBuffer = new StringBuffer();
-		StringBuffer outBuffer = new StringBuffer();
-		StringBuffer preBuffer = new StringBuffer();
-		boolean newLine = true;
-		ControlStack preStack = new ControlStack();
-		preStack.setValueProvider(this);
-
-		boolean replacementMode = false;
-		boolean preprocessorMode = false;
-		boolean escape = false;
-		while (read != -1) {
-			read = reader.read(cbuffer);
-			for (int i = 0; i < read; i++) {
-				char c = cbuffer[i];
-
-				if (escape) {
-					StringBuffer buf = preprocessorMode ? preBuffer : outBuffer;
-					buf.append(c);
-					escape = false;
-					continue;
-				}
-
-				if (newLine && c == '%') {
-					// preprocessor line
-					preprocessorMode = true;
-					preBuffer.delete(0, preBuffer.length());
-					continue;
-				}
-				if (preprocessorMode) {
-					if (c == '\\') {
-						escape = true;
-						continue;
-					}
-					if (c == '\n') {
-						// handle line
-						preprocessorMode = false;
-						newLine = true;
-						String line = preBuffer.toString().trim();
-						preStack.processLine(line);
-						continue;
-					} 
-					preBuffer.append(c);
-					
-					continue;
-				}
-
-				if (preStack.getCurrentState() == false) {
-					continue;
-				}
-
-				if (c == '$') {
-					if (replacementMode) {
-						replacementMode = false;
-						String key = keyBuffer.toString();
-						String value = key.length() == 0 ? "$" //$NON-NLS-1$
-								: getReplacementString(fileName, key);
-						outBuffer.append(value);
-						keyBuffer.delete(0, keyBuffer.length());
-					} else {
-						replacementMode = true;
-					}
-				} else {
-					if (replacementMode)
-						keyBuffer.append(c);
-					else {
-						outBuffer.append(c);
-						if (c == '\n') {
-							newLine = true;
-						} else
-							newLine = false;
-					}
-				}
-			}
-		}
-		return new ByteArrayInputStream(outBuffer.toString().getBytes(project.getDefaultCharset()));
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/BaseOptionTemplateSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/BaseOptionTemplateSection.java
deleted file mode 100644
index a551510..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/BaseOptionTemplateSection.java
+++ /dev/null

@@ -1,290 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.templates;
-import java.util.Hashtable;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.*;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.ui.IFieldData;
-
-/**
- * This class adds a notion of options to the default template section
- * implementation. Options have values and visual presence that allows users to
- * change them. When a section is configured with a number of options, they
- * become available to the code generator and can take part in conditional code
- * emitting.
- * <p>
- * This class is typically used in conjunction with
- * <samp>OptionTemplateWizardPage </samp>. The later is capable of creating UI
- * based on the list of options it was given, thus simplifying new template
- * section creation.
- * 
- * @since 2.0
- */
-
-public abstract class BaseOptionTemplateSection extends AbstractTemplateSection {
-	private Hashtable options = new Hashtable();
-
-	/**
-	 * Adds a boolean option with a provided name, label and initial value.
-	 * 
-	 * @param name
-	 *            the unique name of the option (can be used as a variable in
-	 *            conditional code emitting and variable substitution)
-	 * @param label
-	 *            presentable name of the option
-	 * @param value
-	 *            initial value of the option
-	 * @param pageIndex
-	 *            a zero-based index of a page where this option should appear
-	 * @return the newly created option
-	 */
-	protected TemplateOption addOption(String name, String label,
-			boolean value, int pageIndex) {
-		BooleanOption option = new BooleanOption(this, name, label);
-		registerOption(option, value ? Boolean.TRUE : Boolean.FALSE, pageIndex);
-		return option;
-	}
-
-	/**
-	 * Adds a string option with a provided name, label and initial value.
-	 * 
-	 * @param name
-	 *            the unique name of the option (can be used as a variable in
-	 *            conditional code emitting and variable substitution)
-	 * @param label
-	 *            presentable name of the option
-	 * @param value
-	 *            initial value of the option
-	 * @param pageIndex
-	 *            a zero-based index of a page where this option should appear
-	 * @return the newly created option
-	 */
-	protected TemplateOption addOption(String name, String label, String value,
-			int pageIndex) {
-		StringOption option = new StringOption(this, name, label);
-		registerOption(option, value, pageIndex);
-		return option;
-	}
-	/**
-	 * Adds a choice option with a provided name, label, list of choices and the
-	 * initial value (choice).
-	 * 
-	 * @param name
-	 *            the unique name of the option (can be used as a variable in
-	 *            conditional code emitting and variable substitution)
-	 * @param label
-	 *            presentable name of the option
-	 * @param choices
-	 *            an array of choices that the user will have when setting the
-	 *            value of the option. Each array position should accept an
-	 *            array of String objects of size 2, the first being the unique
-	 *            name and the second the presentable label of the choice.
-	 * @param value
-	 *            initial value (choice) of the option
-	 * @param pageIndex
-	 *            a zero-based index of a page where this option should appear
-	 * @return the newly created option
-	 */
-	protected TemplateOption addOption(String name, String label,
-			String[][] choices, String value, int pageIndex) {
-		ChoiceOption option = new ChoiceOption(this, name, label, choices);
-		registerOption(option, value, pageIndex);
-		return option;
-	}
-	/**
-	 * Initializes the option with a given unique name with the provided value.
-	 * The value will be set only if the option has not yet been initialized.
-	 * 
-	 * @param name
-	 *            option unique name
-	 * @param value
-	 *            the initial value of the option
-	 */
-	protected void initializeOption(String name, Object value) {
-		TemplateOption option = getOption(name);
-		if (option != null) {
-			// Only initialize options that have no value set
-			if (option.getValue() == null)
-				option.setValue(value);
-		}
-	}
-	/**
-	 * Returns a string value of the option with a given name. The option with
-	 * that name must exist and must be registered as a string option to begin
-	 * with.
-	 * 
-	 * @param name
-	 *            the unique name of the option
-	 * @return the string value of the option with a given name or <samp>null
-	 *         </samp> if not found.
-	 */
-	public String getStringOption(String name) {
-		TemplateOption option = (TemplateOption) options.get(name);
-		if (option != null && option instanceof StringOption) {
-			return ((StringOption) option).getText();
-		}
-		return null;
-	}
-	/**
-	 * Returns a boolean value of the option with a given name. The option with
-	 * that name must exist and must be registered as a boolean option to begin
-	 * with.
-	 * 
-	 * @param key
-	 *            the unique name of the option
-	 * @return the boolean value of the option with a given name or <samp>null
-	 *         </samp> if not found.
-	 */
-	public boolean getBooleanOption(String key) {
-		TemplateOption option = (TemplateOption) options.get(key);
-		if (option != null && option instanceof BooleanOption) {
-			return ((BooleanOption) option).isSelected();
-		}
-		return false;
-	}
-	/**
-	 * Enables the option with a given name. The exact effect of the method
-	 * depends on the option type, but the end-result should always be the same -
-	 * users should not be able to modify values of disabled options. This
-	 * method has no effect if the option with a given name is not found.
-	 * 
-	 * @param name
-	 *            the unique name of the option
-	 * @param enabled
-	 *            the enable state that the option should have
-	 */
-	public void setOptionEnabled(String name, boolean enabled) {
-		TemplateOption option = (TemplateOption) options.get(name);
-		if (option != null)
-			option.setEnabled(enabled);
-	}
-	/**
-	 * Returns the value of the option with a given name. The actual type of the
-	 * returned object depends on the option type.
-	 * 
-	 * @param name
-	 *            the name of the option
-	 * @return the current value of the option with a specified name or
-	 *         <samp>null </samp> if not found or not applicable.
-	 */
-	public Object getValue(String name) {
-		TemplateOption option = (TemplateOption) options.get(name);
-		if (option != null)
-			return option.getValue();
-		return super.getValue(name);
-	}
-	/**
-	 * Returns true if this template depends on values set in the parent wizard.
-	 * Values in the parent wizard include plug-in id, plug-in name, plug-in
-	 * class name, plug-in provider etc. If the template does depend on these
-	 * values, <samp>initializeFields </samp> will be called when the page is
-	 * made visible in the forward direction (going from the first page to the
-	 * pages owned by this template). If the page is never shown (Finish is
-	 * pressed before the page is made visible at least once),
-	 * <samp>initializeFields </samp> will be called with the model object
-	 * instead during template execution. The same method will also be called
-	 * when the template is created within the context of the plug-in manifest
-	 * editor, because plug-in model already exists at that time.
-	 * 
-	 * @return <code>true</code> if this template depends on the data set in
-	 *         the parent wizard, <code>false</code> otherwise.
-	 */
-	public boolean isDependentOnParentWizard() {
-		return false;
-	}
-	/**
-	 * Initializes options in the wizard page using the data provided by the
-	 * method parameters. Some options may depend on the user selection in the
-	 * common wizard pages before template page has been shown (for example,
-	 * plug-in ID, plug-in name etc.). This method allows options to initialize
-	 * in respect to these values.
-	 * <p>
-	 * The method is called before the actual plug-in has been built.
-	 * </p>
-	 * 
-	 * @param data
-	 *            plug-in data as defined in the common plug-in project wizard
-	 *            pages
-	 */
-	protected void initializeFields(IFieldData data) {
-	}
-	/**
-	 * Initializes options in the wizard page using the data provided by the
-	 * method parameters. Some options may depend on the user selection in the
-	 * common wizard pages before template page has been shown (for example,
-	 * plug-in ID, plug-in name etc.). This method allows options to initialize
-	 * in respect to these values.
-	 * <p>
-	 * This method is called after the plug-in has already been created or as
-	 * part of new extension creation (inside the manifest editor). Either way,
-	 * the plug-in properties in the model have been fully set and the model can
-	 * be used to initialize options that cannot be initialized independently.
-	 * 
-	 * @param model
-	 *            the model of the plug-in manifest file.
-	 */
-	public void initializeFields(IPluginModelBase model) {
-	}
-	/**
-	 * Subclasses must implement this method in order to validate options whose
-	 * value have been changed by the user. The subclass can elect to validate
-	 * the option on its own, or to also check validity of other options in
-	 * relation to the new value of this one.
-	 * 
-	 * @param changed
-	 *            the option whose value has been changed by the user
-	 */
-	public abstract void validateOptions(TemplateOption changed);
-	/**
-	 * Expands variable substitution to include all string options defined in
-	 * this template.
-	 * 
-	 * @see AbstractTemplateSection#getReplacementString(String, String)
-	 */
-	public String getReplacementString(String fileName, String key) {
-		String value = getStringOption(key);
-		if (value != null)
-			return value;
-		return super.getReplacementString(fileName, key);
-	}
-	/**
-	 * Modifies the superclass implementation by adding the initialization step
-	 * before commencing execution. This is important because some options may
-	 * not be initialized and users may choose to press 'Finish' before the
-	 * wizard page where the options are were shown for the first time.
-	 */
-	public void execute(IProject project, IPluginModelBase model,
-			IProgressMonitor monitor) throws CoreException {
-		initializeFields(model);
-		super.execute(project, model, monitor);
-	}
-	/**
-	 * Registers the provided option and sets the initial value.
-	 * 
-	 * @param option
-	 *            the option to register
-	 * @param value
-	 *            the initial value
-	 * @param pageIndex
-	 *            the page index to which this option belongs
-	 */
-	protected void registerOption(TemplateOption option, Object value,
-			int pageIndex) {
-		option.setValue(value);
-		options.put(option.getName(), option);
-	}
-
-	private TemplateOption getOption(String key) {
-		return (TemplateOption) options.get(key);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/BooleanOption.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/BooleanOption.java
deleted file mode 100644
index 6a048af..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/BooleanOption.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.templates;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.*;
-
-/**
- * This implementation of the TemplateOption can be used to represent options
- * that are boolean choices. Option provides the appropriate visual presentation
- * that allows users to set the boolean value of the option.
- * 
- * @since 2.0
- */
-public class BooleanOption extends TemplateOption {
-	private Button button;
-	/**
-	 * The constructor of the option.
-	 * 
-	 * @param section
-	 *            the parent section
-	 * @param name
-	 *            the unique name
-	 * @param label
-	 *            the presentable label of the option
-	 */
-	public BooleanOption(BaseOptionTemplateSection section, String name,
-			String label) {
-		super(section, name, label);
-	}
-	/**
-	 * Returns the current state of the option.
-	 * 
-	 * @return true of the option is selected, false otherwise.
-	 */
-	public boolean isSelected() {
-		return getValue() != null && getValue().equals(Boolean.TRUE);
-	}
-	/**
-	 * Changes the current state of the option to the provided state.
-	 * 
-	 * @param selected
-	 *            the new state of the option
-	 */
-	public void setSelected(boolean selected) {
-		setValue(selected ? Boolean.TRUE : Boolean.FALSE);
-	}
-	/**
-	 * Implementation of the superclass method that updates the option's widget
-	 * with the new value.
-	 * 
-	 * @param value
-	 *            the new option value
-	 */
-	public void setValue(Object value) {
-		super.setValue(value);
-		if (button != null)
-			button.setSelection(isSelected());
-	}
-	/**
-	 * Creates the boolean option control. Option reserves the right to modify
-	 * the actual widget used as long as the user can modify its boolean state.
-	 * 
-	 * @param parent
-	 *            the parent composite of the option widget
-	 * @param span
-	 *            the number of columns that the widget should span
-	 */
-	public void createControl(Composite parent, int span) {
-		button = new Button(parent, SWT.CHECK);
-		button.setText(getLabel());
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = span;
-		button.setLayoutData(gd);
-		button.setSelection(isSelected());
-		button.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				BooleanOption.super.setValue(button.getSelection()
-						? Boolean.TRUE
-						: Boolean.FALSE);
-				getSection().validateOptions(BooleanOption.this);
-			}
-		});
-		button.setEnabled(isEnabled());
-	}
-	/**
-	 * Implementatin of the superclass method that updates the option widget
-	 * with the new enabled state.
-	 * 
-	 * @param enabled
-	 *            the new enabled state.
-	 */
-	public void setEnabled(boolean enabled) {
-		super.setEnabled(enabled);
-		if (button != null)
-			button.setEnabled(enabled);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/ChoiceOption.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/ChoiceOption.java
deleted file mode 100644
index 7fa7d79..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/ChoiceOption.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.templates;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-
-/**
- * Implementation of the TemplateOption that allows users to choose a value from
- * the fixed set of options.
- * 
- * @since 2.0
- */
-public class ChoiceOption extends TemplateOption {
-	private String[][] choices;
-	private Control labelControl;
-	private Button[] buttons;
-	private boolean blockListener;
-
-	/**
-	 * Constructor for ChoiceOption.
-	 * 
-	 * @param section
-	 *            the parent section.
-	 * @param name
-	 *            the unique name
-	 * @param label
-	 *            the presentable label
-	 * @param choices
-	 *            the list of choices from which the value can be chosen. Each
-	 *            array entry should be an array of size 2, where position 0
-	 *            will be interpeted as the choice unique name, and position 1
-	 *            as the choice presentable label.
-	 */
-	public ChoiceOption(BaseOptionTemplateSection section, String name,
-			String label, String[][] choices) {
-		super(section, name, label);
-		this.choices = choices;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.ui.templates.TemplateField#createControl(org.eclipse.swt.widgets.Composite, int)
-	 */
-	public void createControl(Composite parent, int span) {
-		Composite container = createComposite(parent, span);
-		fill(container, span);
-		GridLayout layout = new GridLayout();
-		layout.marginWidth = layout.marginHeight = 0;
-		container.setLayout(layout);
-		labelControl = createLabel(container, span);
-		labelControl.setEnabled(isEnabled());
-		fill(labelControl, span);
-
-		buttons = new Button[choices.length];
-
-		SelectionListener listener = new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				Button b = (Button) e.widget;
-				if (blockListener)
-					return;
-				if (b.getSelection()) {
-					ChoiceOption.super.setValue(b.getData().toString());
-					getSection().validateOptions(ChoiceOption.this);
-				}
-			}
-		};
-
-		for (int i = 0; i < choices.length; i++) {
-			String[] choice = choices[i];
-			Button button = createRadioButton(parent, span, choice);
-			buttons[i] = button;
-			button.addSelectionListener(listener);
-			button.setEnabled(isEnabled());
-		}
-		if (getChoice() != null)
-			selectChoice(getChoice());
-	}
-	/**
-	 * Returns the string value of the current choice.
-	 * 
-	 * @return the current choice or <samp>null </samp> if not initialized.
-	 */
-	public String getChoice() {
-		return getValue() != null ? getValue().toString() : null;
-	}
-
-	/**
-	 * Implements the superclass method by passing the new value to the option's
-	 * widget.
-	 * 
-	 * @param value
-	 *            the new value.
-	 */
-	public void setValue(Object value) {
-		super.setValue(value);
-		if (buttons != null && value != null) {
-			selectChoice(value.toString());
-		}
-	}
-	/**
-	 * Implements the superclass method by updating the enable state of the
-	 * option's widget.
-	 */
-	public void setEnabled(boolean enabled) {
-		super.setEnabled(enabled);
-		if (labelControl != null) {
-			labelControl.setEnabled(enabled);
-			for (int i = 0; i < buttons.length; i++) {
-				buttons[i].setEnabled(isEnabled());
-			}
-		}
-	}
-
-	private GridData fill(Control control, int span) {
-		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gd.horizontalSpan = span;
-		control.setLayoutData(gd);
-		return gd;
-	}
-
-	private Composite createComposite(Composite parent, int span) {
-		Composite composite = new Composite(parent, SWT.NULL);
-		fill(composite, span);
-		return composite;
-	}
-
-	private Button createRadioButton(Composite parent, int span, String[] choice) {
-		Button button = new Button(parent, SWT.RADIO);
-		button.setData(choice[0]);
-		button.setText(choice[1]);
-		GridData gd = fill(button, span);
-		gd.horizontalIndent = 10;
-		return button;
-	}
-
-	private void selectChoice(String choice) {
-		blockListener = true;
-		for (int i = 0; i < buttons.length; i++) {
-			Button button = buttons[i];
-			String bname = button.getData().toString();
-			if (bname.equals(choice)) {
-				button.setSelection(true);
-			} else {
-				button.setSelection(false);
-			}
-		}
-		blockListener = false;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/ITemplateSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/ITemplateSection.java
deleted file mode 100644
index a3937b8..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/ITemplateSection.java
+++ /dev/null

@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.templates;
-import java.net.URL;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.wizard.*;
-import org.eclipse.pde.core.plugin.*;
-
-/**
- * This interface represents a section of the template wizard that generates a
- * new extension or plug-in. Typically, it maps to one wizard page, but more
- * complex sections may span several pages. Also note that in the very simple
- * cases it may not contribute any wizard pages.
- * <p>
- * If a section generates extensions, it should be written in such a way to be
- * used both in the 'New Extension' wizard and as a part of a new plug-in
- * project wizard. When used as part of the new plug-in project wizard, it may
- * appear alongside other templates and therefore should not do anything that
- * prevents it.
- * 
- * @since 2.0
- */
-
-public interface ITemplateSection {
-	/**
-	 * Returns the URL of the zip file containing template files and directories
-	 * that will be created in the plug-in project. If URL protocol is 'file',
-	 * and the URL ends with a trailing file separator, an attempt will be made
-	 * to treat the URL as a root directory and iterate using standard Java I/O
-	 * classes. If template files are stored in a ZIP or JAR archive, the name
-	 * of the archive must be part of the URL.
-	 * 
-	 * @return a template location URL
-	 */
-	public URL getTemplateLocation();
-	/**
-	 * Returns a presentable label the section.
-	 * 
-	 * @return a template label
-	 */
-	public String getLabel();
-
-	/**
-	 * Returns a description of the section. The description should explain what
-	 * extension will be used, what classes will be generated and how to test
-	 * that the generated code works properly.
-	 * 
-	 * @return a template description
-	 */
-	public String getDescription();
-
-	/**
-	 * Returns a replacement string for the provided key. When a token is found
-	 * in the template file with a form '$key$', the actual key is passed to
-	 * this method to obtain the replacement. If replacement is provided, it is
-	 * substituted for the token (including the '$' characters). Otherwise, it
-	 * is transfered as-is.
-	 * 
-	 * @param fileName
-	 *            the name of the file in which the key was found. You can use
-	 *            it to return different values for different files.
-	 * @param key
-	 *            the replacement key found in the template file
-	 * @return replacement string for the provided key, or the key itself if not
-	 *         found.
-	 */
-	public String getReplacementString(String fileName, String key);
-	/**
-	 * Adds template-related pages to the wizard. A typical section
-	 * implementation contributes one page, but complex sections may span
-	 * several pages.
-	 * 
-	 * @param wizard
-	 *            the host wizard to add pages into
-	 */
-	public void addPages(Wizard wizard);
-
-	/**
-	 * Returns a wizard page at the provided index.
-	 * 
-	 * @return wizard page index.
-	 */
-	public WizardPage getPage(int pageIndex);
-
-	/**
-	 * Returns number of pages that are contributed by this template.
-	 */
-	public int getPageCount();
-
-	/**
-	 * Tests whether this template have had a chance to create its pages. This
-	 * method returns true after 'addPages' has been called.
-	 * 
-	 * @return <samp>true </samp> if wizard pages have been created by this
-	 *         template.
-	 */
-
-	public boolean getPagesAdded();
-
-	/**
-	 * Returns the number of work units that this template will consume during
-	 * the execution. This number is used to calculate the total number of work
-	 * units when initializing the progress indicator.
-	 * 
-	 * @return the number of work units
-	 */
-	public int getNumberOfWorkUnits();
-
-	/**
-	 * Provides the list of template dependencies. A template may generate a
-	 * number of Java classes that reference classes and interfaces from other
-	 * plug-ins. By providing this list, a template enables the template wizard
-	 * to create the correct Java build path so that these classes and
-	 * interfaces are correctly resolved.
-	 * 
-	 * @param schemaVersion
-	 *            version of the target manifest, or <samp>null </samp> if older
-	 *            manifest (prior to 3.0) will be created. Depending on the
-	 *            manifest version, the list of dependencies may vary.
-	 *            
-	 * @return an array of template dependencies
-	 */
-	public IPluginReference[] getDependencies(String schemaVersion);
-
-	/**
-	 * Returns identifier of the extension point used in this section.
-	 * 
-	 * @return extension point id if this section contributes into an extension
-	 *         point or <samp>null </samp> if not applicable.
-	 */
-	public String getUsedExtensionPoint();
-
-	/**
-	 * Executes the template. As part of the execution, template may generate
-	 * resources under the provided project, and/or modify the plug-in model.
-	 * 
-	 * @param project
-	 *            the workspace project that contains the plug-in
-	 * @param model
-	 *            structured representation of the plug-in manifest
-	 * @param monitor
-	 *            progress monitor to indicate execution progress
-	 */
-	public void execute(IProject project, IPluginModelBase model,
-			IProgressMonitor monitor) throws CoreException;
-
-	/**
-	 * Returns an array of tokens representing new files and folders created by
-	 * this template section. The information is collected for the benefit of
-	 * <code>build.properties</code> file so that the generated files and
-	 * folders are included in the binary build. The tokens will be added as-is
-	 * to the variable <code.bin.includes</code>. For this reason, wild cards
-	 * and other syntax rules applicable to this variable can be used in this
-	 * method. For example:
-	 * <p>
-	 * 
-	 * <pre>
-	 * return new String[]{&quot;/icons/*.gif&quot;};
-	 * </pre>
-	 * 
-	 * </p>
-	 * 
-	 * @return an array of strings that fully describe the files and folders
-	 *         created by this template section as required by <code>
-	 *         bin.includes</code> variable in <code>build.properties</code>
-	 *         file.
-	 */
-	public String[] getNewFiles();
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/IVariableProvider.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/IVariableProvider.java
deleted file mode 100644
index 074f8ae..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/IVariableProvider.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.templates;
-
-/**
- * The classes that implement this interface are responsible for providing value
- * of variables when asked. Variables are defined by templates and represent the
- * current value of the template options set by the users.
- * 
- * @since 2.0
- */
-public interface IVariableProvider {
-	/**
-	 * Returns the value of the variable with a given name.
-	 * 
-	 * @param variable
-	 *            the name of the variable
-	 * @return the value of the specified variable
-	 */
-	public Object getValue(String variable);
-
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/NewPluginTemplateWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/NewPluginTemplateWizard.java
deleted file mode 100644
index 2387d0e..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/NewPluginTemplateWizard.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.templates;
-/**
- * This wizard should be used as a base class for wizards that generate plug-in
- * content using a closed set of templates. These wizards are loaded during new
- * plug-in or fragment creation and are used to provide initial content (Java
- * classes, directories/files and extensions).
- * <p>
- * The list of templates is fixed. It must be known in advance so that the
- * required wizard pages can be created. Upon finish, the template sections are
- * executed in the order of creation.
- * 
- * @since 2.0
- */
-public abstract class NewPluginTemplateWizard
-		extends
-			AbstractNewPluginTemplateWizard {
-	private ITemplateSection[] sections;
-	/**
-	 * Creates a new template wizard.
-	 */
-	public NewPluginTemplateWizard() {
-		sections = createTemplateSections();
-	}
-	/**
-	 * Subclasses are required to implement this method by creating templates
-	 * that will appear in this wizard.
-	 * 
-	 * @return an array of template sections that will appear in this wizard.
-	 */
-	public abstract ITemplateSection[] createTemplateSections();
-	/**
-	 * Returns templates that appear in this section.
-	 * 
-	 * @return an array of templates
-	 */
-	public final ITemplateSection[] getTemplateSections() {
-		return sections;
-	}
-	/**
-	 * Implemented by asking templates in this wizard to contribute pages.
-	 *  
-	 */
-	protected final void addAdditionalPages() {
-		// add template pages
-		for (int i = 0; i < sections.length; i++) {
-			sections[i].addPages(this);
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/OptionTemplateSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/OptionTemplateSection.java
deleted file mode 100644
index 0b9a3dc..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/OptionTemplateSection.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.templates;
-import java.net.*;
-import java.util.ArrayList;
-
-import org.eclipse.jface.wizard.*;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-
-/**
- * This class adds some conventions to the class it is based on. For example, it
- * expects to find the template content in the following location:
- * 
- * <pre>
- * 
- *     [install location]/[templateDirectory]/[sectionId]
- *  
- * </pre>
- * 
- * where <code>templateDirectory</code> is expected to be 'templates_3.0' (to
- * distinguish from template designed for earlier Eclipse versions), and
- * <code>sectionId</code> is the unique identifier as reported by the template
- * section.
- * <p>
- * It also assumes that all wizard pages associated with this template will be
- * based on <code>OptionWizardTemplatePage</code>.
- * 
- * 
- * @since 2.0
- */
-
-public abstract class OptionTemplateSection extends BaseOptionTemplateSection {
-	private ArrayList pages = new ArrayList();
-
-	private static class TemplatePage {
-		WizardPage page;
-		ArrayList options;
-		public TemplatePage() {
-			options = new ArrayList();
-		}
-	}
-
-	/**
-	 * The default constructor.
-	 */
-	public OptionTemplateSection() {
-	}
-
-	/**
-	 * Returns the unique name of this section. This name will be used to
-	 * construct name and description lookup keys, as well as the template file
-	 * location in the contributing plug-in.
-	 * 
-	 * @return the unique section Id
-	 * @see #getLabel()
-	 * @see #getDescription()
-	 * @see #getTemplateLocation()
-	 */
-	public abstract String getSectionId();
-
-	/**
-	 * Returns the directory where all the templates are located in the
-	 * contributing plug-in.
-	 * 
-	 * @return "templates_[schemaVersion]" for code since Eclipse 3.0, or
-	 *         "templates" for pre-3.0 code.
-	 */
-	protected String getTemplateDirectory() {
-		String schemaVersion = model.getPluginBase().getSchemaVersion();
-		if (schemaVersion != null)
-			return "templates_" + schemaVersion; //$NON-NLS-1$
-		return "templates"; //$NON-NLS-1$
-	}
-	/**
-	 * Returns the install URL of the plug-in that contributes this template.
-	 * 
-	 * @return the install URL of the contributing plug-in
-	 */
-	protected abstract URL getInstallURL();
-
-	/**
-	 * Implements the abstract method by looking for templates using the
-	 * following path:
-	 * <p>
-	 * [install location]/[templateDirectory]/[sectionId]
-	 * 
-	 * @return the URL of the location where files to be emitted by this
-	 *         template are located.
-	 */
-	public URL getTemplateLocation() {
-		URL url = getInstallURL();
-		try {
-			String location = getTemplateDirectory() + "/" //$NON-NLS-1$
-					+ getSectionId() + "/"; //$NON-NLS-1$
-			return new URL(url, location);
-		} catch (MalformedURLException e) {
-			return null;
-		}
-	}
-	/**
-	 * Returns the wizard page at the specified index. Pages must be created
-	 * prior to calling this method.
-	 * 
-	 * @return the wizard page at the specified index or <samp>null </samp> if
-	 *         invalid index.
-	 * @see #createPage(int)
-	 */
-	public WizardPage getPage(int pageIndex) {
-		if (pageIndex < 0 || pageIndex >= pages.size())
-			return null;
-		TemplatePage tpage = (TemplatePage) pages.get(pageIndex);
-		return tpage.page;
-	}
-
-	/**
-	 * Creates the wizard page for the specified page index. This method cannot
-	 * be called before setPageCount(int). The page will be created with all the
-	 * options registered for that page index. Therefore, make all the calls to
-	 * addOption() before calling this method.
-	 * 
-	 * @param pageIndex
-	 *            a zero-based index of the page relative to this template. For
-	 *            example, if a template need to have two pages, you have to
-	 *            call this method twice (once with index 0 and again with index
-	 *            1).
-	 * @see #setPageCount(int)
-	 * @see BaseOptionTemplateSection#addOption
-	 */
-	public WizardPage createPage(int pageIndex) {
-		if (pageIndex < 0 || pageIndex >= pages.size())
-			return null;
-		TemplatePage tpage = (TemplatePage) pages.get(pageIndex);
-		tpage.page = new OptionTemplateWizardPage(this, tpage.options, null);
-		return tpage.page;
-	}
-	/**
-	 * Creates the wizard page for the specified page index. This method cannot
-	 * be called before setPageCount(int). The page will be created with all the
-	 * options registered for that page index. Therefore, make all the calls to
-	 * addOption() before calling this method.
-	 * 
-	 * @param pageIndex
-	 *            a zero-based index of the page relative to this template. For
-	 *            example, if a template need to have two pages, you have to
-	 *            call this method twice (once with index 0 and again with index
-	 *            1).
-	 * @param helpContextId
-	 *            the Id of the help context defined in the contributing plug-in
-	 *            that will be used to locate content of the info-pop displayed
-	 *            when F1 is pressed.
-	 * @see #setPageCount(int)
-	 * @see BaseOptionTemplateSection#addOption
-	 */
-	public WizardPage createPage(int pageIndex, String helpContextId) {
-		if (pageIndex < 0 || pageIndex >= pages.size())
-			return null;
-		TemplatePage tpage = (TemplatePage) pages.get(pageIndex);
-		tpage.page = new OptionTemplateWizardPage(this, tpage.options,
-				helpContextId);
-		return tpage.page;
-	}
-	/**
-	 * Returns a number of pages that this template contributes to the wizard.
-	 * 
-	 * @return the number of pages
-	 * @see #setPageCount(int)
-	 */
-	public int getPageCount() {
-		return pages.size();
-	}
-
-	/**
-	 * Sets the number of pages this template will manage. This method must be
-	 * called prior to adding pages and options in order to initialize the
-	 * template. Once the method has been called, you can call methods that
-	 * accept page index in the range [0..count-1].
-	 * 
-	 * @param count
-	 *            number of pages that this template will contribute to the
-	 *            template wizard
-	 */
-	public void setPageCount(int count) {
-		pages.clear();
-		for (int i = 0; i < count; i++) {
-			pages.add(new TemplatePage());
-		}
-	}
-
-	/**
-	 * Returns options that belong to the page with the given index.
-	 * 
-	 * @param pageIndex
-	 *            0-based index of the template page
-	 * @return @see #setPageCount(int)
-	 */
-
-	public TemplateOption[] getOptions(int pageIndex) {
-		if (pageIndex < 0 || pageIndex >= pages.size())
-			return new TemplateOption[0];
-		TemplatePage page = (TemplatePage) pages.get(pageIndex);
-		return (TemplateOption[]) page.options
-				.toArray(new TemplateOption[page.options.size()]);
-	}
-
-	/**
-	 * Returns options that are added to the provided wizard page.
-	 * 
-	 * @param page
-	 *            wizard page that hosts required options
-	 * @return array of options added to the provided wizard page
-	 */
-
-	public TemplateOption[] getOptions(WizardPage page) {
-		for (int i = 0; i < pages.size(); i++) {
-			TemplatePage tpage = (TemplatePage) pages.get(i);
-			if (tpage.page.equals(page))
-				return getOptions(i);
-		}
-		return new TemplateOption[0];
-	}
-
-	/**
-	 * Returns the zero-based index of a page that hosts the the given option.
-	 * 
-	 * @param option
-	 *            template option for which a page index is being requested
-	 * @return zero-based index of a page that hosts the option or -1 if none of
-	 *         the pages contain the option.
-	 */
-	public int getPageIndex(TemplateOption option) {
-		for (int i = 0; i < pages.size(); i++) {
-			TemplatePage tpage = (TemplatePage) pages.get(i);
-			if (tpage.options.contains(option))
-				return i;
-		}
-		return -1;
-	}
-
-	/**
-	 * Returns the label of this template to be used in the UI. The label is
-	 * obtained by creating a lookup key using the following rule:
-	 * "template.[section-id].name". This key is used to locate the label in the
-	 * plugin.properties file of the plug-in that contributed this template.
-	 * 
-	 * @return the translated label of this template
-	 */
-	public String getLabel() {
-		String key = "template." + getSectionId() + ".name"; //$NON-NLS-1$ //$NON-NLS-2$
-		return getPluginResourceString(key);
-	}
-	/**
-	 * Returns the description of this template to be used in the UI. The
-	 * description is obtained by creating a lookup key using the following
-	 * rule: "template.[section-id].desc". This key is used to locate the label
-	 * in the plugin.properties file of the plug-in that contributed this
-	 * template.
-	 * 
-	 * @return the translated description of this template
-	 */
-	public String getDescription() {
-		String key = "template." + getSectionId() + ".desc"; //$NON-NLS-1$ //$NON-NLS-2$
-		return getPluginResourceString(key);
-	}
-	/**
-	 * Locates the page that this option is presented in and flags that the
-	 * option is required and is currently not set. The flagging is done by
-	 * setting the page incomplete and setting the error message that uses
-	 * option's message label.
-	 * 
-	 * @param option
-	 *            the option that is required and currently not set
-	 */
-	protected void flagMissingRequiredOption(TemplateOption option) {
-		WizardPage page = null;
-		for (int i = 0; i < pages.size(); i++) {
-			TemplatePage tpage = (TemplatePage) pages.get(i);
-			ArrayList list = tpage.options;
-			if (list.contains(option)) {
-				page = tpage.page;
-				break;
-			}
-		}
-		if (page != null) {
-			page.setPageComplete(false);
-			String message = NLS.bind(PDEUIMessages.OptionTemplateSection_mustBeSet, option.getMessageLabel());
-			page.setErrorMessage(message);
-		}
-	}
-
-	/**
-	 * Resets the current page state by clearing the error message and making
-	 * the page complete, thereby allowing users to flip to the next page.
-	 */
-	protected void resetPageState() {
-		if (pages.size() == 0)
-			return;
-		WizardPage firstPage = ((TemplatePage) pages.get(0)).page;
-		IWizardContainer container = firstPage.getWizard().getContainer();
-		WizardPage currentPage = (WizardPage) container.getCurrentPage();
-		currentPage.setErrorMessage(null);
-		currentPage.setPageComplete(true);
-	}
-
-	protected void registerOption(TemplateOption option, Object value,
-			int pageIndex) {
-		super.registerOption(option, value, pageIndex);
-		if (pageIndex >= 0 && pageIndex < pages.size()) {
-			TemplatePage tpage = (TemplatePage) pages.get(pageIndex);
-			tpage.options.add(option);
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/OptionTemplateWizardPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/OptionTemplateWizardPage.java
deleted file mode 100644
index a38afcf..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/OptionTemplateWizardPage.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.templates;
-
-import java.util.ArrayList;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * An implementation of the standard wizard page that creates its contents from
- * the list of template options. The options will be created in the order they
- * are added to the list. When the page is made visible, options that require
- * late initialization will be given a chance to initialize.
- * 
- * @since 2.0
- */
-
-public class OptionTemplateWizardPage extends WizardPage {
-	private BaseOptionTemplateSection section;
-	private ArrayList options;
-	private String helpContextId;
-
-	/**
-	 * The constructor.
-	 * 
-	 * @param section
-	 *            the section that is contributing this page
-	 * @param options
-	 *            a list of options that should be shown in this page.
-	 * @param helpContextId
-	 * 			  the help context id
-	 */
-	public OptionTemplateWizardPage(BaseOptionTemplateSection section,
-			ArrayList options, String helpContextId) {
-		super(""); //$NON-NLS-1$
-		this.section = section;
-		this.options = options;
-		this.helpContextId = helpContextId;
-	}
-	/**
-	 * Creates the page control by creating individual options in the order
-	 * subject to their position in the list.'
-	 * 
-	 * @param composite
-	 */
-	public void createControl(Composite composite) {
-		Composite container = new Composite(composite, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.verticalSpacing = 9;
-		container.setLayout(layout);
-
-		for (int i = 0; i < options.size(); i++) {
-			TemplateOption option = (TemplateOption) options.get(i);
-			option.createControl(container, 2);
-		}
-		if (helpContextId != null)
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(container, helpContextId);
-		setControl(container);
-		Dialog.applyDialogFont(container);
-	}
-	/**
-	 * Initializes the options that require late initialization when the page is
-	 * made visible.
-	 * 
-	 * @param visible
-	 */
-	public void setVisible(boolean visible) {
-		if (visible && section.isDependentOnParentWizard()) {
-			IWizard wizard = getWizard();
-			if (wizard instanceof AbstractNewPluginTemplateWizard) {
-				AbstractNewPluginTemplateWizard templateWizard = (AbstractNewPluginTemplateWizard) wizard;
-				section.initializeFields(templateWizard.getData());
-			}
-		}
-		super.setVisible(visible);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/StringOption.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/StringOption.java
deleted file mode 100644
index feaf0a8..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/StringOption.java
+++ /dev/null

@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.templates;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.*;
-/**
- * This template option can be used to collect string option from the user in
- * the template section wizard page.
- * 
- * @since 2.0
- */
-public class StringOption extends TemplateOption {
-	private Text text;
-	private Label labelControl;
-	private boolean ignoreListener;
-	/**
-	 * The constructor.
-	 * 
-	 * @param section
-	 *            the parent section
-	 * @param name
-	 *            the unique option name
-	 * @param label
-	 *            the translatable label of the option
-	 */
-	public StringOption(BaseOptionTemplateSection section, String name,
-			String label) {
-		super(section, name, label);
-		setRequired(true);
-	}
-	/**
-	 * A utility version of the <samp>getValue() </samp> method that converts
-	 * the current value into the String object.
-	 * 
-	 * @return the string version of the current value.
-	 */
-	public String getText() {
-		if (getValue() != null)
-			return getValue().toString();
-		return null;
-	}
-	/**
-	 * A utility version of the <samp>setValue </samp> method that accepts
-	 * String objects.
-	 * 
-	 * @param newText
-	 *            the new text value of the option
-	 * @see #setValue(Object)
-	 */
-	public void setText(String newText) {
-		setValue(newText);
-	}
-	/**
-	 * Implements the superclass method by passing the string value of the new
-	 * value to the widget
-	 * 
-	 * @param value
-	 *            the new option value
-	 */
-	public void setValue(Object value) {
-		super.setValue(value);
-		if (text != null) {
-			ignoreListener = true;
-			String textValue = getText();
-			text.setText(textValue != null ? textValue : ""); //$NON-NLS-1$
-			ignoreListener = false;
-		}
-	}
-	/**
-	 * Creates the string option control.
-	 * 
-	 * @param parent
-	 *            parent composite of the string option widget
-	 * @param span
-	 *            the number of columns that the widget should span
-	 */
-	public void createControl(Composite parent, int span) {
-		labelControl = createLabel(parent, 1);
-		labelControl.setEnabled(isEnabled());
-		text = new Text(parent, SWT.SINGLE | SWT.BORDER);
-		if (getValue() != null)
-			text.setText(getValue().toString());
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = span - 1;
-		text.setLayoutData(gd);
-		text.setEnabled(isEnabled());
-		text.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				if (ignoreListener)
-					return;
-				StringOption.super.setValue(text.getText());
-				getSection().validateOptions(StringOption.this);
-			}
-		});
-	}
-	/**
-	 * A string option is empty if its text field contains no text.
-	 * 
-	 * @return true if there is no text in the text field.
-	 */
-	public boolean isEmpty() {
-		return getValue() == null || getValue().toString().length() == 0;
-	}
-	/**
-	 * Implements the superclass method by passing the enabled state to the
-	 * option's widget.
-	 * 
-	 * @param enabled
-	 */
-	public void setEnabled(boolean enabled) {
-		super.setEnabled(enabled);
-		if (labelControl != null) {
-			labelControl.setEnabled(enabled);
-			text.setEnabled(enabled);
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/TemplateField.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/TemplateField.java
deleted file mode 100644
index 930055a..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/TemplateField.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.templates;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.*;
-/**
- * The base class for all the template option fields. Template option is a
- * single editable option that is exposed to the users in the wizard pages
- * associated with templates. Although the field is associated with the template
- * section, there is no 1/1 mapping between the field and the substitution value
- * that can be used in the template files. In general, a subclass of this class
- * can generate any SWT control in the provided composite.
- * 
- * @since 2.0
- */
-public abstract class TemplateField {
-	private BaseOptionTemplateSection section;
-	private String label;
-	/**
-	 * The constructor for the field.
-	 * 
-	 * @param section
-	 *            the section that owns this field
-	 * @param label
-	 *            the label of this field
-	 */
-	public TemplateField(BaseOptionTemplateSection section, String label) {
-		this.section = section;
-		this.label = label;
-	}
-	/**
-	 * Returns the field label.
-	 * 
-	 * @return field label
-	 */
-	public String getLabel() {
-		return label;
-	}
-	/**
-	 * Changes the label of this field.
-	 * 
-	 * @param label
-	 *            the new label of this field.
-	 */
-	public void setLabel(String label) {
-		this.label = label;
-	}
-	/**
-	 * Returns the template section that owns this option field.
-	 * 
-	 * @return parent template section
-	 */
-	public BaseOptionTemplateSection getSection() {
-		return section;
-	}
-	/**
-	 * Factory method that creates the label in the provided parent.
-	 * 
-	 * @param parent
-	 *            the parent composite to create the label in
-	 * @param span
-	 *            number of columns that the label should span
-	 * @return the newly created Label widget.
-	 */
-	protected Label createLabel(Composite parent, int span) {
-		Label label = new Label(parent, SWT.NULL);
-		label.setText(getLabel());
-		return label;
-	}
-	/**
-	 * Subclasses must implement this method to create the control of the
-	 * template field.
-	 * 
-	 * @param parent
-	 *            the parent composite the control should be created in
-	 * @param span
-	 *            number of columns that the control should span
-	 */
-	public abstract void createControl(Composite parent, int span);
-}

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/TemplateOption.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/TemplateOption.java
deleted file mode 100644
index e2ab094..0000000
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/ui/templates/TemplateOption.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.templates;
-/**
- * The base class of all the template options. Options have unique name and a
- * value that can be changed. The value of the option is automatically available
- * to the template files - can be accessed by substitution (e.g. $value_name$)
- * or as part of conditional code generation (e.g. if value_name).
- * 
- * @since 2.0
- */
-public abstract class TemplateOption extends TemplateField {
-	private String name;
-	private Object value;
-	private boolean enabled = true;
-	private boolean required;
-	/**
-	 * Creates a new option for the provided template section.
-	 * 
-	 * @param section
-	 *            the parent template section
-	 * @param name
-	 *            the unique name of this option
-	 * @param label
-	 *            presentable label of this option
-	 */
-	public TemplateOption(BaseOptionTemplateSection section, String name,
-			String label) {
-		super(section, label);
-		this.name = name;
-	}
-	/**
-	 * Returns the unique name of this option
-	 * 
-	 * @return option name
-	 */
-	public String getName() {
-		return name;
-	}
-	/**
-	 * Changes the unique name of this option
-	 * 
-	 * @param name
-	 *            the new option name
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-	/**
-	 * Returns the value of this option.
-	 * 
-	 * @return the current value
-	 */
-	public Object getValue() {
-		return value;
-	}
-	/**
-	 * Returns whether this option is currently empty. The actual semantics of
-	 * the result depends on the implementing option.
-	 * 
-	 * @return <samp>true </samp> if option is empty, </samp> false otherwise.
-	 */
-	public boolean isEmpty() {
-		return false;
-	}
-	/**
-	 * Marks this option as required. Required options must be set by the user.
-	 * An option that is empty and is marked required will be flagged as an
-	 * error in the wizard.
-	 * 
-	 * @param required
-	 *            the new value of the property
-	 * @see #isEmpty
-	 */
-	public void setRequired(boolean required) {
-		this.required = required;
-	}
-	/**
-	 * Returns whether this option is required (cannot be empty)
-	 * 
-	 * @return <samp>true </samp> if this option is required, <samp>false
-	 *         </samp> otherwise.
-	 */
-	public boolean isRequired() {
-		return required;
-	}
-	/**
-	 * Sets the new value of this option.
-	 * 
-	 * @param value
-	 *            the new value
-	 */
-	public void setValue(Object value) {
-		this.value = value;
-	}
-	/**
-	 * Returns whether this option is enabled. The actual presentation of
-	 * enabled state depends on the implementing option.
-	 * 
-	 * @return <samp>true </samp> if option is enabled and can be modified.
-	 */
-	public boolean isEnabled() {
-		return enabled;
-	}
-	/**
-	 * Sets the enabled state of this option. The action presentation of the
-	 * enabled state depends on the implementing option.
-	 * 
-	 * @param enabled
-	 *            the new enabled state
-	 */
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-	/**
-	 * Returns the label of this option that can be presented in the messages to
-	 * the user. The default implementation trims the 'label' property from
-	 * mnemonics and from the trailing column.
-	 */
-	public String getMessageLabel() {
-		String label = getLabel();
-		StringBuffer buf = new StringBuffer();
-		for (int i = 0; i < label.length(); i++) {
-			char c = label.charAt(i);
-			if (c == '(' && i < label.length() - 1) {
-				char c2 = label.charAt(i + 1);
-				if (c2 == '&') {
-					// DBCS mnemonic sequence "(&<char>)"
-					// It is OK to truncate the label
-					// at this point
-					break;
-				}
-			}
-			if (c != '&' && c != ':')
-				buf.append(c);
-		}
-		return buf.toString();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/AbstractEditingModel.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/AbstractEditingModel.java
deleted file mode 100644
index 084e485..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/AbstractEditingModel.java
+++ /dev/null

@@ -1,269 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model;
-
-import java.io.*;
-import java.util.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.text.*;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.internal.core.*;
-
-public abstract class AbstractEditingModel extends PlatformObject implements IEditingModel, IModelChangeProviderExtension {
-	private ArrayList fListeners = new ArrayList();
-	protected boolean fReconciling;
-	protected boolean fInSync = true;
-	protected boolean fLoaded = false;
-	protected boolean fDisposed;
-	protected long fTimestamp;
-	private transient NLResourceHelper fNLResourceHelper;
-	private IDocument fDocument;
-	private boolean fDirty;
-	private String fCharset;
-	private IResource fUnderlyingResource;
-	private String fInstallLocation;
-	private boolean fStale;
-	
-	public AbstractEditingModel(IDocument document, boolean isReconciling) {
-		fDocument = document;
-		fReconciling = isReconciling;		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IModel#dispose()
-	 */
-	public void dispose() {
-		if (fNLResourceHelper != null) {
-			fNLResourceHelper.dispose();
-			fNLResourceHelper = null;
-		}
-		fDisposed = true;
-		fListeners.clear();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IModel#getResourceString(java.lang.String)
-	 */
-	public String getResourceString(String key) {
-		if (key == null || key.length() == 0)
-			return ""; //$NON-NLS-1$
-		
-		if (fNLResourceHelper == null) 
-			fNLResourceHelper = createNLResourceHelper();
-		
-		return (fNLResourceHelper == null) ? key : fNLResourceHelper.getResourceString(key);
-	}
-
-	protected abstract NLResourceHelper createNLResourceHelper();
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IModel#isDisposed()
-	 */
-	public boolean isDisposed() {
-		return fDisposed;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IModel#isEditable()
-	 */
-	public boolean isEditable() {
-		return fReconciling;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IModel#isLoaded()
-	 */
-	public boolean isLoaded() {
-		return fLoaded;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IModel#isInSync()
-	 */
-	public boolean isInSync() {
-		return fInSync;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IModel#isValid()
-	 */
-	public boolean isValid() {
-		return isLoaded();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IModel#getTimeStamp()
-	 */
-	public final long getTimeStamp() {
-		return fTimestamp;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IModel#load()
-	 */
-	public final void load() throws CoreException {
-		try {
-			load(getInputStream(getDocument()), false);
-		} catch (UnsupportedEncodingException e) {
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IModel#reload(java.io.InputStream, boolean)
-	 */
-	public final void reload(InputStream source, boolean outOfSync)
-			throws CoreException {
-		load(source, outOfSync);
-		fireModelChanged(
-				new ModelChangedEvent(this, 
-					IModelChangedEvent.WORLD_CHANGED,
-					new Object[] {this},
-					null));
-		
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IModel#isReconcilingModel()
-	 */
-	public boolean isReconcilingModel() {
-		return fReconciling;
-	}
-	
-	public IDocument getDocument() {
-		return fDocument;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.text.IReconcilingParticipant#reconciled(org.eclipse.jface.text.IDocument)
-	 */
-	public final void reconciled(IDocument document) {
-		if (isReconcilingModel()) {
-			try {
-				if (isStale()) {
-					adjustOffsets(document);
-					setStale(false);
-				} else {
-					reload(getInputStream(document), false);
-				}
-				if (isDirty())
-					setDirty(false);
-			} catch (Exception e) {
-			} 	
-		}
-	}
-	
-	protected abstract void adjustOffsets(IDocument document);
-	
-	protected InputStream getInputStream(IDocument document) throws UnsupportedEncodingException {
-		return new ByteArrayInputStream(document.get().getBytes(getCharset()));
-	}
-	
-	public String getCharset() {
-		return fCharset != null ? fCharset : "UTF-8"; //$NON-NLS-1$
-	}
-	
-	public void setCharset(String charset) {
-		fCharset = charset;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IModelChangeProvider#addModelChangedListener(org.eclipse.pde.core.IModelChangedListener)
-	 */
-	public void addModelChangedListener(IModelChangedListener listener) {
-		if (!fListeners.contains(listener))
-			fListeners.add(listener);
-	}
-	public void transferListenersTo(IModelChangeProviderExtension target, IModelChangedListenerFilter filter) {
-		List oldList = (List)fListeners.clone();
-		for (int i=0; i<oldList.size(); i++) {
-			IModelChangedListener listener = (IModelChangedListener)oldList.get(i);
-			if (filter==null || filter.accept(listener)) {
-				// add the listener to the target
-				target.addModelChangedListener(listener);
-				// remove the listener from our list
-				fListeners.remove(listener);
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IModelChangeProvider#fireModelChanged(org.eclipse.pde.core.IModelChangedEvent)
-	 */
-	public void fireModelChanged(IModelChangedEvent event) {
-		setDirty(event.getChangeType() != IModelChangedEvent.WORLD_CHANGED);
-		for (int i = 0; i < fListeners.size(); i++) {
-			((IModelChangedListener)fListeners.get(i)).modelChanged(event);
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IModelChangeProvider#fireModelObjectChanged(java.lang.Object, java.lang.String, java.lang.Object, java.lang.Object)
-	 */
-	public void fireModelObjectChanged(Object object, String property, Object oldValue, Object newValue) {
-		fireModelChanged(new ModelChangedEvent(this, object, property, oldValue, newValue));
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IModelChangeProvider#removeModelChangedListener(org.eclipse.pde.core.IModelChangedListener)
-	 */
-	public void removeModelChangedListener(IModelChangedListener listener) {
-		fListeners.remove(listener);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IEditable#isDirty()
-	 */
-	public boolean isDirty() {
-		return fDirty;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IEditable#save(java.io.PrintWriter)
-	 */
-	public void save(PrintWriter writer) {
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IEditable#setDirty(boolean)
-	 */
-	public void setDirty(boolean dirty) {
-		this.fDirty = dirty;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IEditingModel#isStale()
-	 */
-	public boolean isStale() {
-		return fStale;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IEditingModel#setStale(boolean)
-	 */
-	public void setStale(boolean stale) {
-		fStale = stale;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IModel#getUnderlyingResource()
-	 */
-	public IResource getUnderlyingResource() {
-		return fUnderlyingResource;
-	}
-	
-	public void setUnderlyingResource(IResource resource) {
-		fUnderlyingResource = resource;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.ISharedPluginModel#getInstallLocation()
-	 */
-	public String getInstallLocation() {
-		if (fInstallLocation == null && fUnderlyingResource != null) {
-			IPath path = fUnderlyingResource.getProject().getLocation();
-			return path != null ? path.addTrailingSeparator().toString() : null;
-		}
-		return fInstallLocation;
-	}
-	
-	public void setInstallLocation(String location) {
-		fInstallLocation = location;
-	}
-
-
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/DocumentHandler.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/DocumentHandler.java
deleted file mode 100644
index 1058a95..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/DocumentHandler.java
+++ /dev/null

@@ -1,238 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model;
-
-import java.util.ArrayList;
-import java.util.Stack;
-
-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.Position;
-import org.eclipse.jface.text.Region;
-import org.eclipse.pde.internal.core.util.CoreUtility;
-import org.xml.sax.Attributes;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.helpers.DefaultHandler;
-
-public abstract class DocumentHandler extends DefaultHandler {
-
-	protected FindReplaceDocumentAdapter fFindReplaceAdapter;
-	protected Stack fDocumentNodeStack = new Stack();
-	protected int fHighestOffset = 0;
-	private Locator fLocator;
-	
-	public DocumentHandler() {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.xml.sax.helpers.DefaultHandler#startDocument()
-	 */
-	public void startDocument() throws SAXException {
-		fDocumentNodeStack.clear();
-		fHighestOffset = 0;
-		fFindReplaceAdapter = new FindReplaceDocumentAdapter(getDocument());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.xml.sax.helpers.DefaultHandler#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes)
-	 */
-	public void startElement(String uri, String localName, String qName,
-			Attributes attributes) throws SAXException {
-		IDocumentNode parent = fDocumentNodeStack.isEmpty() ? null : (IDocumentNode)fDocumentNodeStack.peek();		
-		IDocumentNode node = getDocumentNode(qName, parent);
-		node.setXMLTagName(qName);
-		try {
-			int nodeOffset = getStartOffset(qName);
-			node.setOffset(nodeOffset);
-			IDocument doc = getDocument();
-			int line = doc.getLineOfOffset(nodeOffset);
-			node.setLineIndent(node.getOffset() - doc.getLineOffset(line));
-			// create attributes
-			for (int i = 0; i < attributes.getLength(); i++) {
-				String attName = attributes.getQName(i);
-				String attValue = attributes.getValue(i);
-				IDocumentAttribute attribute = getDocumentAttribute(attName, attValue, node);
-				if (attribute != null) {
-					IRegion region = getAttributeRegion(attName, attValue, nodeOffset);
-					if (region == null) {
-						attValue = CoreUtility.getWritableString(attValue);
-						region = getAttributeRegion(attName, attValue, nodeOffset);
-					}
-					if (region != null) {
-						attribute.setNameOffset(region.getOffset());
-						attribute.setNameLength(attName.length());
-						attribute.setValueOffset(region.getOffset() + region.getLength() - 1 - attValue.length());
-						attribute.setValueLength(attValue.length());
-					}
-					node.setXMLAttribute(attribute);
-				}
-			}
-		} catch (BadLocationException e) {
-		}
-		appendChildToParent(parent, node);
-		fDocumentNodeStack.push(node);
-	}
-	
-	protected void appendChildToParent(IDocumentNode parent, IDocumentNode child) {
-		if (parent != null && child != null) {
-			parent.addChildNode(child);
-		}
-	}
-	
-	protected abstract IDocumentNode getDocumentNode(String name, IDocumentNode parent);
-	
-	protected abstract IDocumentAttribute getDocumentAttribute(String name, String value, IDocumentNode parent);
-	
-	private int getStartOffset(String elementName) throws BadLocationException {
-		int line = fLocator.getLineNumber();
-		int col = fLocator.getColumnNumber();
-		IDocument doc = getDocument();
-		if (col < 0)
-			col = doc.getLineLength(line);
-		String text = doc.get(fHighestOffset + 1, doc.getLineOffset(line) - fHighestOffset - 1);
-
-		ArrayList commentPositions = new ArrayList();
-		for (int idx = 0; idx < text.length();) {
-			idx = text.indexOf("<!--", idx); //$NON-NLS-1$
-			if (idx == -1)
-				break;
-			int end = text.indexOf("-->", idx); //$NON-NLS-1$
-			if (end == -1) 
-				break;
-			
-			commentPositions.add(new Position(idx, end - idx));
-			idx = end + 1;
-		}
-
-		int idx = 0;
-		for (; idx < text.length(); idx += 1) {
-			idx = text.indexOf("<" + elementName, idx); //$NON-NLS-1$
-			if (idx == -1)
-				break;
-			boolean valid = true;
-			for (int i = 0; i < commentPositions.size(); i++) {
-				Position pos = (Position)commentPositions.get(i);
-				if (pos.includes(idx)) {
-					valid = false;
-					break;
-				}
-			}
-			if (valid)
-				break;
-		}
-		if (idx > -1)
-			fHighestOffset += idx + 1;
-		return fHighestOffset;
-	}
-	
-	private int getElementLength(IDocumentNode node, int line, int column) throws BadLocationException {
-		int endIndex = node.getOffset();
-		IDocument doc = getDocument();
-		int start = Math.max(doc.getLineOffset(line), node.getOffset());
-		column = doc.getLineLength(line);
-		String lineText= doc.get(start, column - start + doc.getLineOffset(line));
-		
-		int index = lineText.indexOf("</" + node.getXMLTagName() + ">"); //$NON-NLS-1$ //$NON-NLS-2$
-		if (index == -1) {
-			index= lineText.indexOf("/>"); //$NON-NLS-1$
-			if (index == -1 ) {
-				endIndex = column;
-			} else {
-				endIndex = index + 2;
-			}
-		} else{
-			endIndex = index + node.getXMLTagName().length() + 3;
-		}
-		return start + endIndex - node.getOffset();
-	}
-	
-	private IRegion getAttributeRegion(String name, String value, int offset) throws BadLocationException{
-		IRegion nameRegion = fFindReplaceAdapter.find(offset, name+"\\s*=\\s*\"", true, true, false, true); //$NON-NLS-1$
-		if (nameRegion != null) {
-			if (getDocument().get(nameRegion.getOffset() + nameRegion.getLength(), value.length()).equals(value))
-				return new Region(nameRegion.getOffset(), nameRegion.getLength() + value.length() + 1);
-		}
-		return null;
-	}
-
-	
-	/* (non-Javadoc)
-	 * @see org.xml.sax.helpers.DefaultHandler#endElement(java.lang.String, java.lang.String, java.lang.String)
-	 */
-	public void endElement(String uri, String localName, String qName)
-			throws SAXException {
-		IDocumentNode node = (IDocumentNode)fDocumentNodeStack.pop();
-		try {
-			node.setLength(getElementLength(node, fLocator.getLineNumber() - 1, fLocator.getColumnNumber()));
-			setTextNodeOffset(node);
-		} catch (BadLocationException e) {
-		}
-	}
-	
-	protected void setTextNodeOffset(IDocumentNode node) throws BadLocationException {
-		IDocumentTextNode textNode = node.getTextNode();
-		if (textNode != null && textNode.getText() != null) {
-			if (textNode.getText().trim().length() == 0) {
-				node.removeTextNode();
-				return;
-			}
-			IDocument doc = getDocument();
-			String text = doc.get(node.getOffset(), node.getLength());
-			textNode.setOffset(node.getOffset() + text.indexOf(textNode.getText()));
-			text = doc.get(textNode.getOffset(), node.getLength() - textNode.getOffset() + node.getOffset());
-			int index = text.indexOf('<');
-		    for (index -= 1; index >= 0; index--) {
-		    	if (!Character.isWhitespace(text.charAt(index))) {
-		    		index += 1;
-		    		break;
-		    	}
-		    }
-		    textNode.setLength(index);
-		    textNode.setText(doc.get(textNode.getOffset(), index));
-		}	
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.xml.sax.helpers.DefaultHandler#fatalError(org.xml.sax.SAXParseException)
-	 */
-	public void fatalError(SAXParseException e) throws SAXException {
-		generateErrorElementHierarchy();
-	}
-	
-	/**
-	 * 
-	 */
-	private void generateErrorElementHierarchy() {
-		while (!fDocumentNodeStack.isEmpty()) {
-			((IDocumentNode)fDocumentNodeStack.pop()).setIsErrorNode(true);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.xml.sax.helpers.DefaultHandler#error(org.xml.sax.SAXParseException)
-	 */
-	public void error(SAXParseException e) throws SAXException {
-		generateErrorElementHierarchy();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.xml.sax.helpers.DefaultHandler#setDocumentLocator(org.xml.sax.Locator)
-	 */
-	public void setDocumentLocator(Locator locator) {
-		fLocator = locator;
-	}
-	
-	protected abstract IDocument getDocument();
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/DocumentTextNode.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/DocumentTextNode.java
deleted file mode 100644
index cf73237..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/DocumentTextNode.java
+++ /dev/null

@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model;
-
-public class DocumentTextNode implements IDocumentTextNode {
-	private int fOffset = -1;
-	private int fLength = 0;
-	private IDocumentNode fEnclosingElement;
-	private String fText;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentTextNode#setEnclosingElement(org.eclipse.pde.internal.ui.model.IDocumentNode)
-	 */
-	public void setEnclosingElement(IDocumentNode node) {
-		fEnclosingElement = node;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentTextNode#getEnclosingElement()
-	 */
-	public IDocumentNode getEnclosingElement() {
-		return fEnclosingElement;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentTextNode#setText(java.lang.String)
-	 */
-	public void setText(String text) {
-		fText = text;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentTextNode#getText()
-	 */
-	public String getText() {
-		return fText == null ? "" : fText; //$NON-NLS-1$
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentTextNode#setOffset(int)
-	 */
-	public void setOffset(int offset) {
-		fOffset = offset;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentTextNode#getOffset()
-	 */
-	public int getOffset() {
-		return fOffset;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentTextNode#getLength()
-	 */
-	public int getLength() {
-		return fLength;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentTextNode#setLength(int)
-	 */
-	public void setLength(int length) {
-		fLength = length;
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/IDocumentAttribute.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/IDocumentAttribute.java
deleted file mode 100644
index 4bb281e..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/IDocumentAttribute.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model;
-
-import java.io.*;
-
-public interface IDocumentAttribute extends Serializable {
-	
-	void setEnclosingElement(IDocumentNode node);	
-	IDocumentNode getEnclosingElement();
-	
-	void setNameOffset(int offset);
-	int getNameOffset();
-	
-	void setNameLength(int length);
-	int getNameLength();
-	
-	void setValueOffset(int offset);
-	int getValueOffset();
-	
-	void setValueLength(int length);
-	int getValueLength();
-	
-	String getAttributeName();
-	String getAttributeValue();
-	
-	String write();
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/IDocumentKey.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/IDocumentKey.java
deleted file mode 100644
index 4ac866a..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/IDocumentKey.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model;
-
-import org.eclipse.pde.core.*;
-
-public interface IDocumentKey extends IWritable, IDocumentRange {
-	void setName(String name);
-	String getName();
-	
-	void setOffset(int offset);	
-	void setLength(int length);
-	
-	String write();
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/IDocumentNode.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/IDocumentNode.java
deleted file mode 100644
index e950506..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/IDocumentNode.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model;
-
-import java.io.*;
-
-public interface IDocumentNode extends Serializable, IDocumentRange {
-		
-	IDocumentNode getParentNode();	
-	void setParentNode(IDocumentNode node);
-	
-	void addChildNode(IDocumentNode child);
-	void addChildNode(IDocumentNode child, int position);
-	IDocumentNode removeChildNode(IDocumentNode child);	
-	IDocumentNode[] getChildNodes();
-	
-	void addTextNode(IDocumentTextNode textNode);
-	IDocumentTextNode getTextNode();
-	void removeTextNode();
-	
-	int indexOf(IDocumentNode child);
-	IDocumentNode getChildAt(int index);
-	
-	IDocumentNode getPreviousSibling();
-	void setPreviousSibling(IDocumentNode sibling);
-	
-	void swap(IDocumentNode child1, IDocumentNode child2);
-	
-	void setXMLTagName(String tag);	
-	String getXMLTagName();
-	
-	void setXMLAttribute(IDocumentAttribute attribute);	
-	void setXMLAttribute(String name, String value);	
-	String getXMLAttributeValue(String name);
-	
-	IDocumentAttribute getDocumentAttribute(String name);
-	IDocumentAttribute[] getNodeAttributes();
-	void removeDocumentAttribute(IDocumentAttribute attr);
-	
-	boolean isErrorNode();	
-	void setIsErrorNode(boolean isErrorNode);
-	
-	void setOffset(int offset);
-	void setLength(int length);
-		
-	void setLineIndent(int indent);
-	int getLineIndent();
-	
-	String write(boolean indent);
-	String writeShallow(boolean terminate);
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/IDocumentRange.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/IDocumentRange.java
deleted file mode 100644
index 255e9b7..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/IDocumentRange.java
+++ /dev/null

@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model;
-
-public interface IDocumentRange {
-	int getOffset();
-	int getLength();
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/IDocumentTextNode.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/IDocumentTextNode.java
deleted file mode 100644
index 5dd3963..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/IDocumentTextNode.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model;
-
-public interface IDocumentTextNode {
-	
-	void setEnclosingElement(IDocumentNode node);	
-	IDocumentNode getEnclosingElement();
-
-	void setText(String text);
-	String getText();
-	
-	void setOffset(int offset);
-	int getOffset();
-	
-	void setLength(int length);
-	int getLength();
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/IEditingModel.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/IEditingModel.java
deleted file mode 100644
index d916ee5..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/IEditingModel.java
+++ /dev/null

@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model;
-
-import org.eclipse.jface.text.*;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.internal.ui.editor.text.*;
-
-public interface IEditingModel extends IModel, IModelChangeProvider, IReconcilingParticipant, IEditable {
-
-public IDocument getDocument();
-public void setStale(boolean stale);
-public boolean isStale();
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/XMLEditingModel.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/XMLEditingModel.java
deleted file mode 100644
index 5ae6ca4..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/XMLEditingModel.java
+++ /dev/null

@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model;
-
-import java.io.*;
-
-import javax.xml.parsers.*;
-
-import org.eclipse.jface.text.*;
-import org.eclipse.pde.core.*;
-import org.xml.sax.*;
-import org.xml.sax.helpers.*;
-
-public abstract class XMLEditingModel extends AbstractEditingModel {
-	
-	private SAXParser fParser;
-
-	public XMLEditingModel(IDocument document, boolean isReconciling) {
-		super(document, isReconciling);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IModel#load(java.io.InputStream, boolean)
-	 */
-	public void load(InputStream source, boolean outOfSync) {
-		try {
-			fLoaded = true;
-			getParser().parse(source, createDocumentHandler(this));
-		} catch (SAXException e) {
-			fLoaded = false;
-		} catch (IOException e) {
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.AbstractEditingModel#adjustOffsets(org.eclipse.jface.text.IDocument)
-	 */
-	protected void adjustOffsets(IDocument document) {
-		try {
-			getParser().parse(getInputStream(document), createNodeOffsetHandler(this));
-		} catch (SAXException e) {
-		} catch (IOException e) {
-		}
-	}
-	
-	protected abstract DefaultHandler createNodeOffsetHandler(IModel model);
-		
-	protected abstract DefaultHandler createDocumentHandler(IModel model);
-	
-	private SAXParser getParser() {
-		try {
-			if (fParser == null) {
-				fParser = SAXParserFactory.newInstance().newSAXParser();
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return fParser;
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/build/Build.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/build/Build.java
deleted file mode 100644
index b48acf5..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/build/Build.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model.build;
-
-import java.io.*;
-import java.util.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.text.*;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.core.build.*;
-import org.eclipse.pde.internal.core.util.PropertiesUtil;
-import org.eclipse.pde.internal.ui.model.*;
-
-public class Build implements IBuild {
-	
-	private BuildModel fModel;
-	private HashMap fEntries = new HashMap();
-
-	public Build(BuildModel model) {
-		fModel = model;	
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.build.IBuild#add(org.eclipse.pde.core.build.IBuildEntry)
-	 */
-	public void add(IBuildEntry entry) throws CoreException {
-		fEntries.put(entry.getName(), entry);
-		fModel.fireModelChanged(new ModelChangedEvent(fModel,
-				IModelChangedEvent.INSERT, new Object[]{entry}, null));
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.build.IBuild#getBuildEntries()
-	 */
-	public IBuildEntry[] getBuildEntries() {
-		return (IBuildEntry[])fEntries.values().toArray(new IBuildEntry[fEntries.size()]);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.build.IBuild#getEntry(java.lang.String)
-	 */
-	public IBuildEntry getEntry(String name) {
-		return (IBuildEntry)fEntries.get(name);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.build.IBuild#remove(org.eclipse.pde.core.build.IBuildEntry)
-	 */
-	public void remove(IBuildEntry entry) throws CoreException {
-		fEntries.remove(entry.getName());
-		fModel.fireModelChanged(new ModelChangedEvent(fModel,
-				IModelChangedEvent.REMOVE, new Object[]{entry}, null));
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.core.IWritable#write(java.lang.String,
-	 *      java.io.PrintWriter)
-	 */
-	public void write(String indent, PrintWriter writer) {
-	}
-	
-	public void load(InputStream source) throws IOException {
-		fEntries.clear();
-		Properties properties = new Properties();
-		properties.load(source);
-		Enumeration keys = properties.keys();
-		while (keys.hasMoreElements()) {
-			String name = keys.nextElement().toString();
-			BuildEntry entry = (BuildEntry)fModel.getFactory().createEntry(name);
-			entry.processEntry(properties.get(name).toString());
-			fEntries.put(name, entry);
-		}
-		adjustOffsets(fModel.getDocument());
-	}
-	
-	public void adjustOffsets(IDocument document) {	
-		int lines = document.getNumberOfLines();
-		try {
-			IDocumentKey currentKey = null;
-			for (int i = 0; i < lines; i++) {
-				int offset = document.getLineOffset(i);
-				int length = document.getLineLength(i);
-				String line = document.get(offset, length);
-				if (line.startsWith("#") | line.startsWith("!")) { //$NON-NLS-1$ //$NON-NLS-2$
-					if (currentKey != null) {
-						currentKey.setLength(offset - 1 - currentKey.getOffset());
-						currentKey = null;
-					}
-					continue;
-				}
-				
-				line = line.trim();
-				if (line.length() == 0)
-					continue;
-				
-				if (currentKey != null) {
-					if (!line.endsWith("\\")) { //$NON-NLS-1$
-						currentKey.setLength(offset + document.getLineLength(i) - currentKey.getOffset());
-						currentKey = null;
-					}
-				} else {
-					int index = line.indexOf('=');
-					if (index == -1) 
-						index = line.indexOf(':');
-					if (index == -1)
-						index = line.indexOf(' ');
-					if (index == -1)
-						index = line.indexOf('\t');
-					String name = (index != -1) ? line.substring(0, index).trim() : line;
-					String propertyKey;
-					try{
-						propertyKey=PropertiesUtil.windEscapeChars(name);
-					}catch(IllegalArgumentException iae){
-						propertyKey = name;
-					}
-					currentKey = (IDocumentKey)getEntry(propertyKey);
-					if (currentKey != null) {
-						while (Character.isSpaceChar(document.getChar(offset))) {
-							offset += 1;
-						}
-						currentKey.setOffset(offset);
-						if (!line.endsWith("\\")) { //$NON-NLS-1$
-							currentKey.setLength(document.getLineOffset(i) + document.getLineLength(i) - currentKey.getOffset());
-							currentKey = null;
-						}
-					}
-				}
-			}
-		} catch (BadLocationException e) {
-		}
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/build/BuildEntry.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/build/BuildEntry.java
deleted file mode 100644
index b405cc9..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/build/BuildEntry.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model.build;
-
-import java.io.*;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.pde.core.build.*;
-import org.eclipse.pde.internal.core.util.*;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.model.*;
-
-public class BuildEntry implements IBuildEntry, IDocumentKey {
-
-	private int fLength = -1;
-	private int fOffset = -1;
-	private IBuildModel fModel;
-	private String fName;
-	private ArrayList fTokens = new ArrayList();
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.build.IBuildEntry#addToken(java.lang.String)
-	 */
-	public void addToken(String token) throws CoreException {
-		fTokens.add(token);
-		getModel().fireModelObjectChanged(this, getName(), null, token);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentKey#getName()
-	 */
-	public String getName() {
-		return fName;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.build.IBuildEntry#getTokens()
-	 */
-	public String[] getTokens() {
-		return (String[])fTokens.toArray(new String[fTokens.size()]);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.build.IBuildEntry#contains(java.lang.String)
-	 */
-	public boolean contains(String token) {
-		return fTokens.contains(token);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.build.IBuildEntry#removeToken(java.lang.String)
-	 */
-	public void removeToken(String token) throws CoreException {
-		fTokens.remove(token);
-		getModel().fireModelObjectChanged(this, getName(), token, null);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.build.IBuildEntry#renameToken(java.lang.String, java.lang.String)
-	 */
-	public void renameToken(String oldToken, String newToken)
-			throws CoreException {
-		int index = fTokens.indexOf(oldToken);
-		if (index != -1) {
-			fTokens.set(index, newToken);
-			getModel().fireModelObjectChanged(this, getName(), oldToken, newToken);
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentKey#setName(java.lang.String)
-	 */
-	public void setName(String name) {
-		String oldName = fName;
-		if (getModel() != null){
-			try {
-				IBuild build = getModel().getBuild();
-				build.remove(this);
-				fName = name;
-				build.add(this);
-			} catch (CoreException e) {
-				PDEPlugin.logException(e);
-			}
-			getModel().fireModelObjectChanged(this, getName(), oldName, name);
-		} else
-			fName = name;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentKey#getOffset()
-	 */
-	public int getOffset() {
-		return fOffset;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentKey#setOffset(int)
-	 */
-	public void setOffset(int offset) {
-		fOffset = offset;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentKey#getLength()
-	 */
-	public int getLength() {
-		return fLength;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentKey#setLength(int)
-	 */
-	public void setLength(int length) {
-		fLength = length;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IWritable#write(java.lang.String, java.io.PrintWriter)
-	 */
-	public void write(String indent, PrintWriter writer) {
-	}
-	
-	public void setModel(IBuildModel model) {
-		fModel = model;
-	}
-	
-	public IBuildModel getModel() {
-		return fModel;
-	}
-	
-	public void processEntry(String value) {
-		StringTokenizer stok = new StringTokenizer(value, ","); //$NON-NLS-1$
-		while (stok.hasMoreTokens()) {
-			fTokens.add(stok.nextToken().trim());
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentKey#write()
-	 */
-	public String write() {
-		return PropertiesUtil.writeKeyValuePair(getName(), getTokens());
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/build/BuildModel.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/build/BuildModel.java
deleted file mode 100644
index 1468f35..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/build/BuildModel.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model.build;
-
-import java.io.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.text.*;
-import org.eclipse.pde.core.build.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.ui.model.*;
-
-
-public class BuildModel extends AbstractEditingModel implements IBuildModel {
-	
-	//private Properties fProperties;
-	private BuildModelFactory fFactory;
-	private Build fBuild;
-
-	/**
-	 * @param document
-	 * @param isReconciling
-	 */
-	public BuildModel(IDocument document, boolean isReconciling) {
-		super(document, isReconciling);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.AbstractEditingModel#createNLResourceHelper()
-	 */
-	protected NLResourceHelper createNLResourceHelper() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IModel#load(java.io.InputStream, boolean)
-	 */
-	public void load(InputStream source, boolean outOfSync) throws CoreException {
-		try {
-			fLoaded = true;
-			((Build)getBuild()).load(source);
-		} catch (IOException e) {
-			fLoaded = false;
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.AbstractEditingModel#adjustOffsets(org.eclipse.jface.text.IDocument)
-	 */
-	protected void adjustOffsets(IDocument document) {
-		((Build)getBuild()).adjustOffsets(document);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.build.IBuildModel#getBuild()
-	 */
-	public IBuild getBuild() {
-		if (fBuild == null)
-			fBuild = new Build(this);
-		return fBuild;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.build.IBuildModel#getFactory()
-	 */
-	public IBuildModelFactory getFactory() {
-		if (fFactory == null)
-			fFactory = new BuildModelFactory(this);
-		return fFactory;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/build/BuildModelFactory.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/build/BuildModelFactory.java
deleted file mode 100644
index 9f5524a..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/build/BuildModelFactory.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model.build;
-
-import org.eclipse.pde.core.build.*;
-
-public class BuildModelFactory implements IBuildModelFactory {
-	
-	private IBuildModel fModel;
-	
-	public BuildModelFactory(IBuildModel model) {
-		fModel = model;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.build.IBuildModelFactory#createEntry(java.lang.String)
-	 */
-	public IBuildEntry createEntry(String name) {
-		BuildEntry entry = new BuildEntry();
-		entry.setName(name);
-		entry.setModel(fModel);
-		return entry;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/BasePackageHeader.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/BasePackageHeader.java
deleted file mode 100644
index e35bf0e..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/BasePackageHeader.java
+++ /dev/null

@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model.bundle;
-
-import java.util.Iterator;
-import java.util.TreeMap;
-
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.internal.core.ICoreConstants;
-import org.eclipse.pde.internal.core.bundle.BundlePluginBase;
-import org.eclipse.pde.internal.core.ibundle.IBundle;
-import org.osgi.framework.Constants;
-
-public abstract class BasePackageHeader extends ManifestHeader {
-
-    private static final long serialVersionUID = 1L;
-    
-    protected TreeMap fPackages = new TreeMap();
-    
-	public BasePackageHeader(String name, String value, IBundle bundle,
-			String lineDelimiter) {
-		super(name, value, bundle, lineDelimiter);
-		processValue();
-	}
-
-    protected String getVersionAttribute() {
-        int manifestVersion = BundlePluginBase.getBundleManifestVersion(getBundle());
-        return (manifestVersion < 2) ? ICoreConstants.PACKAGE_SPECIFICATION_VERSION : Constants.VERSION_ATTRIBUTE;
-    }
-    
-    protected abstract void processValue();
-
-    public void addPackage(PackageObject object) {
-        fPackages.put(object.getName(), object);
-        updateValue();
-        fireStructureChanged(object, IModelChangedEvent.INSERT);
-    }
-    
-    public void removePackage(PackageObject object) {
-        fPackages.remove(object.getName());
-        updateValue();
-        fireStructureChanged(object, IModelChangedEvent.REMOVE);
-    }
-    
-    public boolean hasPackage(String packageName) {
-        return fPackages.containsKey(packageName);
-    }
-    
-    public Object removePackage(String name) {
-    	return fPackages.remove(name);
-    }
-    
-    public boolean isEmpty() {
-    	return fPackages.size() == 0;
-    }
-    
-    public boolean renamePackage(String oldName, String newName) {
-    	if (hasPackage(oldName)) {
-    		PackageObject object = (PackageObject)fPackages.remove(oldName);
-    		object.setName(newName);
-    		fPackages.put(newName, object);
-    		return true;
-    	}
-    	return false;
-    }
-    
-    public void updateValue() {
-        StringBuffer buffer = new StringBuffer();
-        Iterator iter = fPackages.values().iterator();
-        while (iter.hasNext()) {
-            buffer.append(((PackageObject)iter.next()).write());
-            if (iter.hasNext()) {
-                buffer.append(","); //$NON-NLS-1$
-                buffer.append(getLineLimiter());
-                buffer.append(" ");  //$NON-NLS-1$
-            }
-        }
-       fValue = buffer.toString();
-    }
-
-
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/Bundle.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/Bundle.java
deleted file mode 100644
index 6afdc5d..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/Bundle.java
+++ /dev/null

@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model.bundle;
-
-import java.util.Dictionary;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.jar.Attributes;
-import java.util.jar.Manifest;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.TextUtilities;
-import org.eclipse.pde.internal.core.ICoreConstants;
-import org.eclipse.pde.internal.core.ibundle.IBundle;
-import org.eclipse.pde.internal.core.ibundle.IBundleModel;
-import org.eclipse.pde.internal.ui.model.IDocumentKey;
-import org.osgi.framework.Constants;
-
-public class Bundle implements IBundle {
-	
-	private BundleModel fModel;
-	private Hashtable fDocumentHeaders = new Hashtable();
-	
-	public Bundle(BundleModel model) {
-		fModel = model;
-	}
-	
-	public void clearHeaders() {
-		fDocumentHeaders.clear();
-	}
-	
-	public void load(Manifest manifest) {
-		Map attributes = manifest.getMainAttributes();
-		Iterator iter = attributes.keySet().iterator();
-		while (iter.hasNext()) {
-			Attributes.Name key = (Attributes.Name) iter.next();
-			if (key.toString().equals(Constants.BUNDLE_MANIFESTVERSION)) {				
-	            String value = (String)attributes.get(key);
-				ManifestHeader header = createHeader(key.toString(), value);
-				fDocumentHeaders.put(key.toString(), header);
-				break;
-			}
-		}
-		iter = attributes.keySet().iterator();
-		while (iter.hasNext()) {
-			Attributes.Name key = (Attributes.Name) iter.next();
-			if (key.toString().equals(Constants.BUNDLE_MANIFESTVERSION))
-				continue;
-            String value = (String)attributes.get(key);
-			ManifestHeader header = createHeader(key.toString(), value);
-			fDocumentHeaders.put(key.toString(), header);
-		}
-		adjustOffsets(fModel.getDocument());		
-	}
-	
-	public void clearOffsets() {
-		Iterator iter = fDocumentHeaders.values().iterator();
-		while (iter.hasNext()) {
-			ManifestHeader header = (ManifestHeader)iter.next();
-			header.setOffset(-1);
-			header.setLength(-1);
-		}
-	}
-	
-	protected void adjustOffsets(IDocument document) {
-		int lines = document.getNumberOfLines();
-		try {
-			IDocumentKey currentKey = null;
-			for (int i = 0; i < lines; i++) {
-				int offset = document.getLineOffset(i);
-				int length = document.getLineLength(i);
-				String line = document.get(offset, length);
-				
-				if (currentKey != null) {
-					int lineNumber = line.startsWith(" ") ? i : i - 1; //$NON-NLS-1$
-					IRegion region = document.getLineInformation(lineNumber);
-					String delimiter = document.getLineDelimiter(lineNumber);
-					int keyLength = region.getOffset() + region.getLength() - currentKey.getOffset();
-					currentKey.setLength(delimiter != null ? keyLength + delimiter.length() : keyLength);
-					if (!line.startsWith(" ")) { //$NON-NLS-1$
-						currentKey = null;
-					} 
-				}  
-				
-				if (currentKey == null) {
-					int index = line.indexOf(':');				
-					String name = (index != -1) ? line.substring(0, index) : line;
-					currentKey = (IDocumentKey)fDocumentHeaders.get(name);
-					if (currentKey != null) {
-						IRegion region = document.getLineInformation(i);
-						currentKey.setOffset(region.getOffset());
-						String delimiter = document.getLineDelimiter(i);
-						currentKey.setLength(delimiter != null ? region.getLength() + delimiter.length() : region.getLength());
-					}
-				}
-			}
-		} catch (BadLocationException e) {
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.core.ibundle.IBundle#setHeader(java.lang.String, java.lang.String)
-	 */
-	public void setHeader(String key, String value) {
-		ManifestHeader header = (ManifestHeader)fDocumentHeaders.get(key);
-        String old = header == null ? null : header.getValue();
-		if (header == null) {
-			header = createHeader(key, value);
-		} else {
-            header.setValue(value);
-        }
-		fDocumentHeaders.put(key, header);
-		
-		fModel.fireModelObjectChanged(header, key, old, value);
-	}
-    
-    private ManifestHeader createHeader(String key, String value) {
-        ManifestHeader header = null;
-       	String newLine = TextUtilities.getDefaultLineDelimiter(fModel.getDocument());
-        if (key.equals(Constants.EXPORT_PACKAGE) || key.equals(ICoreConstants.PROVIDE_PACKAGE)) {
- 			header = new ExportPackageHeader(key, value, this, newLine);
-        } else if (key.equals(Constants.IMPORT_PACKAGE)){
- 			header = new ImportPackageHeader(key, value, this, newLine);
-        } else if (key.equals(Constants.BUNDLE_REQUIREDEXECUTIONENVIRONMENT)) {
-        	header = new RequiredExecutionEnvironmentHeader(key, value, this, newLine);
-        } else if (key.equals(ICoreConstants.ECLIPSE_LAZYSTART) || key.equals(ICoreConstants.ECLIPSE_AUTOSTART)) {
-        	header = new LazyStartHeader(key, value, this, newLine);
-        } else {
-            header = new ManifestHeader(key, value, this, newLine);
-        }
-        return header;
-    }
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.core.ibundle.IBundle#getHeader(java.lang.String)
-	 */
-	public String getHeader(String key) {
-		ManifestHeader header = (ManifestHeader)fDocumentHeaders.get(key);
-		return (header != null) ? header.getValue() : null;
-	}
-    
-    public ManifestHeader getManifestHeader(String key) {
-        return (ManifestHeader)fDocumentHeaders.get(key);
-    }
-	
-	public Dictionary getHeaders() {
-		return fDocumentHeaders;
-	}
-
-    public IBundleModel getModel() {
-        return fModel;
-    }
-
-	public String getLocalization() {
-		return getHeader(Constants.BUNDLE_LOCALIZATION);
-	}
-
-	public void setLocalization(String localization) {
-		setHeader(Constants.BUNDLE_LOCALIZATION, localization);
-	}
-
-	public void renameHeader(String key, String newKey) {
-		ManifestHeader header = getManifestHeader(key);
-		if (header != null) {
-			header.setName(newKey);
-			fDocumentHeaders.put(newKey, fDocumentHeaders.remove(key));
-		}
-		fModel.fireModelObjectChanged(header, newKey, key, newKey);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/BundleModel.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/BundleModel.java
deleted file mode 100644
index c98a1ed..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/BundleModel.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model.bundle;
-
-import java.io.*;
-import java.util.jar.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.text.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.core.ibundle.*;
-import org.eclipse.pde.internal.ui.model.*;
-import org.osgi.framework.*;
-
-public class BundleModel extends AbstractEditingModel implements IBundleModel {
-
-	private IBundle fBundle;
-	/**
-	 * @param document
-	 * @param isReconciling
-	 */
-	public BundleModel(IDocument document, boolean isReconciling) {
-		super(document, isReconciling);
-		fBundle = new Bundle(this);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.AbstractEditingModel#createNLResourceHelper()
-	 */
-	protected NLResourceHelper createNLResourceHelper() {
-		return null;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.core.ibundle.IBundleModel#isFragmentModel()
-	 */
-	public boolean isFragmentModel() {
-		return getBundle().getHeader(Constants.FRAGMENT_HOST) != null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IModel#load(java.io.InputStream, boolean)
-	 */
-	public void load(InputStream source, boolean outOfSync) throws CoreException {
-		try {
-			fLoaded = true;
-			((Bundle)getBundle()).clearHeaders();
-			((Bundle)getBundle()).load(new Manifest(source));
-		} catch (IOException e) {
-			fLoaded = false;
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.AbstractEditingModel#adjustOffsets(org.eclipse.jface.text.IDocument)
-	 */
-	protected void adjustOffsets(IDocument document) {
-		((Bundle)getBundle()).clearOffsets();
-		((Bundle)getBundle()).adjustOffsets(document);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.core.ibundle.IBundleModel#getBundle()
-	 */
-	public IBundle getBundle() {
-		return fBundle;
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/ExportPackageHeader.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/ExportPackageHeader.java
deleted file mode 100644
index baca39f..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/ExportPackageHeader.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model.bundle;
-
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.osgi.util.*;
-import org.eclipse.pde.internal.core.ibundle.IBundle;
-import org.osgi.framework.*;
-
-public class ExportPackageHeader extends BasePackageHeader {
-    
-    private static final long serialVersionUID = 1L;
-   
-    public ExportPackageHeader(String name, String value, IBundle bundle,
-			String lineDelimiter) {
-		super(name, value, bundle, lineDelimiter);
-	}
-    
-    protected void processValue() {
-        try {
-            if (fValue != null) {
-                ManifestElement[] elements = ManifestElement.parseHeader(fName, fValue);
-                for (int i = 0; i < elements.length; i++) {
-                    ExportPackageObject p = new ExportPackageObject(this, elements[i], getVersionAttribute());
-                    fPackages.put(p.getName(), p);
-                }
-            }
-        } catch (BundleException e) {
-        }
-    }
-    
-    public Vector getPackageNames() {
-        Vector vector = new Vector(fPackages.size());
-        Iterator iter = fPackages.keySet().iterator();
-        for (int i = 0; iter.hasNext(); i++) {
-            vector.add(iter.next().toString());
-        }
-        return vector;
-    }
-    
-    public ExportPackageObject[] getPackages() {
-        return (ExportPackageObject[])fPackages.values().toArray(new ExportPackageObject[fPackages.size()]);
-    }
-    
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/ExportPackageObject.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/ExportPackageObject.java
deleted file mode 100644
index 9295782..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/ExportPackageObject.java
+++ /dev/null

@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model.bundle;
-
-import java.util.Iterator;
-import java.util.TreeMap;
-
-import org.eclipse.jdt.core.*;
-import org.eclipse.osgi.util.*;
-import org.eclipse.pde.core.IModelChangedEvent;
-
-public class ExportPackageObject extends PackageObject {
-    
-    private static final String INTERNAL = "x-internal"; //$NON-NLS-1$
-    private static final String FRIENDS = "x-friends"; //$NON-NLS-1$
-    
-    private static final long serialVersionUID = 1L;
-    
-    private boolean fInternal;
-
-    private TreeMap fFriends = new TreeMap();
-     
-    public ExportPackageObject(ManifestHeader header, ManifestElement element, String versionAttribute) {
-        super(header, element, versionAttribute);
-        processFriends(element.getDirective(FRIENDS));
-        fInternal = "true".equals(element.getDirective(INTERNAL)) || fFriends.size() > 0; //$NON-NLS-1$
-    }
-    
-    public ExportPackageObject(ManifestHeader header, IPackageFragment fragment, String versionAttribute) {
-        super(header, fragment.getElementName(), null, versionAttribute);
-    }
-    
-    private void processFriends(String value) {
-        if (value != null) {
-            String[] friends = ManifestElement.getArrayFromList(value);
-            for (int i = 0; i < friends.length; i++) {
-                PackageFriend friend = new PackageFriend(this, friends[i]);
-                fFriends.put(friend.getName(), friend);
-            }
-        }
-    }
-
-    protected void appendSupportedAttributes(StringBuffer buffer) {
-       super.appendSupportedAttributes(buffer);
-       if (!fInternal)
-    	   return;
-       
-       if (fInternal && fFriends.size() == 0) {
-           buffer.append(";"); //$NON-NLS-1$
-           buffer.append(INTERNAL);
-           buffer.append(":=true"); //$NON-NLS-1$
-       }
-       if (fFriends.size() > 0) {
-           buffer.append(";"); //$NON-NLS-1$
-           buffer.append(FRIENDS);
-           buffer.append(":=\""); //$NON-NLS-1$
-           Iterator iter = fFriends.keySet().iterator();
-           while (iter.hasNext()) {
-               buffer.append(iter.next().toString());
-               if (iter.hasNext())
-                   buffer.append(","); //$NON-NLS-1$
-           }
-           buffer.append("\""); //$NON-NLS-1$
-       }
-    }
-
-    public boolean isInternal() {
-        return fInternal;
-    }
-
-    public void setInternal(boolean internal) {
-        boolean old = fInternal;
-        fInternal = internal;
-        firePropertyChanged(this, INTERNAL, Boolean.valueOf(old), Boolean.valueOf(internal));
-    }
-    
-    public PackageFriend[] getFriends() {
-        return (PackageFriend[])fFriends.values().toArray(new PackageFriend[fFriends.size()]);
-    }
-    
-    public void addFriend(PackageFriend friend) {
-        fFriends.put(friend.getName(), friend);
-        fireStructureChanged(friend, IModelChangedEvent.INSERT);        
-    }
-    
-    public void removeFriend(PackageFriend friend) {
-        fFriends.remove(friend.getName());
-        fireStructureChanged(friend, IModelChangedEvent.REMOVE);       
-    }
-    
-    public boolean hasFriend(String name) {
-        return fFriends.containsKey(name);
-    }
-    
-    protected boolean skipDirective(String directive) {
-        return INTERNAL.equals(directive) || FRIENDS.equals(directive);
-    }
-    
-    public boolean hasSameVisibility(ExportPackageObject object) {
-    	if (object.fInternal != fInternal)
-    		return false;
-    	
-    	if (fFriends.size() != object.fFriends.size())
-    		return false;
-    	
-    	Iterator iter = fFriends.keySet().iterator();
-    	while (iter.hasNext()) {
-    		if (!object.fFriends.containsKey(iter.next()))
-    			return false;
-    	}
-    	return true;
-    }
-
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/ImportPackageHeader.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/ImportPackageHeader.java
deleted file mode 100644
index fce3c1e..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/ImportPackageHeader.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model.bundle;
-
-import org.eclipse.osgi.util.ManifestElement;
-import org.eclipse.pde.internal.core.ibundle.IBundle;
-import org.osgi.framework.BundleException;
-
-public class ImportPackageHeader extends BasePackageHeader {
-
-    private static final long serialVersionUID = 1L;
-
-    public ImportPackageHeader(String name, String value, IBundle bundle,
-			String lineDelimiter) {
-		super(name, value, bundle, lineDelimiter);
-	}
-
-    protected void processValue() {
-        try {
-            if (fValue != null) {
-                ManifestElement[] elements = ManifestElement.parseHeader(fName, fValue);
-                for (int i = 0; i < elements.length; i++) {
-                    ImportPackageObject p = new ImportPackageObject(this, elements[i], getVersionAttribute());
-                    fPackages.put(p.getName(), p);
-                }
-            }
-        } catch (BundleException e) {
-        }
-    }
-    
-    public ImportPackageObject[] getPackages() {
-        return (ImportPackageObject[])fPackages.values().toArray(new ImportPackageObject[fPackages.size()]);
-    }
-    
-
-
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/ImportPackageObject.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/ImportPackageObject.java
deleted file mode 100644
index 078f048..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/ImportPackageObject.java
+++ /dev/null

@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model.bundle;
-
-import org.eclipse.osgi.service.resolver.*;
-import org.eclipse.osgi.util.*;
-import org.osgi.framework.*;
-
-public class ImportPackageObject extends PackageObject {
-    
-    private static final long serialVersionUID = 1L;
-    
-    private boolean fOptional;
-    
-    private static String getVersion(ExportPackageDescription desc) {
-        String version = desc.getVersion().toString();
-        if (!version.equals(Version.emptyVersion.toString()))
-            return desc.getVersion().toString();
-        return null;
-    }
-    
-    public ImportPackageObject(ManifestHeader header, ManifestElement element, String versionAttribute) {
-        super(header, element, versionAttribute);
-        fOptional = Constants.RESOLUTION_OPTIONAL.equals(element.getDirective(Constants.RESOLUTION_DIRECTIVE));
-    }
-    
-    public ImportPackageObject(ManifestHeader header, ExportPackageDescription desc, String versionAttribute) {       
-        super(header, desc.getName(), getVersion(desc), versionAttribute);
-        fOptional = Constants.RESOLUTION_OPTIONAL.equals(desc.getDirective(Constants.RESOLUTION_DIRECTIVE));
-    }
-   
-    protected void appendSupportedAttributes(StringBuffer buffer) {
-        super.appendSupportedAttributes(buffer);
-        if (fOptional) {
-            buffer.append(";"); //$NON-NLS-1$
-            buffer.append(Constants.RESOLUTION_DIRECTIVE);
-            buffer.append(":="); //$NON-NLS-1$
-            buffer.append(Constants.RESOLUTION_OPTIONAL);
-        }
-    }
-    public boolean isOptional() {
-        return fOptional;
-    }
-
-    public void setOptional(boolean optional) {
-        fOptional = optional;
-    }
-
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/LazyStartHeader.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/LazyStartHeader.java
deleted file mode 100644
index 626c4c5..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/LazyStartHeader.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model.bundle;
-
-import org.eclipse.osgi.util.ManifestElement;
-import org.eclipse.pde.internal.core.ibundle.IBundle;
-import org.osgi.framework.BundleException;
-
-public class LazyStartHeader extends ManifestHeader {
-
-	private static final long serialVersionUID = 1L;
-	private boolean fLazy;
-	private String fRemaining;
-
-	public LazyStartHeader(String name, String value, IBundle bundle, String lineDelimiter) {
-		super(name, value, bundle, lineDelimiter);
-		processValue();
-	}
-	
-	private void processValue() {
-		try {
-			ManifestElement[] elements = ManifestElement.parseHeader(fName, fValue);
-			if (elements.length > 0) {
-				fLazy = "true".equals(elements[0].getValue()); //$NON-NLS-1$
-				int index = fValue.indexOf(';');
-				if (index != -1)
-					fRemaining = fValue.substring(index);
-			}
-		} catch (BundleException e) {
-		}
-	}
-
-	public boolean isLazyStart() {
-		return fLazy;
-	}
-	
-	public void setLazyStart(boolean lazy) {
-		fLazy = lazy;
-		String old = fValue;
-		updateValue();
-		firePropertyChanged(this, fName, old, fValue);
-	}
-	
-	public void updateValue() {
-		fValue = Boolean.toString(fLazy);
-		if (fRemaining != null)
-			fValue += fRemaining;
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/ManifestHeader.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/ManifestHeader.java
deleted file mode 100644
index 586319d..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/ManifestHeader.java
+++ /dev/null

@@ -1,178 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model.bundle;
-
-import java.io.PrintWriter;
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.eclipse.osgi.util.ManifestElement;
-import org.eclipse.pde.internal.core.bundle.BundleObject;
-import org.eclipse.pde.internal.core.ibundle.IBundle;
-import org.eclipse.pde.internal.ui.model.IDocumentKey;
-import org.osgi.framework.BundleException;
-
-public class ManifestHeader extends BundleObject implements IDocumentKey {
-    private static final long serialVersionUID = 1L;
-    private int fOffset = -1;
-	private int fLength = -1;
-    
-	protected String fName;
-	protected String fValue;
-    private IBundle fBundle;
-	private String fLineDelimiter;
-	private Hashtable fAttributes = new Hashtable();
-	private Hashtable fDirectives = new Hashtable();
-	private String[] fValueComponents;
-    
-    public ManifestHeader(String name, String value, IBundle bundle, String lineDelimiter) {
-        fName = name;
-        fValue = value;
-        fBundle = bundle;
-        fLineDelimiter = lineDelimiter;
-        setModel(fBundle.getModel());
-        try {
-        	// Attribute and Directive support 
-			// meant for headers with a single element
-        	ManifestElement[] elements = ManifestElement.parseHeader(fName, fValue);
-			if (elements == null || elements.length != 1)
-				return;
-			Enumeration keys = elements[0].getKeys();
-			while (keys != null && keys.hasMoreElements()) {
-				String key = (String)keys.nextElement();
-				fAttributes.put(key, elements[0].getAttributes(key));
-			}
-			Enumeration dkeys = elements[0].getDirectiveKeys();
-			while (dkeys != null && dkeys.hasMoreElements()) {
-				String dkey = (String)dkeys.nextElement();
-				fDirectives.put(dkey, elements[0].getDirectives(dkey));
-			}
-			fValueComponents = elements[0].getValueComponents();
-		} catch (BundleException e) {
-		}
-    }
-    
-    public String getLineLimiter() {
-    	return fLineDelimiter;
-    }
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentKey#setName(java.lang.String)
-	 */
-	public void setName(String name) {
-		fName = name;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentKey#getName()
-	 */
-	public String getName() {
-		return fName;
-	}
-	
-	public void setValue(String value) {
-		fValue = value;
-	}
-	
-	public String getValue() {
-		return fValue;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentKey#setOffset(int)
-	 */
-	public void setOffset(int offset) {
-		fOffset = offset;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentKey#getOffset()
-	 */
-	public int getOffset() {
-		return fOffset;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentKey#setLength(int)
-	 */
-	public void setLength(int length) {
-		fLength = length;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentKey#getLength()
-	 */
-	public int getLength() {
-		return fLength;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentKey#write()
-	 */
-	public String write() {
-        updateValue();
-		return fName + ": " + fValue + fLineDelimiter; //$NON-NLS-1$
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IWritable#write(java.lang.String, java.io.PrintWriter)
-	 */
-	public void write(String indent, PrintWriter writer) {
-	}
-    
-    public void setBundle(IBundle bundle) {
-        fBundle = bundle;
-    }
-    
-    public IBundle getBundle() {
-        return fBundle;
-    }
-    
-    public void updateValue() {
-    }
-    
-    public void setAttribute(String key, String[] value) {
-    	setHashtableValue(fAttributes, key, value);
-    }
-    public void setDirective(String key, String[] value) {
-    	setHashtableValue(fDirectives, key, value);
-    }
-    
-    private void setHashtableValue(Hashtable table, String key, String[] value) {
-    	String old = fValue;
-    	table.put(key, value);
-    	refreshValue();
-    	getModel().fireModelObjectChanged(this, fName, old, fValue);
-    }
-    private void refreshValue() {
-    	if (fValueComponents.length == 0)
-    		return;
-    	StringBuffer sb = new StringBuffer();
-    	int i = 0;
-    	for (; i < fValueComponents.length; i++) {
-    		if (i != 0) sb.append("; ");  //$NON-NLS-1$
-    		sb.append(fValueComponents[i]);
-    	}
-    	appendValuesToBuffer(sb, fAttributes);
-    	appendValuesToBuffer(sb, fDirectives);
-    	fValue = sb.toString();
-    }
-    private void appendValuesToBuffer(StringBuffer sb, Hashtable table) {
-    	Enumeration dkeys = table.keys();
-    	while (dkeys.hasMoreElements()) {
-    		String dkey = (String)dkeys.nextElement();
-    		sb.append("; "); //$NON-NLS-1$
-			sb.append(dkey);
-			sb.append(table.equals(fDirectives) ? ":=" : "="); //$NON-NLS-1$ //$NON-NLS-2$
-    		String[] values = (String[])table.get(dkey);
-    		if (values.length > 0)sb.append("\""); //$NON-NLS-1$
-    		for (int i = 0; i < values.length; i++) {
-    			if (i != 0) sb.append(", "); //$NON-NLS-1$
-    			sb.append(values[i]);
-    		}
-    		if (values.length > 0)sb.append("\""); //$NON-NLS-1$
-    	}
-    }
-}
-

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/PackageFriend.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/PackageFriend.java
deleted file mode 100644
index 0677a3b..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/PackageFriend.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model.bundle;
-
-import org.eclipse.pde.internal.core.bundle.BundleObject;
-
-public class PackageFriend extends BundleObject {
-
-    private static final long serialVersionUID = 1L;
-
-    private String fName;
-
-    private PackageObject fPackageObject;
-    
-    public PackageFriend(PackageObject object, String name) {
-        fName = name;
-        fPackageObject = object;
-    }
-
-    public String getName() {
-        return fName;
-    }
-    
-    public String toString() {
-        return fName;
-    }
-    
-    public ManifestHeader getHeader() {
-        return fPackageObject.getHeader();
-    }
-
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/PackageObject.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/PackageObject.java
deleted file mode 100644
index 9349d16..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/PackageObject.java
+++ /dev/null

@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model.bundle;
-
-import java.util.Enumeration;
-
-import org.eclipse.osgi.util.ManifestElement;
-import org.eclipse.pde.internal.core.bundle.BundleObject;
-
-public class PackageObject extends BundleObject {
-
-    private static final long serialVersionUID = 1L;
-
-    private String fVersionAttribute;
-    private String fName;
-    private String fVersion;
-    private transient ManifestElement fElement;
-
-    private ManifestHeader fHeader;
-    
-    public PackageObject(ManifestHeader header, ManifestElement element, String versionAttribute) {
-        fHeader = header;
-        fVersionAttribute = versionAttribute;
-        fName = element.getValue();
-        fVersion = element.getAttribute(fVersionAttribute);
-        fElement = element;
-        setModel(fHeader.getBundle().getModel());
-    }
-    
-    public PackageObject(ManifestHeader header, String name, String version, String versionAttribute) {
-        fHeader = header;
-        fVersion = version;
-        fVersionAttribute = versionAttribute;
-        fName = name;
-        setModel(fHeader.getBundle().getModel());
-    }
-    
-     public String toString() {
-        StringBuffer buffer = new StringBuffer(fName);
-        if (fVersion != null && fVersion.length() > 0) {
-            buffer.append(" "); //$NON-NLS-1$
-            boolean wrap = Character.isDigit(fVersion.charAt(0));
-            if (wrap)
-                buffer.append("("); //$NON-NLS-1$
-            buffer.append(fVersion);
-            if (wrap)
-                buffer.append(")"); //$NON-NLS-1$
-        }
-        return buffer.toString();
-    }
-    
-    public String write() {
-        StringBuffer buffer = new StringBuffer();
-        buffer.append(fName);
-        
-        appendSupportedAttributes(buffer);
-
-        if (fElement == null)
-            return buffer.toString();
-        
-        Enumeration attrs = fElement.getKeys();
-        if (attrs != null) {
-            while (attrs.hasMoreElements()) {
-                String attr = attrs.nextElement().toString();
-                if (attr.equals(fVersionAttribute))
-                    continue;
-                buffer.append(";"); //$NON-NLS-1$
-                buffer.append(attr);
-                buffer.append("=\""); //$NON-NLS-1$
-                buffer.append(fElement.getAttribute(attr));
-                buffer.append("\""); //$NON-NLS-1$
-            }
-        }
-        
-        Enumeration directives = fElement.getDirectiveKeys();
-        if (directives != null) {
-            while (directives.hasMoreElements()) {
-                String directive = directives.nextElement().toString();
-                if (skipDirective(directive))
-                    continue;
-                buffer.append(";"); //$NON-NLS-1$
-                buffer.append(directive);
-                buffer.append(":="); //$NON-NLS-1$
-                buffer.append("\""); //$NON-NLS-1$
-                buffer.append(fElement.getDirective(directive));
-                buffer.append("\""); //$NON-NLS-1$
-            }
-        }
-        return buffer.toString();
-    }
-    
-    protected void appendSupportedAttributes(StringBuffer buffer) {
-        if (fVersion != null && fVersion.length() > 0) {
-            buffer.append(";"); //$NON-NLS-1$
-            buffer.append(fVersionAttribute);
-            buffer.append("=\""); //$NON-NLS-1$
-            buffer.append(fVersion.trim());
-            buffer.append("\""); //$NON-NLS-1$
-        }
-    }
-    
-    protected boolean skipDirective(String directive) {
-        return false;
-    }
-
-    public String getVersion() {
-        return fVersion;
-    }
-
-    public String getName() {
-        return fName;
-    }
-    
-    public void setName(String name) {
-    	fName = name;
-    }
-
-    public void setVersion(String version) {
-        String old = fVersion;
-        fVersion = version;
-        firePropertyChanged(this, fVersionAttribute, old, version);
-    }
-
-    public ManifestHeader getHeader() {
-        return fHeader;
-    }
-    
-    public ManifestElement getManifestElement() {
-    	return fElement;
-    }
-
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/RequiredExecutionEnvironmentHeader.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/RequiredExecutionEnvironmentHeader.java
deleted file mode 100644
index cd02720..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/bundle/RequiredExecutionEnvironmentHeader.java
+++ /dev/null

@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model.bundle;
-
-import java.util.ArrayList;
-
-import org.eclipse.osgi.util.ManifestElement;
-import org.eclipse.pde.internal.core.ibundle.IBundle;
-import org.osgi.framework.BundleException;
-
-public class RequiredExecutionEnvironmentHeader extends ManifestHeader {
-    
-    private static final long serialVersionUID = 1L;
-    public static final int TOTAL_JRES = 7;
-    public static final int TOTAL_J2MES = 2;
-    public static final ArrayList JRES = new ArrayList(TOTAL_JRES);
-    public static final ArrayList J2MES = new ArrayList(TOTAL_J2MES);
-    static {
-    	JRES.add("OSGi/Minimum-1.0"); //$NON-NLS-1$
-    	JRES.add("OSGi/Minimum-1.1"); //$NON-NLS-1$
-    	JRES.add("JRE-1.1"); //$NON-NLS-1$
-    	JRES.add("J2SE-1.2"); //$NON-NLS-1$
-    	JRES.add("J2SE-1.3"); //$NON-NLS-1$
-    	JRES.add("J2SE-1.4"); //$NON-NLS-1$
-    	JRES.add("J2SE-1.5"); //$NON-NLS-1$
-    	
-    	J2MES.add("CDC-1.0/Foundation-1.0"); //$NON-NLS-1$
-    	J2MES.add("CDC-1.1/Foundation-1.1"); //$NON-NLS-1$
-    }
-    
-    public static String[] getJRES() {
-    	return (String[])JRES.toArray(new String[JRES.size()]);
-    }
-    public static String[] getJ2MES() {
-    	return (String[])J2MES.toArray(new String[J2MES.size()]);
-    }
-    
-    private String fMinJRE;
-    private String fMinJ2ME;
-    
-    public RequiredExecutionEnvironmentHeader(String name, String value, IBundle bundle,
-			String lineDelimiter) {
-		super(name, value, bundle, lineDelimiter);
-		processValue();
-	}
-    
-    private void processValue() {
-		try {
-			ManifestElement[] elements = ManifestElement.parseHeader(fName, fValue);
-	        if (elements != null && elements.length > 0) {
-	            for (int i = 0; i < TOTAL_JRES; i++) {
-	            	for (int j = 0; j < elements.length; j++) {
-	            		String value = elements[j].getValue();
-	            		if (value.equals(JRES.get(i))) {
-	            			fMinJRE = value;
-	            			break;
-	            		}
-	            	}
-	            }
-	           	for (int i = 0; i < TOTAL_J2MES; i++) {
-	            	for (int j = 0; j < elements.length; j++) {
-	            		String value = elements[j].getValue();
-	            		if (value.equals(J2MES.get(i))) {
-	            			fMinJ2ME = value;
-	            			break;
-	            		}
-	            	}
-	            }
-	        }
-		} catch (BundleException e) {
-		}
-    }
-    
-    public String getMinimumJRE() {
-        return fMinJRE;
-    }
-    
-    public String getMinimumJ2ME() {
-        return fMinJ2ME;
-    }
-    
-    
-    public String updateJRE(String newValue) {
-    	if (newValue.equals(fMinJRE))
-    		return fValue;
-    	fMinJRE = newValue.equals("") ? null : newValue; //$NON-NLS-1$
-    	return getUpdatedValue();
-    }
-    
-    public String updateJ2ME(String newValue) {
-    	if (newValue.equals(fMinJ2ME))
-    		return fValue;
-    	fMinJ2ME = newValue.equals("") ? null : newValue; //$NON-NLS-1$
-    	return getUpdatedValue();
-    }
-
-	public String getUpdatedValue() {
-		StringBuffer sb = new StringBuffer();
-		try {
-			ManifestElement[] elements = ManifestElement.parseHeader(fName, fValue);
-			ArrayList nonStandardElements = new ArrayList();
-			for (int i = 0; i < elements.length; i++) {
-				String value = elements[i].getValue();
-				if (!J2MES.contains(value) && !JRES.contains(value))
-					nonStandardElements.add(value);
-			}
-			for (int i = 0; i < nonStandardElements.size(); i++) {
-				if (sb.length() > 0) sb.append(", "); //$NON-NLS-1$
-				sb.append((String)nonStandardElements.get(i));
-			}
-		} catch (BundleException e) {
-		}
-		if (fMinJRE != null) {
-			if (sb.length() > 0) sb.append(", "); //$NON-NLS-1$
-			sb.append(fMinJRE);
-		}
-		if (fMinJ2ME != null) {
-			if (sb.length() > 0) sb.append(", "); //$NON-NLS-1$
-			sb.append(fMinJ2ME);
-		}
-		fValue = sb.toString();
-		return fValue;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/AbstractPluginDocumentHandler.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/AbstractPluginDocumentHandler.java
deleted file mode 100644
index 2981966..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/AbstractPluginDocumentHandler.java
+++ /dev/null

@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model.plugin;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.text.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.ui.model.*;
-import org.xml.sax.SAXException;
-
-public abstract class AbstractPluginDocumentHandler extends DocumentHandler {
-	
-	private PluginModelBase fModel;
-	private String fSchemaVersion;
-
-	/**
-	 * @param model
-	 */
-	public AbstractPluginDocumentHandler(PluginModelBase model) {
-		fModel = model;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.plugin.DocumentHandler#getDocument()
-	 */
-	protected IDocument getDocument() {
-		return fModel.getDocument();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.xml.sax.helpers.DefaultHandler#endDocument()
-	 */
-	public void endDocument() throws SAXException {
-		IPluginBase pluginBase = fModel.getPluginBase();
-		try {
-			if (pluginBase != null)
-				pluginBase.setSchemaVersion(fSchemaVersion);
-		} catch (CoreException e) {
-		}
-	}
-	
-
-	/* (non-Javadoc)
-	 * @see org.xml.sax.helpers.DefaultHandler#processingInstruction(java.lang.String, java.lang.String)
-	 */
-	public void processingInstruction(String target, String data)
-			throws SAXException {
-		if ("eclipse".equals(target)) { //$NON-NLS-1$
-			fSchemaVersion = "3.0"; //$NON-NLS-1$
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.DocumentHandler#startDocument()
-	 */
-	public void startDocument() throws SAXException {
-		super.startDocument();
-		fSchemaVersion = null;
-	}
-	protected PluginModelBase getModel() {
-		return fModel;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/FragmentModel.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/FragmentModel.java
deleted file mode 100644
index fd629f5..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/FragmentModel.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model.plugin;
-
-import org.eclipse.jface.text.*;
-import org.eclipse.osgi.service.resolver.*;
-import org.eclipse.pde.core.plugin.*;
-
-public class FragmentModel extends PluginModelBase implements IFragmentModel{
-	
-	public FragmentModel(IDocument document, boolean isReconciling) {
-		super(document, isReconciling);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IFragmentModel#getFragment()
-	 */
-	public IFragment getFragment() {
-		return (IFragment)getPluginBase();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginModelBase#isFragmentModel()
-	 */
-	public boolean isFragmentModel() {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginModelBase#getBundleDescription()
-	 */
-	public BundleDescription getBundleDescription() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginModelBase#setBundleDescription(org.eclipse.osgi.service.resolver.BundleDescription)
-	 */
-	public void setBundleDescription(BundleDescription description) {
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/FragmentNode.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/FragmentNode.java
deleted file mode 100644
index 132bfbe..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/FragmentNode.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model.plugin;
-
-import java.util.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.pde.core.plugin.*;
-
-public class FragmentNode extends PluginBaseNode implements IFragment {
-	/**
-	 * Comment for <code>serialVersionUID</code>
-	 */
-	private static final long serialVersionUID = 1L;
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IFragment#getPluginId()
-	 */
-	public String getPluginId() {
-		return getXMLAttributeValue(P_PLUGIN_ID);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IFragment#getPluginVersion()
-	 */
-	public String getPluginVersion() {
-		return getXMLAttributeValue(P_PLUGIN_VERSION);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IFragment#getRule()
-	 */
-	public int getRule() {
-		String match = getXMLAttributeValue("match"); //$NON-NLS-1$
-		if (match == null || match.trim().length() == 0)
-			return IMatchRules.NONE;
-		if (match.equals("compatible"))			 //$NON-NLS-1$
-			return IMatchRules.COMPATIBLE;		
-		if (match.equals("perfect")) //$NON-NLS-1$
-			return IMatchRules.PERFECT;
-		if (match.equals("equivalent")) //$NON-NLS-1$
-			return IMatchRules.EQUIVALENT;
-		return IMatchRules.GREATER_OR_EQUAL;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IFragment#setPluginId(java.lang.String)
-	 */
-	public void setPluginId(String id) throws CoreException {
-		setXMLAttribute(P_PLUGIN_ID, id);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IFragment#setPluginVersion(java.lang.String)
-	 */
-	public void setPluginVersion(String version) throws CoreException {
-		setXMLAttribute(P_PLUGIN_VERSION, version);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IFragment#setRule(int)
-	 */
-	public void setRule(int rule) throws CoreException {
-		String match = ""; //$NON-NLS-1$
-		switch (rule) {
-			case IMatchRules.COMPATIBLE:
-				match = "compatible"; //$NON-NLS-1$
-				break;
-			case IMatchRules.EQUIVALENT:
-				match = "equivalent"; //$NON-NLS-1$
-				break;
-			case IMatchRules.PERFECT:
-				match = "perfect"; //$NON-NLS-1$
-				break;
-			case IMatchRules.GREATER_OR_EQUAL:
-				match = "greaterOrEqual"; //$NON-NLS-1$
-		}
-		setXMLAttribute(P_RULE, match);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.plugin.PluginBaseNode#getSpecificAttributes()
-	 */
-	protected String[] getSpecificAttributes() {
-		ArrayList result = new ArrayList();
-		
-		String pluginID = getPluginId();
-		if (pluginID != null && pluginID.trim().length() > 0)
-			result.add("   " + P_PLUGIN_ID + "=\"" + pluginID + "\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		
-		String pluginVersion = getPluginVersion();
-		if (pluginVersion != null && pluginVersion.trim().length() > 0) 
-			result.add("   " + P_PLUGIN_VERSION + "=\"" + pluginVersion + "\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		
-		String match = getXMLAttributeValue(P_RULE);
-		if (match != null && match.trim().length() > 0)
-			result.add("   " + P_RULE + "=\"" + match + "\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			
-		return (String[]) result.toArray(new String[result.size()]);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/NodeOffsetHandler.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/NodeOffsetHandler.java
deleted file mode 100644
index 4df3840..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/NodeOffsetHandler.java
+++ /dev/null

@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model.plugin;
-
-import org.eclipse.pde.internal.ui.model.*;
-import org.xml.sax.*;
-
-public class NodeOffsetHandler extends AbstractPluginDocumentHandler {
-
-	/**
-	 * @param model
-	 */
-	public NodeOffsetHandler(PluginModelBase model) {
-		super(model);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.DocumentHandler#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes)
-	 */
-	public void startElement(String uri, String localName, String qName,
-			Attributes attributes) throws SAXException {
-		super.startElement(uri, localName, qName, attributes);
-		IDocumentNode node = (IDocumentNode)fDocumentNodeStack.peek();
-		IDocumentAttribute[] attrs = node.getNodeAttributes();
-		for (int i = 0; i < attrs.length; i++) {
-			//if (attrs[i].getNameOffset() == -1)
-				//node.removeDocumentAttribute(attrs[i]);
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.plugin.DocumentHandler#getDocumentNode(java.lang.String, org.eclipse.pde.internal.ui.model.IDocumentNode)
-	 */
-	protected IDocumentNode getDocumentNode(String name, IDocumentNode parent) {
-		IDocumentNode node = null;
-		if (parent == null) {
-			node = (IDocumentNode)getModel().getPluginBase();
-			node.setOffset(-1);
-			node.setLength(-1);
-		} else {
-			IDocumentNode[] children = parent.getChildNodes();
-			for (int i = 0; i < children.length; i++) {
-				if (children[i].getOffset() < 0) {
-					node = children[i];
-					break;
-				}
-			}
-		}
-		
-		IDocumentAttribute[] attrs = node.getNodeAttributes();
-		for (int i = 0; i < attrs.length; i++) {
-			attrs[i].setNameOffset(-1);
-			attrs[i].setNameLength(-1);
-			attrs[i].setValueOffset(-1);
-			attrs[i].setValueLength(-1);
-		}
-		
-		for (int i = 0; i < node.getChildNodes().length; i++) {
-			IDocumentNode child = node.getChildAt(i);
-			child.setOffset(-1);
-			child.setLength(-1);
-		}
-		
-		return node;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.DocumentHandler#appendChildToParent(org.eclipse.pde.internal.ui.model.IDocumentNode, org.eclipse.pde.internal.ui.model.IDocumentNode)
-	 */
-	protected void appendChildToParent(IDocumentNode parent, IDocumentNode child) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.plugin.DocumentHandler#getDocumentAttribute(java.lang.String, java.lang.String, org.eclipse.pde.internal.ui.model.IDocumentNode)
-	 */
-	protected IDocumentAttribute getDocumentAttribute(String name,
-			String value, IDocumentNode parent) {
-		return parent.getDocumentAttribute(name);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginAttribute.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginAttribute.java
deleted file mode 100644
index 1b61a13..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginAttribute.java
+++ /dev/null

@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model.plugin;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.ui.model.*;
-
-public class PluginAttribute extends PluginObjectNode
-		implements
-			IPluginAttribute , IDocumentAttribute{
-	
-	private static final long serialVersionUID = 1L;
-
-	private IDocumentNode fEnclosingElement;
-	private String fValue;
-	private int fNameOffset = -1;
-	private int fNameLength = -1;
-	private int fValueOffset = -1;
-	private int fValueLength = -1;
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginAttribute#getValue()
-	 */
-	public String getValue() {
-		return fValue;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginAttribute#setValue(java.lang.String)
-	 */
-	public void setValue(String value) throws CoreException {
-		fValue = value;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentAttribute#setEnclosingElement(org.eclipse.pde.internal.ui.model.IDocumentNode)
-	 */
-	public void setEnclosingElement(IDocumentNode node) {
-		fEnclosingElement = node;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentAttribute#getEnclosingElement()
-	 */
-	public IDocumentNode getEnclosingElement() {
-		return fEnclosingElement;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentAttribute#setNameOffset(int)
-	 */
-	public void setNameOffset(int offset) {
-		fNameOffset = offset;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentAttribute#getNameOffset()
-	 */
-	public int getNameOffset() {
-		return fNameOffset;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentAttribute#setNameLength(int)
-	 */
-	public void setNameLength(int length) {
-		fNameLength = length;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentAttribute#getNameLength()
-	 */
-	public int getNameLength() {
-		return fNameLength;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentAttribute#setValueOffset(int)
-	 */
-	public void setValueOffset(int offset) {
-		fValueOffset = offset;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentAttribute#getValueOffset()
-	 */
-	public int getValueOffset() {
-		return fValueOffset;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentAttribute#setValueLength(int)
-	 */
-	public void setValueLength(int length) {
-		fValueLength = length;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentAttribute#getValueLength()
-	 */
-	public int getValueLength() {
-		return fValueLength;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentAttribute#getAttributeName()
-	 */
-	public String getAttributeName() {
-		return getName();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentAttribute#getAttributeValue()
-	 */
-	public String getAttributeValue() {
-		return getValue();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentAttribute#write()
-	 */
-	public String write() {
-		return getName() + "=\"" + getWritableString(getValue()) + "\""; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public String getWritableString(String source) {
-		return super
-				.getWritableString(source)
-				.replaceAll("\\r", "&#x0D;") //$NON-NLS-1$ //$NON-NLS-2$
-				.replaceAll("\\n", "&#x0A;"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginBaseNode.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginBaseNode.java
deleted file mode 100644
index d5f9ba7..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginBaseNode.java
+++ /dev/null

@@ -1,402 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model.plugin;
-
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.ui.model.*;
-
-public abstract class PluginBaseNode extends PluginObjectNode implements IPluginBase {
-	
-	
-	private String fSchemaVersion;
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginBase#add(org.eclipse.pde.core.plugin.IPluginLibrary)
-	 */
-	public void add(IPluginLibrary library) throws CoreException {
-		IDocumentNode parent = getEnclosingElement("runtime", true); //$NON-NLS-1$
-		if (library instanceof PluginLibraryNode) {
-			PluginLibraryNode node = (PluginLibraryNode)library;
-			node.setModel(getModel());
-			library.setInTheModel(true);
-			parent.addChildNode(node);
-			fireStructureChanged(library, IModelChangedEvent.INSERT);
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginBase#add(org.eclipse.pde.core.plugin.IPluginImport)
-	 */
-	public void add(IPluginImport pluginImport) throws CoreException {
-		IDocumentNode parent = getEnclosingElement("requires", true); //$NON-NLS-1$
-		if (pluginImport instanceof PluginImportNode) {
-			PluginImportNode node = (PluginImportNode)pluginImport;
-			node.setModel(getModel());
-			pluginImport.setInTheModel(true);
-			parent.addChildNode(node);
-			fireStructureChanged(pluginImport, IModelChangedEvent.INSERT);
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginBase#remove(org.eclipse.pde.core.plugin.IPluginImport)
-	 */
-	public void remove(IPluginImport pluginImport) throws CoreException {
-		IDocumentNode parent = getEnclosingElement("requires", false); //$NON-NLS-1$
-		if (parent != null) {
-			parent.removeChildNode((IDocumentNode)pluginImport);
-			pluginImport.setInTheModel(false);
-			fireStructureChanged(pluginImport, IModelChangedEvent.REMOVE);
-		}	
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginBase#getLibraries()
-	 */
-	public IPluginLibrary[] getLibraries() {
-		ArrayList result = new ArrayList();
-		IDocumentNode requiresNode = getEnclosingElement("runtime", false); //$NON-NLS-1$
-		if (requiresNode != null) {
-			IDocumentNode[] children = requiresNode.getChildNodes();
-			for (int i = 0; i < children.length; i++) {
-				if (children[i] instanceof IPluginLibrary)
-					result.add(children[i]);
-			}
-		}
-		
-		return (IPluginLibrary[]) result.toArray(new IPluginLibrary[result.size()]);
-	}
-	
-	private IDocumentNode getEnclosingElement(String elementName, boolean create) {
-		PluginElementNode element = null;
-		IDocumentNode[] children = getChildNodes();
-		for (int i = 0; i < children.length; i++) {
-			if (children[i] instanceof IPluginElement) {
-				if (((PluginElementNode)children[i]).getXMLTagName().equals(elementName)) {
-					element = (PluginElementNode)children[i];
-					break;
-				}
-			}
-		}
-		if (element == null && create) {
-			element = new PluginElementNode();
-			element.setXMLTagName(elementName);
-			element.setParentNode(this);
-			element.setModel(getModel());
-			element.setInTheModel(true);
-			if (elementName.equals("runtime")) { //$NON-NLS-1$
-				addChildNode(element, 0);
-			} else if (elementName.equals("requires")) { //$NON-NLS-1$
-				if (children.length > 0 && children[0].getXMLTagName().equals("runtime")) { //$NON-NLS-1$
-					addChildNode(element, 1);
-				} else {
-					addChildNode(element, 0);
-				}
-			}			
-		}
-		return element;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginBase#getImports()
-	 */
-	public IPluginImport[] getImports() {
-		ArrayList result = new ArrayList();
-		IDocumentNode requiresNode = getEnclosingElement("requires", false); //$NON-NLS-1$
-		if (requiresNode != null) {
-			IDocumentNode[] children = requiresNode.getChildNodes();
-			for (int i = 0; i < children.length; i++) {
-				if (children[i] instanceof IPluginImport)
-					result.add(children[i]);
-			}
-		}
-		
-		return (IPluginImport[]) result.toArray(new IPluginImport[result.size()]);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginBase#getProviderName()
-	 */
-	public String getProviderName() {
-		return getXMLAttributeValue(P_PROVIDER);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginBase#getVersion()
-	 */
-	public String getVersion() {
-		return getXMLAttributeValue(P_VERSION);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginBase#remove(org.eclipse.pde.core.plugin.IPluginLibrary)
-	 */
-	public void remove(IPluginLibrary library) throws CoreException {
-		IDocumentNode parent = getEnclosingElement("runtime", false); //$NON-NLS-1$
-		if (parent != null) {
-			parent.removeChildNode((IDocumentNode)library);
-			library.setInTheModel(false);
-			fireStructureChanged(library, IModelChangedEvent.REMOVE);
-		}	
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginBase#setProviderName(java.lang.String)
-	 */
-	public void setProviderName(String providerName) throws CoreException {
-		setXMLAttribute(P_PROVIDER, providerName);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginBase#setVersion(java.lang.String)
-	 */
-	public void setVersion(String version) throws CoreException {
-		setXMLAttribute(P_VERSION, version);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginBase#swap(org.eclipse.pde.core.plugin.IPluginLibrary, org.eclipse.pde.core.plugin.IPluginLibrary)
-	 */
-	public void swap(IPluginLibrary l1, IPluginLibrary l2) throws CoreException {
-		IDocumentNode node = getEnclosingElement("runtime", false); //$NON-NLS-1$
-		if (node != null) {
-			node.swap((IDocumentNode)l1, (IDocumentNode)l2);
-			firePropertyChanged(node, P_LIBRARY_ORDER, l1, l2);
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginBase#getSchemaVersion()
-	 */
-	public String getSchemaVersion() {
-		return fSchemaVersion;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginBase#setSchemaVersion(java.lang.String)
-	 */
-	public void setSchemaVersion(String schemaVersion) throws CoreException {
-		fSchemaVersion = schemaVersion;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IExtensions#add(org.eclipse.pde.core.plugin.IPluginExtension)
-	 */
-	public void add(IPluginExtension extension) throws CoreException {
-		if (extension instanceof PluginExtensionNode) {
-			PluginExtensionNode node = (PluginExtensionNode)extension;
-			node.setModel(getModel());
-			extension.setInTheModel(true);
-			addChildNode(node);
-			fireStructureChanged(extension, IModelChangedEvent.INSERT);
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IExtensions#add(org.eclipse.pde.core.plugin.IPluginExtensionPoint)
-	 */
-	public void add(IPluginExtensionPoint extensionPoint) throws CoreException {
-		if (extensionPoint instanceof PluginExtensionPointNode) {
-			PluginExtensionPointNode node = (PluginExtensionPointNode)extensionPoint;
-			node.setModel(getModel());
-			extensionPoint.setInTheModel(true);
-			node.setParentNode(this);
-			IPluginExtensionPoint[] extPoints = getExtensionPoints();
-			if (extPoints.length > 0)
-				addChildNode(node, indexOf((IDocumentNode)extPoints[extPoints.length - 1]) + 1);
-			else {
-				IDocumentNode requires = getEnclosingElement("requires", false); //$NON-NLS-1$
-				if (requires != null) {
-					addChildNode(node, indexOf(requires) + 1);
-				} else {
-					IDocumentNode runtime = getEnclosingElement("runtime", false); //$NON-NLS-1$
-					if (runtime != null)
-						addChildNode(node, indexOf(runtime) + 1);
-					else
-						addChildNode(node, 0);
-				}
-			}
-			fireStructureChanged(extensionPoint, IModelChangedEvent.INSERT);
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IExtensions#getExtensionPoints()
-	 */
-	public IPluginExtensionPoint[] getExtensionPoints() {
-		ArrayList result = new ArrayList();
-		IDocumentNode[] children = getChildNodes();
-		for (int i = 0; i < children.length; i++) {
-			if (children[i] instanceof IPluginExtensionPoint)
-				result.add(children[i]);
-		}
-		return (IPluginExtensionPoint[]) result.toArray(new IPluginExtensionPoint[result.size()]);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IExtensions#getExtensions()
-	 */
-	public IPluginExtension[] getExtensions() {
-		ArrayList result = new ArrayList();
-		IDocumentNode[] children = getChildNodes();
-		for (int i = 0; i < children.length; i++) {
-			if (children[i] instanceof IPluginExtension)
-				result.add(children[i]);
-		}
-		return (IPluginExtension[]) result.toArray(new IPluginExtension[result.size()]);
-	}
-	public int getIndexOf(IPluginExtension e) {
-		IPluginExtension [] children = getExtensions();
-		for (int i=0; i<children.length; i++) {
-			if (children[i].equals(e))
-				return i;
-		}
-		return -1;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IExtensions#remove(org.eclipse.pde.core.plugin.IPluginExtension)
-	 */
-	public void remove(IPluginExtension extension) throws CoreException {
-		if (extension instanceof IDocumentNode) {
-			removeChildNode((IDocumentNode)extension);
-			extension.setInTheModel(false);
-			fireStructureChanged(extension, IModelChangedEvent.REMOVE);
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IExtensions#remove(org.eclipse.pde.core.plugin.IPluginExtensionPoint)
-	 */
-	public void remove(IPluginExtensionPoint extensionPoint)
-			throws CoreException {
-		if (extensionPoint instanceof IDocumentNode) {
-			removeChildNode((IDocumentNode)extensionPoint);
-			extensionPoint.setInTheModel(false);
-			fireStructureChanged(extensionPoint, IModelChangedEvent.REMOVE);
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IExtensions#swap(org.eclipse.pde.core.plugin.IPluginExtension, org.eclipse.pde.core.plugin.IPluginExtension)
-	 */
-	public void swap(IPluginExtension e1, IPluginExtension e2)
-			throws CoreException {
-		swap((IDocumentNode)e1, (IDocumentNode)e2);
-		firePropertyChanged(this, P_EXTENSION_ORDER, e1, e2);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginBase#swap(org.eclipse.pde.core.plugin.IPluginImport, org.eclipse.pde.core.plugin.IPluginImport)
-	 */
-	public void swap(IPluginImport import1, IPluginImport import2)
-			throws CoreException {
-		IDocumentNode node = getEnclosingElement("requires", false); //$NON-NLS-1$
-		if (node != null) {
-			node.swap((IDocumentNode)import1, (IDocumentNode)import2);
-			firePropertyChanged(node, P_IMPORT_ORDER, import1, import2);
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IIdentifiable#getId()
-	 */
-	public String getId() {
-		return getXMLAttributeValue(P_ID);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IIdentifiable#setId(java.lang.String)
-	 */
-	public void setId(String id) throws CoreException {
-		setXMLAttribute(P_ID, id);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginObject#getName()
-	 */
-	public String getName() {
-		return getXMLAttributeValue(P_NAME);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginObject#setName(java.lang.String)
-	 */
-	public void setName(String name) throws CoreException {
-		setXMLAttribute(P_NAME, name);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.plugin.PluginObjectNode#write()
-	 */
-	public String write(boolean indent) {
-		String newLine = getLineDelimiter();
-		
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + newLine); //$NON-NLS-1$
-		if (PDECore.getDefault().getModelManager().isOSGiRuntime()) {
-			buffer.append("<?eclipse version=\"3.0\"?>" + newLine); //$NON-NLS-1$
-		}
-		buffer.append(writeShallow(false) + newLine);
-		
-		IDocumentNode runtime = getEnclosingElement("runtime", false); //$NON-NLS-1$
-		if (runtime != null) {
-			runtime.setLineIndent(getLineIndent() + 3);
-			buffer.append(runtime.write(true) + newLine);
-		}
-		
-		IDocumentNode requires = getEnclosingElement("requires", false); //$NON-NLS-1$
-		if (requires != null) {
-			requires.setLineIndent(getLineIndent() + 3);
-			buffer.append(requires.write(true) + newLine);
-		}
-		
-		IPluginExtensionPoint[] extPoints = getExtensionPoints();
-		for (int i = 0; i < extPoints.length; i++) {
-			IDocumentNode extPoint = (IDocumentNode)extPoints[i];
-			extPoint.setLineIndent(getLineIndent() + 3);
-			buffer.append(extPoint.write(true) + newLine);
-		}
-		
-		IPluginExtension[] extensions = getExtensions();
-		for (int i = 0; i < extensions.length; i++) {
-			IDocumentNode extension = (IDocumentNode)extensions[i];
-			extension.setLineIndent(getLineIndent() + 3);
-			buffer.append(extension.write(true) + newLine);
-		}
-		
-		buffer.append("</" + getXMLTagName() + ">"); //$NON-NLS-1$ //$NON-NLS-2$
-		return buffer.toString();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.plugin.PluginObjectNode#writeShallow()
-	 */
-	public String writeShallow(boolean terminate) {
-		String newLine = System.getProperty("line.separator"); //$NON-NLS-1$
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("<" + getXMLTagName()); //$NON-NLS-1$
-		buffer.append(newLine);
-		
-		String id = getId();
-		if (id != null && id.trim().length() > 0)
-			buffer.append("   " + P_ID + "=\"" + getWritableString(id) + "\"" + newLine); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		
-		String name = getName();
-		if (name != null && name.trim().length() > 0)
-			buffer.append("   " + P_NAME + "=\"" + getWritableString(name) + "\"" + newLine); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		
-		String version = getVersion();
-		if (version != null && version.trim().length() > 0)
-			buffer.append("   " + P_VERSION + "=\"" + getWritableString(version) + "\"" + newLine); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		
-		String provider = getProviderName();
-		if (provider != null && provider.trim().length() > 0) {
-			buffer.append("   " + P_PROVIDER + "=\"" + getWritableString(provider) + "\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		}
-		
-		String[] specific = getSpecificAttributes();
-		for (int i = 0; i < specific.length; i++)
-			buffer.append(newLine + specific[i]);
-		if (terminate)
-			buffer.append("/"); //$NON-NLS-1$
-		buffer.append(">"); //$NON-NLS-1$
-
-		return buffer.toString();
-	}
-	
-	protected abstract String[] getSpecificAttributes();
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginDocumentHandler.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginDocumentHandler.java
deleted file mode 100644
index ecfef14..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginDocumentHandler.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model.plugin;
-
-import org.eclipse.pde.internal.ui.model.*;
-import org.xml.sax.*;
-
-public class PluginDocumentHandler extends AbstractPluginDocumentHandler {
-	
-	private PluginDocumentNodeFactory fFactory;
-	
-	public PluginDocumentHandler(PluginModelBase model) {
-		super(model);
-		fFactory = (PluginDocumentNodeFactory)getModel().getPluginFactory();
-	}
-		
-	/* (non-Javadoc)
-	 * @see org.xml.sax.helpers.DefaultHandler#characters(char[], int, int)
-	 */
-	public void characters(char[] ch, int start, int length) throws SAXException {		
-		IDocumentNode parent = (IDocumentNode)fDocumentNodeStack.peek();
-		if (parent == null)
-			return;
-		
-		StringBuffer buffer = new StringBuffer();
-		buffer.append(ch, start, length);
-		IDocumentTextNode textNode = parent.getTextNode();
-		if (textNode == null) {
-			if (buffer.toString().trim().length() > 0) {
-				textNode = new DocumentTextNode();
-				textNode.setEnclosingElement(parent);
-				parent.addTextNode(textNode);
-				textNode.setText(buffer.toString().trim());
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.plugin.DocumentHandler#getDocumentNode(java.lang.String, org.eclipse.pde.internal.ui.model.IDocumentNode)
-	 */
-	protected IDocumentNode getDocumentNode(String name, IDocumentNode parent) {
-		return fFactory.createDocumentNode(name, parent);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.plugin.DocumentHandler#getDocumentAttribute(java.lang.String, java.lang.String, org.eclipse.pde.internal.ui.model.IDocumentNode)
-	 */
-	protected IDocumentAttribute getDocumentAttribute(String name,
-			String value, IDocumentNode parent) {
-		return fFactory.createAttribute(name, value, parent);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginDocumentNode.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginDocumentNode.java
deleted file mode 100644
index 8918578..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginDocumentNode.java
+++ /dev/null

@@ -1,263 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model.plugin;
-
-import java.util.*;
-
-import org.eclipse.pde.internal.ui.model.*;
-
-public abstract class PluginDocumentNode implements IDocumentNode {
-	
-	private IDocumentNode fParent;
-	private ArrayList fChildren = new ArrayList();
-	private boolean fIsErrorNode;
-	private int fLength = -1;
-	private int fOffset = -1;
-	protected Map fAttributes = new TreeMap();
-	private String fTag;
-	private int fIndent = 0;
-	private IDocumentNode fPreviousSibling;
-	protected IDocumentTextNode fTextNode;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.model.IDocumentNode#getChildNodes()
-	 */
-	public IDocumentNode[] getChildNodes() {
-		return (IDocumentNode[]) fChildren.toArray(new IDocumentNode[fChildren.size()]);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentNode#indexOf(org.eclipse.pde.internal.ui.model.IDocumentNode)
-	 */
-	public int indexOf(IDocumentNode child) {
-		return fChildren.indexOf(child);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentNode#getChildAt(int)
-	 */
-	public IDocumentNode getChildAt(int index) {
-		if (index < fChildren.size())
-			return (IDocumentNode)fChildren.get(index);
-		return null;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.model.IDocumentNode#getParentNode()
-	 */
-	public IDocumentNode getParentNode() {
-		return fParent;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.model.IDocumentNode#setParentNode(org.eclipse.pde.internal.ui.neweditor.model.IDocumentNode)
-	 */
-	public void setParentNode(IDocumentNode node) {
-		fParent = node;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.model.IDocumentNode#addChildNode(org.eclipse.pde.internal.ui.neweditor.model.IDocumentNode)
-	 */
-	public void addChildNode(IDocumentNode child) {
-		addChildNode(child, fChildren.size());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentNode#addChildNode(org.eclipse.pde.internal.ui.model.IDocumentNode, int)
-	 */
-	public void addChildNode(IDocumentNode child, int position) {
-		fChildren.add(position, child);
-		if (position > 0 && fChildren.size() > 1)
-			child.setPreviousSibling((IDocumentNode)fChildren.get(position - 1));
-		if (fChildren.size() > 1 && position < fChildren.size() - 1)
-			((IDocumentNode)fChildren.get(position + 1)).setPreviousSibling(child);
-		child.setParentNode(this);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentNode#removeChildNode(org.eclipse.pde.internal.ui.model.IDocumentNode)
-	 */
-	public IDocumentNode removeChildNode(IDocumentNode child) {
-		int index = fChildren.indexOf(child);
-		if (index != -1) {
-			fChildren.remove(child);
-			if (index < fChildren.size()) {
-				IDocumentNode prevSibling = index == 0 ? null : (IDocumentNode)fChildren.get(index - 1);
-				((IDocumentNode)fChildren.get(index)).setPreviousSibling(prevSibling);
-				return child;
-			}
-		}
-		return null;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.model.IDocumentNode#isErrorNode()
-	 */
-	public boolean isErrorNode() {
-		return fIsErrorNode;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.neweditor.model.IDocumentNode#setIsErrorNode(boolean)
-	 */
-	public void setIsErrorNode(boolean isErrorNode) {
-		fIsErrorNode = isErrorNode;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentNode#setOffset(int)
-	 */
-	public void setOffset(int offset) {
-		fOffset = offset;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentNode#setLength(int)
-	 */
-	public void setLength(int length) {
-		fLength = length;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentNode#getOffset()
-	 */
-	public int getOffset() {
-		return fOffset;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentNode#getLength()
-	 */
-	public int getLength() {
-		return fLength;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentNode#setAttribute(org.eclipse.pde.internal.ui.model.IDocumentAttribute)
-	 */
-	public void setXMLAttribute(IDocumentAttribute attribute) {
-		fAttributes.put(attribute.getAttributeName(), attribute);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentNode#getXMLAttributeValue(java.lang.String)
-	 */
-	public String getXMLAttributeValue(String name) {
-		PluginAttribute attr = (PluginAttribute)fAttributes.get(name);
-		return attr == null ? null : attr.getValue();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentNode#setXMLTagName(java.lang.String)
-	 */
-	public void setXMLTagName(String tag) {
-		fTag = tag;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentNode#getXMLTagName()
-	 */
-	public String getXMLTagName() {
-		return fTag;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentNode#getDocumentAttribute(java.lang.String)
-	 */
-	public IDocumentAttribute getDocumentAttribute(String name) {
-		return (IDocumentAttribute)fAttributes.get(name);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentNode#getLineIndent()
-	 */
-	public int getLineIndent() {
-		return fIndent;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentNode#setLineIndent(int)
-	 */
-	public void setLineIndent(int indent) {
-		fIndent = indent;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentNode#getAttributes()
-	 */
-	public IDocumentAttribute[] getNodeAttributes() {
-		ArrayList list = new ArrayList();
-		Iterator iter = fAttributes.values().iterator();
-		while (iter.hasNext())
-			list.add(iter.next());
-		return (IDocumentAttribute[])list.toArray(new IDocumentAttribute[list.size()]);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentNode#getPreviousSibling()
-	 */
-	public IDocumentNode getPreviousSibling() {
-		return fPreviousSibling;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentNode#setPreviousSibling(org.eclipse.pde.internal.ui.model.IDocumentNode)
-	 */
-	public void setPreviousSibling(IDocumentNode sibling) {
-		fPreviousSibling = sibling;
-	}
-	
-	protected String getIndent() {
-		StringBuffer buffer = new StringBuffer();
-		for (int i = 0; i < fIndent; i++) {
-			buffer.append(" "); //$NON-NLS-1$
-		}
-		return buffer.toString();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentNode#swap(org.eclipse.pde.internal.ui.model.IDocumentNode, org.eclipse.pde.internal.ui.model.IDocumentNode)
-	 */
-	public void swap(IDocumentNode child1, IDocumentNode child2) {
-		int index1 = fChildren.indexOf(child1);
-		int index2 = fChildren.indexOf(child2);
-		
-		fChildren.set(index1, child2);
-		fChildren.set(index2, child1);
-		
-		child1.setPreviousSibling(index2 == 0 ? null : (IDocumentNode)fChildren.get(index2 - 1));
-		child2.setPreviousSibling(index1 == 0 ? null : (IDocumentNode)fChildren.get(index1 - 1));
-		
-		if (index1 < fChildren.size() - 1)
-			((IDocumentNode)fChildren.get(index1 + 1)).setPreviousSibling(child2);
-		
-		if (index2 < fChildren.size() - 1)
-			((IDocumentNode)fChildren.get(index2 + 1)).setPreviousSibling(child1);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentNode#addTextNode(org.eclipse.pde.internal.ui.model.IDocumentTextNode)
-	 */
-	public void addTextNode(IDocumentTextNode textNode) {
-		fTextNode = textNode;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentNode#getTextNode()
-	 */
-	public IDocumentTextNode getTextNode() {
-		return fTextNode;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentNode#removeTextNode()
-	 */
-	public void removeTextNode() {
-		fTextNode = null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentNode#removeDocumentAttribute(org.eclipse.pde.internal.ui.model.IDocumentAttribute)
-	 */
-	public void removeDocumentAttribute(IDocumentAttribute attr) {
-		fAttributes.remove(attr.getAttributeName());
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginDocumentNodeFactory.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginDocumentNodeFactory.java
deleted file mode 100644
index 7b5d4c0..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginDocumentNodeFactory.java
+++ /dev/null

@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model.plugin;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.ui.model.*;
-
-public class PluginDocumentNodeFactory implements IPluginModelFactory {
-	
-	private PluginModelBase fModel;
-
-	public PluginDocumentNodeFactory(PluginModelBase model) {
-		fModel = model;
-	}
-	
-	public IDocumentNode createDocumentNode(String name, IDocumentNode parent) {
-		if (parent == null)
-			return createPluginBase(name);
-		
-		if (parent instanceof PluginBaseNode) {
-			if ("extension".equals(name)) //$NON-NLS-1$
-				return createExtension(parent);
-			if ("extension-point".equals(name)) //$NON-NLS-1$
-				return createExtensionPoint(parent);
-		} else {
-			if (name.equals("import") && parent instanceof PluginElementNode) { //$NON-NLS-1$
-				if (((PluginElementNode)parent).getName().equals("requires")) { //$NON-NLS-1$
-					IDocumentNode ancestor = parent.getParentNode();
-					if (ancestor != null && ancestor instanceof PluginBaseNode) {
-						return createImport(parent);
-					}
-				}
-			} else if (name.equals("library") && parent instanceof PluginElementNode) { //$NON-NLS-1$
-				if (((PluginElementNode)parent).getName().equals("runtime")) { //$NON-NLS-1$
-					IDocumentNode ancestor = parent.getParentNode();
-					if (ancestor != null && ancestor instanceof PluginBaseNode) {
-						return createLibrary(parent);
-					}
-				}				
-			}
-			
-			
-		}
-		return createElement(name, parent);
-	}
-	
-	/**
-	 * @param parent
-	 * @return
-	 */
-	private IDocumentNode createLibrary(IDocumentNode parent) {
-		PluginLibraryNode node = new PluginLibraryNode();
-		node.setParentNode(parent);
-		node.setModel(fModel);
-		node.setInTheModel(true);
-		return node;
-	}
-
-	/**
-	 * @param parent
-	 */
-	private IDocumentNode createImport(IDocumentNode parent) {
-		PluginImportNode node = new PluginImportNode();
-		node.setParentNode(parent);
-		node.setModel(fModel);
-		node.setInTheModel(true);
-		return node;
-	}
-
-	/**
-	 * @param name
-	 * @param parent
-	 * @return
-	 */
-	private IDocumentNode createElement(String name, IDocumentNode parent) {
-		PluginElementNode node = new PluginElementNode();
-		try {
-			node.setName(name);
-			node.setParentNode(parent);
-			node.setModel(fModel);
-			node.setInTheModel(true);
-		} catch (CoreException e) {
-		}
-		return node;
-	}
-
-	/**
-	 * @param name
-	 * @param parent
-	 * @return
-	 */
-	private PluginExtensionPointNode createExtensionPoint(IDocumentNode parent) {
-		PluginExtensionPointNode node = new PluginExtensionPointNode();
-		node.setParentNode(parent);
-		node.setModel(fModel);
-		node.setInTheModel(true);
-		return node;
-	}
-
-	/**
-	 * @param name
-	 * @return
-	 */
-	private PluginExtensionNode createExtension(IDocumentNode parent) {
-		PluginExtensionNode node = new PluginExtensionNode();
-		node.setParentNode(parent);
-		node.setModel(fModel);
-		node.setInTheModel(true);
-		return node;
-	}
-
-	public IDocumentAttribute createAttribute(String name, String value, IDocumentNode enclosingElement) {
-		PluginAttribute attribute = new PluginAttribute();
-		try {
-			attribute.setName(name);
-			attribute.setValue(value);
-		} catch (CoreException e) {
-		}
-		attribute.setEnclosingElement(enclosingElement);
-		attribute.setModel(fModel);
-		attribute.setInTheModel(true);
-		return attribute;
-	}
-	
-	private PluginBaseNode createPluginBase(String name) {
-		return (PluginBaseNode)fModel.createPluginBase(name.equals("fragment")); //$NON-NLS-1$
-		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginModelFactory#createImport()
-	 */
-	public IPluginImport createImport() {
-		PluginImportNode node = new PluginImportNode();
-		node.setModel(fModel);
-		node.setXMLTagName("import"); //$NON-NLS-1$
-		return node;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginModelFactory#createLibrary()
-	 */
-	public IPluginLibrary createLibrary() {
-		PluginLibraryNode node = new PluginLibraryNode();
-		node.setModel(fModel);
-		node.setXMLTagName("library"); //$NON-NLS-1$
-		return node;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IExtensionsModelFactory#createAttribute(org.eclipse.pde.core.plugin.IPluginElement)
-	 */
-	public IPluginAttribute createAttribute(IPluginElement element) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IExtensionsModelFactory#createElement(org.eclipse.pde.core.plugin.IPluginObject)
-	 */
-	public IPluginElement createElement(IPluginObject parent) {
-		PluginElementNode node = new PluginElementNode();
-		node.setModel(fModel);
-		node.setParentNode((IDocumentNode)parent);
-		return node;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IExtensionsModelFactory#createExtension()
-	 */
-	public IPluginExtension createExtension() {
-		PluginExtensionNode node = new PluginExtensionNode();
-		node.setModel(fModel);
-		node.setXMLTagName("extension"); //$NON-NLS-1$
-		return node;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IExtensionsModelFactory#createExtensionPoint()
-	 */
-	public IPluginExtensionPoint createExtensionPoint() {
-		PluginExtensionPointNode node = new PluginExtensionPointNode();
-		node.setModel(fModel);
-		node.setXMLTagName("extension-point"); //$NON-NLS-1$
-		return node;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginElementNode.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginElementNode.java
deleted file mode 100644
index 3b064fc..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginElementNode.java
+++ /dev/null

@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model.plugin;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.ischema.*;
-import org.eclipse.pde.internal.ui.model.*;
-
-public class PluginElementNode extends PluginParentNode
-		implements
-			IPluginElement {
-
-	private static final long serialVersionUID = 1L;
-
-	private transient ISchemaElement elementInfo;
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginElement#createCopy()
-	 */
-	public IPluginElement createCopy() {
-		return null;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginElement#getAttribute(java.lang.String)
-	 */
-	public IPluginAttribute getAttribute(String name) {
-		return (IPluginAttribute)fAttributes.get(name);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginElement#getAttributes()
-	 */
-	public IPluginAttribute[] getAttributes() {
-		return (IPluginAttribute[])fAttributes.values().toArray(new IPluginAttribute[fAttributes.size()]);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginElement#getAttributeCount()
-	 */
-	public int getAttributeCount() {
-		return fAttributes.size();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginElement#getText()
-	 */
-	public String getText() {
-		IDocumentTextNode node = getTextNode();
-		return node == null ? "" : node.getText(); //$NON-NLS-1$
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginElement#setAttribute(java.lang.String, java.lang.String)
-	 */
-	public void setAttribute(String name, String value) throws CoreException {
-		setXMLAttribute(name, value);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginElement#setText(java.lang.String)
-	 */
-	public void setText(String text) throws CoreException {
-		IDocumentTextNode node = getTextNode();
-		if (node == null) {
-			node = new DocumentTextNode();
-			node.setEnclosingElement(this);
-			addTextNode(node);
-		}		
-		node.setText(text);
-		firePropertyChanged(this, P_TEXT, node, node);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.plugin.PluginObjectNode#write()
-	 */
-	public String write(boolean indent) {
-		String sep = getLineDelimiter();
-		StringBuffer buffer = new StringBuffer();
-		if (indent)
-			buffer.append(getIndent());
-		
-		IDocumentNode[] children = getChildNodes();
-		String text = getText();
-		if (children.length > 0 || text.length() > 0) {
-			buffer.append(writeShallow(false) + sep);
-			if (text.length() > 0)
-				buffer.append(getIndent() + "   " + text + sep); //$NON-NLS-1$
-			for (int i = 0; i < children.length; i++) {
-				children[i].setLineIndent(getLineIndent() + 3);
-				buffer.append(children[i].write(true) + sep);
-			}
-			buffer.append(getIndent() + "</" + getXMLTagName() + ">"); //$NON-NLS-1$ //$NON-NLS-2$
-		} else {
-			buffer.append(writeShallow(true));
-		}
-	
-		return buffer.toString();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.plugin.PluginObjectNode#writeShallow(boolean)
-	 */
-	public String writeShallow(boolean terminate) {
-		String sep = getLineDelimiter();
-		StringBuffer buffer = new StringBuffer("<" + getXMLTagName()); //$NON-NLS-1$
-
-		IDocumentAttribute[] attrs = getNodeAttributes();
-		if (attrs.length == 1) {
-			if (attrs[0].getAttributeValue().length() > 0)
-				buffer.append(" " + attrs[0].write()); //$NON-NLS-1$
-		} else {
-			for (int i = 0; i < attrs.length; i++) {
-				if (attrs[i].getAttributeValue().length() > 0)
-					buffer.append(sep + getIndent() + "      " + attrs[i].write()); //$NON-NLS-1$
-			}
-		}
-		if (terminate)
-			buffer.append("/"); //$NON-NLS-1$
-		buffer.append(">"); //$NON-NLS-1$
-		return buffer.toString();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginObject#getName()
-	 */
-	public String getName() {
-		return getXMLTagName();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginObject#setName(java.lang.String)
-	 */
-	public void setName(String name) throws CoreException {
-		setXMLTagName(name);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginElement#getElementInfo()
-	 */
-	public Object getElementInfo() {
-		if (elementInfo == null) {
-			IDocumentNode node = getParentNode();
-			for (;;) {
-				if (node == null || node instanceof IPluginExtension)
-					break;
-				node = node.getParentNode();
-			}
-			if (node != null) {
-				IPluginExtension extension = (IPluginExtension) node;
-				ISchema schema = (ISchema)extension.getSchema();
-				if (schema != null) {
-					elementInfo = schema.findElement(getName());
-				}
-			}
-		}
-		return elementInfo;
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginExtensionNode.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginExtensionNode.java
deleted file mode 100644
index f2e1b89..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginExtensionNode.java
+++ /dev/null

@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model.plugin;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.core.ischema.*;
-import org.eclipse.pde.internal.core.schema.*;
-import org.eclipse.pde.internal.ui.model.*;
-
-public class PluginExtensionNode extends PluginParentNode
-		implements
-			IPluginExtension {
-	private static final long serialVersionUID = 1L;
-	private transient ISchema fSchema;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginExtension#getPoint()
-	 */
-	public String getPoint() {
-		return getXMLAttributeValue(P_POINT);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginExtension#setPoint(java.lang.String)
-	 */
-	public void setPoint(String point) throws CoreException {
-		setXMLAttribute(P_POINT, point);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginObject#setName(java.lang.String)
-	 */
-	public void setName(String name) throws CoreException {
-		setXMLAttribute(P_NAME, name);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginObject#getName()
-	 */
-	public String getName() {
-		return getXMLAttributeValue(P_NAME);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginObject#getTranslatedName()
-	 */
-	public String getTranslatedName() {
-		String name = getName();
-		if (name != null && name.trim().length() > 0)
-			return getResourceString(name);
-		String point = getPoint();
-		ISchema schema = PDECore.getDefault().getSchemaRegistry().getSchema(point);
-		return schema == null ? "" : schema.getName(); //$NON-NLS-1$
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IIdentifiable#getId()
-	 */
-	public String getId() {
-		return getXMLAttributeValue(P_ID);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IIdentifiable#setId(java.lang.String)
-	 */
-	public void setId(String id) throws CoreException {
-		setXMLAttribute(P_ID, id);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.plugin.PluginObjectNode#write()
-	 */
-	public String write(boolean indent) {
-		String sep = getLineDelimiter();
-		StringBuffer buffer = new StringBuffer();
-		if (indent)
-			buffer.append(getIndent());
-		buffer.append(writeShallow(false));		
-		IDocumentNode[] children = getChildNodes();
-		for (int i = 0; i < children.length; i++) {
-			children[i].setLineIndent(getLineIndent() + 3);
-			buffer.append(sep + children[i].write(true));
-		}
-		buffer.append(sep + getIndent() + "</extension>"); //$NON-NLS-1$
-		return buffer.toString();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.plugin.PluginObjectNode#writeShallow(boolean)
-	 */
-	public String writeShallow(boolean terminate) {
-		String sep = getLineDelimiter();
-		String attrIndent = "      "; //$NON-NLS-1$
-		StringBuffer buffer = new StringBuffer("<extension"); //$NON-NLS-1$
-		IDocumentAttribute attr = getDocumentAttribute(P_ID);
-		if (attr != null && attr.getAttributeValue().trim().length() > 0)
-			buffer.append(sep + getIndent() + attrIndent + attr.write());
-		attr = getDocumentAttribute(P_NAME);
-		if (attr != null && attr.getAttributeValue().trim().length() > 0)
-			buffer.append(sep + getIndent() + attrIndent + attr.write());
-		attr = getDocumentAttribute(P_POINT);
-		if (attr != null && attr.getAttributeValue().trim().length() > 0)
-			buffer.append(sep + getIndent() + attrIndent + attr.write());
-		if (terminate)
-			buffer.append("/"); //$NON-NLS-1$
-		buffer.append(">"); //$NON-NLS-1$
-		return buffer.toString();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginExtension#getSchema()
-	 */
-	public Object getSchema() {
-		if (fSchema == null) {
-			SchemaRegistry registry = PDECore.getDefault().getSchemaRegistry();
-			fSchema = registry.getSchema(getPoint());
-		} else if (fSchema.isDisposed()) {
-			fSchema = null;
-		}
-		return fSchema;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginExtensionPointNode.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginExtensionPointNode.java
deleted file mode 100644
index a72764f..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginExtensionPointNode.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model.plugin;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.pde.core.plugin.*;
-
-public class PluginExtensionPointNode extends PluginObjectNode
-		implements
-			IPluginExtensionPoint {
-
-	private static final long serialVersionUID = 1L;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginExtensionPoint#getFullId()
-	 */
-	public String getFullId() {
-		String pluginID = getPluginBase().getId();
-		return (pluginID != null) ? pluginID + "." + getId() : getId(); //$NON-NLS-1$
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginExtensionPoint#getSchema()
-	 */
-	public String getSchema() {
-		return getXMLAttributeValue("schema"); //$NON-NLS-1$
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginExtensionPoint#setSchema(java.lang.String)
-	 */
-	public void setSchema(String schema) throws CoreException {
-		setXMLAttribute(P_SCHEMA, schema);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IIdentifiable#getId()
-	 */
-	public String getId() {
-		return getXMLAttributeValue(P_ID);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IIdentifiable#setId(java.lang.String)
-	 */
-	public void setId(String id) throws CoreException {
-		setXMLAttribute(P_ID, id);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginObject#setName(java.lang.String)
-	 */
-	public void setName(String name) throws CoreException {
-		setXMLAttribute(P_NAME, name);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginObject#getName()
-	 */
-	public String getName() {
-		return getXMLAttributeValue(P_NAME);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.plugin.PluginObjectNode#write()
-	 */
-	public String write(boolean indent) {
-		return indent ? getIndent() + writeShallow(true) : writeShallow(true);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.plugin.PluginObjectNode#writeShallow(boolean)
-	 */
-	public String writeShallow(boolean terminate) {
-		StringBuffer buffer = new StringBuffer("<extension-point"); //$NON-NLS-1$
-		appendAttribute(buffer, P_ID);
-		appendAttribute(buffer, P_NAME);
-		appendAttribute(buffer, P_SCHEMA);
-
-		if (terminate)
-			buffer.append("/"); //$NON-NLS-1$
-		buffer.append(">"); //$NON-NLS-1$
-		return buffer.toString();
-	}
-	
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginImportNode.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginImportNode.java
deleted file mode 100644
index dbded4e..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginImportNode.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model.plugin;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.pde.core.plugin.*;
-
-public class PluginImportNode extends PluginObjectNode implements IPluginImport {
-
-	private static final long serialVersionUID = 1L;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginImport#isReexported()
-	 */
-	public boolean isReexported() {
-		String value = getXMLAttributeValue(P_REEXPORTED);
-		return value != null && value.equals("true"); //$NON-NLS-1$
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginImport#isOptional()
-	 */
-	public boolean isOptional() {
-		String value = getXMLAttributeValue(P_OPTIONAL);
-		return value != null && value.equals("true"); //$NON-NLS-1$
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginImport#setReexported(boolean)
-	 */
-	public void setReexported(boolean value) throws CoreException {
-		setXMLAttribute(P_REEXPORTED, value ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginImport#setOptional(boolean)
-	 */
-	public void setOptional(boolean value) throws CoreException {
-		setXMLAttribute(P_OPTIONAL, value ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginReference#getMatch()
-	 */
-	public int getMatch() {
-		String match = getXMLAttributeValue(P_MATCH);
-		if (match == null || match.trim().length() == 0)
-			return IMatchRules.NONE;
-		if (match.equals("compatible"))			 //$NON-NLS-1$
-			return IMatchRules.COMPATIBLE;		
-		if (match.equals("perfect")) //$NON-NLS-1$
-			return IMatchRules.PERFECT;
-		if (match.equals("equivalent")) //$NON-NLS-1$
-			return IMatchRules.EQUIVALENT;
-		return IMatchRules.GREATER_OR_EQUAL;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginReference#getVersion()
-	 */
-	public String getVersion() {
-		return getXMLAttributeValue(P_VERSION);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginReference#setMatch(int)
-	 */
-	public void setMatch(int match) throws CoreException {
-		switch(match) {
-			case IMatchRules.GREATER_OR_EQUAL:
-				setXMLAttribute(P_MATCH, "greaterOrEqual"); //$NON-NLS-1$
-				break;
-			case IMatchRules.EQUIVALENT:
-				setXMLAttribute(P_MATCH, "equivalent"); //$NON-NLS-1$
-				break;
-			case IMatchRules.COMPATIBLE:
-				setXMLAttribute(P_MATCH, "compatible"); //$NON-NLS-1$
-				break;
-			case IMatchRules.PERFECT:
-				setXMLAttribute(P_MATCH, "perfect"); //$NON-NLS-1$
-				break;
-			default:
-				setXMLAttribute(P_MATCH, null);
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginReference#setVersion(java.lang.String)
-	 */
-	public void setVersion(String version) throws CoreException {
-		setXMLAttribute(P_VERSION, version);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IIdentifiable#getId()
-	 */
-	public String getId() {
-		return getXMLAttributeValue("plugin"); //$NON-NLS-1$
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.IIdentifiable#setId(java.lang.String)
-	 */
-	public void setId(String id) throws CoreException {
-		setXMLAttribute("plugin", id); //$NON-NLS-1$
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.plugin.PluginObjectNode#write()
-	 */
-	public String write(boolean indent) {
-		return indent ? getIndent() + writeShallow(true) : writeShallow(true);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.plugin.PluginObjectNode#writeShallow(boolean)
-	 */
-	public String writeShallow(boolean terminate) {
-		StringBuffer buffer = new StringBuffer("<import"); //$NON-NLS-1$
-		appendAttribute(buffer, "plugin"); //$NON-NLS-1$
-		appendAttribute(buffer, P_VERSION);
-		appendAttribute(buffer, P_MATCH);
-		appendAttribute(buffer, P_REEXPORTED, "false"); //$NON-NLS-1$
-		appendAttribute(buffer, P_OPTIONAL, "false"); //$NON-NLS-1$
-
-		if (terminate)
-			buffer.append("/"); //$NON-NLS-1$
-		buffer.append(">"); //$NON-NLS-1$
-		return buffer.toString();		
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginLibraryNode.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginLibraryNode.java
deleted file mode 100644
index 937e809..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginLibraryNode.java
+++ /dev/null

@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model.plugin;
-
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.ui.model.*;
-
-public class PluginLibraryNode extends PluginObjectNode implements IPluginLibrary {
-
-	private static final long serialVersionUID = 1L;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginLibrary#getContentFilters()
-	 */
-	public String[] getContentFilters() {
-		IDocumentNode[] children = getChildNodes();
-		ArrayList result = new ArrayList();
-		for (int i = 0; i < children.length; i++) {
-			PluginObjectNode node = (PluginObjectNode)children[i];
-			if (node.getName().equals(P_EXPORTED)) {
-				String name = children[i].getXMLAttributeValue(P_NAME);
-				if (name != null && !name.equals("*")) { //$NON-NLS-1$
-					int index = name.indexOf(".*"); //$NON-NLS-1$
-					if (index != -1)
-						name = name.substring(0, index);
-					result.add(name);
-				}
-			}
-		}
-		return (String[])result.toArray(new String[result.size()]);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginLibrary#getPackages()
-	 */
-	public String[] getPackages() {
-		return new String[0];
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginLibrary#isExported()
-	 */
-	public boolean isExported() {
-		IDocumentNode[] children = getChildNodes();
-		for (int i = 0; i < children.length; i++) {
-			PluginObjectNode node = (PluginObjectNode)children[i];
-			if (node.getName().equals(P_EXPORTED))
-				return true;
-		}
-		return false;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginLibrary#isFullyExported()
-	 */
-	public boolean isFullyExported() {
-		IDocumentNode[] children = getChildNodes();
-		for (int i = 0; i < children.length; i++) {
-			PluginObjectNode node = (PluginObjectNode)children[i];
-			if (node.getName().equals(P_EXPORTED)) {
-				String name = children[i].getXMLAttributeValue(P_NAME);
-				if (name != null && name.equals("*")) //$NON-NLS-1$
-					return true;
-			}
-		}
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginLibrary#getType()
-	 */
-	public String getType() {
-		String type = getXMLAttributeValue(P_TYPE);
-		return (type != null && type.equals("resource")) ? IPluginLibrary.RESOURCE : IPluginLibrary.CODE; //$NON-NLS-1$
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginLibrary#setContentFilters(java.lang.String[])
-	 */
-	public void setContentFilters(String[] filters) throws CoreException {
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginLibrary#addContentFilter(java.lang.String)
-	 */
-	public void addContentFilter(String filter) throws CoreException {
-		PluginElementNode node = new PluginElementNode();
-		node.setXMLTagName(P_EXPORTED);
-		node.setParentNode(this);
-		node.setModel(getModel());
-		node.setXMLAttribute(P_NAME, "*".equals(filter) || filter.endsWith(".*") ? filter : filter + ".*"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		addContentFilter(node);
-	}
-	
-	public void addContentFilter(PluginElementNode node) throws CoreException {
-		addChildNode(node);
-		if (isInTheModel()) {
-			node.setInTheModel(true);
-			fireStructureChanged(node, IModelChangedEvent.INSERT);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginLibrary#removeContentFilter(java.lang.String)
-	 */
-	public void removeContentFilter(String filter) throws CoreException {
-		if (!filter.endsWith(".*")) //$NON-NLS-1$
-			filter += ".*"; //$NON-NLS-1$
-		IDocumentNode[] children = getChildNodes();
-		for (int i = 0; i < children.length; i++) {
-			if (children[i].getXMLTagName().equals(P_EXPORTED)
-				   && filter.equals(children[i].getXMLAttributeValue(P_NAME))) {
-				removeContentFilter((PluginElementNode)children[i]);
-			}
-		}		
-	}
-	
-	public void removeContentFilter(PluginElementNode node) {
-		removeChildNode(node);
-		if (isInTheModel()) {
-			node.setInTheModel(false);
-			fireStructureChanged(node, IModelChangedEvent.REMOVE);
-		}		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginLibrary#setPackages(java.lang.String[])
-	 */
-	public void setPackages(String[] packages) throws CoreException {
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginLibrary#setExported(boolean)
-	 */
-	public void setExported(boolean exported) throws CoreException {
-		IDocumentNode[] children = getChildNodes();
-		boolean alreadyExported = false;
-		for (int i = 0; i < children.length; i++) {
-			if (children[i].getXMLTagName().equals(P_EXPORTED)) {
-				if (!"*".equals(children[i].getXMLAttributeValue(P_NAME))) { //$NON-NLS-1$
-					removeContentFilter((PluginElementNode)children[i]);
-				} else {
-					alreadyExported = true;
-					if (!exported) {
-						removeContentFilter((PluginElementNode)children[i]);
-					}
-				}
-			}
-		}
-		if (exported && !alreadyExported) {
-			addContentFilter("*"); //$NON-NLS-1$
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginLibrary#setType(java.lang.String)
-	 */
-	public void setType(String type) throws CoreException {
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginObject#getName()
-	 */
-	public String getName() {
-		return getXMLAttributeValue(P_NAME);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginObject#setName(java.lang.String)
-	 */
-	public void setName(String name) throws CoreException {
-		setXMLAttribute(P_NAME, name);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.plugin.PluginObjectNode#write()
-	 */
-	public String write(boolean indent) {
-		String sep = getLineDelimiter();
-		StringBuffer buffer = new StringBuffer();
-		if (indent)
-			buffer.append(getIndent());
-		
-		IDocumentNode[] children = getChildNodes();
-		if (children.length > 0) {
-			buffer.append(writeShallow(false) + sep);		
-			for (int i = 0; i < children.length; i++) {
-				children[i].setLineIndent(getLineIndent() + 3);
-				buffer.append(children[i].write(true) + sep);
-			}
-			buffer.append(getIndent() + "</" + getXMLTagName() + ">"); //$NON-NLS-1$ //$NON-NLS-2$
-		} else {
-			buffer.append(writeShallow(true));
-		}
-		return buffer.toString();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.plugin.PluginObjectNode#writeShallow(boolean)
-	 */
-	public String writeShallow(boolean terminate) {
-		StringBuffer buffer = new StringBuffer("<" + getXMLTagName()); //$NON-NLS-1$
-
-		IDocumentAttribute[] attrs = getNodeAttributes();
-		for (int i = 0; i < attrs.length; i++) {
-			appendAttribute(buffer, attrs[i].getAttributeName());
-		}
-		if (terminate)
-			buffer.append("/"); //$NON-NLS-1$
-		buffer.append(">"); //$NON-NLS-1$
-		return buffer.toString();
-	}
-    
-    public String toString() {
-        return getName();
-    }
-
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginModel.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginModel.java
deleted file mode 100644
index 44879be..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginModel.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model.plugin;
-
-import org.eclipse.jface.text.*;
-import org.eclipse.osgi.service.resolver.*;
-import org.eclipse.pde.core.plugin.*;
-
-public class PluginModel extends PluginModelBase implements IPluginModel {
-	
-	public PluginModel(IDocument document, boolean isReconciling) {
-		super(document, isReconciling);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginModel#getPlugin()
-	 */
-	public IPlugin getPlugin() {
-		return (IPlugin)getPluginBase();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginModelBase#isFragmentModel()
-	 */
-	public boolean isFragmentModel() {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginModelBase#getBundleDescription()
-	 */
-	public BundleDescription getBundleDescription() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginModelBase#setBundleDescription(org.eclipse.osgi.service.resolver.BundleDescription)
-	 */
-	public void setBundleDescription(BundleDescription description) {
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginModelBase.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginModelBase.java
deleted file mode 100644
index 8e40fe1..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginModelBase.java
+++ /dev/null

@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model.plugin;
-
-import java.net.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.text.*;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.core.build.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.*;
-import org.eclipse.pde.internal.ui.model.*;
-import org.xml.sax.helpers.*;
-
-public abstract class PluginModelBase extends XMLEditingModel implements IPluginModelBase {
-
-	private PluginBaseNode fPluginBase;
-	private boolean fIsEnabled;
-	private PluginDocumentHandler fHandler;
-	private NodeOffsetHandler fNodeOffsetHandler;
-	private IPluginModelFactory fFactory;
-	
-	public PluginModelBase(IDocument document, boolean isReconciling) {
-		super(document, isReconciling);	
-		fFactory = new PluginDocumentNodeFactory(this);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginModelBase#createPluginBase()
-	 */
-	public IPluginBase createPluginBase(boolean isFragment) {
-		if (isFragment) {
-			fPluginBase = new FragmentNode();
-			fPluginBase.setXMLTagName("fragment"); //$NON-NLS-1$
-		} else {
-			fPluginBase = new PluginNode();
-			fPluginBase.setXMLTagName("plugin"); //$NON-NLS-1$
-		}
-		fPluginBase.setInTheModel(true);
-		fPluginBase.setModel(this);
-		return fPluginBase;
-	}
-	
-	public IPluginBase createPluginBase() {
-		return createPluginBase(isFragmentModel());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginModelBase#getBuildModel()
-	 */
-	public IBuildModel getBuildModel() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginModelBase#getPluginBase()
-	 */
-	public IPluginBase getPluginBase() {
-		return getPluginBase(true);
-	}
-	
-	public IExtensions getExtensions() {
-		return getPluginBase();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginModelBase#getPluginBase(boolean)
-	 */
-	public IPluginBase getPluginBase(boolean createIfMissing) {
-		if (!fLoaded && createIfMissing) {
-			createPluginBase();
-			try {
-				load();
-			} catch (CoreException e) {
-			}
-		}
-		return fPluginBase;
-	}
-	
-	public IExtensions getExtensions(boolean createIfMissing) {
-		return getPluginBase(createIfMissing);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginModelBase#isEnabled()
-	 */
-	public boolean isEnabled() {
-		return fIsEnabled;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginModelBase#setEnabled(boolean)
-	 */
-	public void setEnabled(boolean enabled) {
-		fIsEnabled = enabled;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginModelBase#getPluginFactory()
-	 */
-	public IPluginModelFactory getPluginFactory() {
-		return fFactory;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginModelBase#getNLLookupLocation()
-	 */
-	public URL getNLLookupLocation() {
-		try {
-			String installLocation = getInstallLocation();
-			return installLocation == null ? null : new URL("file:" + installLocation); //$NON-NLS-1$
-		} catch (MalformedURLException e) {
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.ISharedPluginModel#getFactory()
-	 */
-	public IExtensionsModelFactory getFactory() {
-		return fFactory;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.AbstractEditingModel#createNLResourceHelper()
-	 */
-	protected NLResourceHelper createNLResourceHelper() {
-		URL[] locations = PDEManager.getNLLookupLocations(this);
-		return (locations.length == 0)
-				? null 
-				: new NLResourceHelper("plugin", locations); //$NON-NLS-1$
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.XMLEditingModel#createDocumentHandler(org.eclipse.pde.core.IModel)
-	 */
-	protected DefaultHandler createDocumentHandler(IModel model) {
-		if (fHandler == null)
-			fHandler = new PluginDocumentHandler(this);
-		return fHandler;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.XMLEditingModel#createNodeOffsetHandler(org.eclipse.pde.core.IModel)
-	 */
-	protected DefaultHandler createNodeOffsetHandler(IModel model) {
-		if (fNodeOffsetHandler == null)
-			fNodeOffsetHandler = new NodeOffsetHandler(this);
-		return fNodeOffsetHandler;
-	}	
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginNode.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginNode.java
deleted file mode 100644
index 5c1c7f3..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginNode.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model.plugin;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.pde.core.plugin.*;
-
-public class PluginNode extends PluginBaseNode implements IPlugin {
-
-	private static final long serialVersionUID = 1L;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPlugin#getClassName()
-	 */
-	public String getClassName() {
-		return getXMLAttributeValue(P_CLASS_NAME);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPlugin#setClassName(java.lang.String)
-	 */
-	public void setClassName(String className) throws CoreException {
-		setXMLAttribute(P_CLASS_NAME, className);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.model.plugin.PluginBaseNode#getSpecificAttributes()
-	 */
-	protected String[] getSpecificAttributes() {
-		String classname = getClassName();
-		if (classname != null && classname.trim().length() > 0)
-			return new String[] {"   " + P_CLASS_NAME + "=\"" + classname + "\""}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		return new String[0];
-	}
-	public boolean hasExtensibleAPI() {
-		return false;
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginObjectNode.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginObjectNode.java
deleted file mode 100644
index 949958d..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginObjectNode.java
+++ /dev/null

@@ -1,239 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model.plugin;
-
-import java.io.PrintWriter;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.TextUtilities;
-import org.eclipse.pde.core.IModel;
-import org.eclipse.pde.core.IModelChangeProvider;
-import org.eclipse.pde.core.IModelChangedEvent;
-import org.eclipse.pde.core.ModelChangedEvent;
-import org.eclipse.pde.core.plugin.IPluginBase;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.core.plugin.IPluginObject;
-import org.eclipse.pde.core.plugin.ISharedPluginModel;
-import org.eclipse.pde.internal.core.util.CoreUtility;
-import org.eclipse.pde.internal.ui.model.IDocumentAttribute;
-import org.eclipse.pde.internal.ui.model.IDocumentNode;
-import org.eclipse.pde.internal.ui.model.IEditingModel;
-
-public class PluginObjectNode extends PluginDocumentNode
-		implements
-			IPluginObject {
-
-	private static final long serialVersionUID = 1L;
-	private String fName;
-	private boolean fInTheModel;
-	private transient ISharedPluginModel fModel;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.core.plugin.IPluginObject#getModel()
-	 */
-	public ISharedPluginModel getModel() {
-		return fModel;
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.core.plugin.IPluginObject#getPluginModel()
-	 */
-	public IPluginModelBase getPluginModel() {
-		return (IPluginModelBase) fModel;
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.core.plugin.IPluginObject#getName()
-	 */
-	public String getName() {
-		return fName;
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.core.plugin.IPluginObject#isInTheModel()
-	 */
-	public boolean isInTheModel() {
-		return fInTheModel;
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.core.plugin.IPluginObject#getTranslatedName()
-	 */
-	public String getTranslatedName() {
-		return getResourceString(getName());
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.core.plugin.IPluginObject#getParent()
-	 */
-	public IPluginObject getParent() {
-		return (IPluginObject) getParentNode();
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.core.plugin.IPluginObject#getPluginBase()
-	 */
-	public IPluginBase getPluginBase() {
-		return fModel != null
-				? ((IPluginModelBase) fModel).getPluginBase()
-				: null;
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.core.plugin.IPluginObject#getResourceString(java.lang.String)
-	 */
-	public String getResourceString(String key) {
-		return fModel != null ? fModel.getResourceString(key) : key;
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.core.plugin.IPluginObject#setName(java.lang.String)
-	 */
-	public void setName(String name) throws CoreException {
-		fName = name;
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.core.plugin.IPluginObject#isValid()
-	 */
-	public boolean isValid() {
-		return false;
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.core.IWritable#write(java.lang.String,
-	 *      java.io.PrintWriter)
-	 */
-	public void write(String indent, PrintWriter writer) {
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		return null;
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.core.plugin.IPluginObject#setInTheModel(boolean)
-	 */
-	public void setInTheModel(boolean inModel) {
-		fInTheModel = inModel;
-	}
-
-	public void setModel(ISharedPluginModel model) {
-		fModel = model;
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentNode#setXMLAttribute(java.lang.String,
-	 *      java.lang.String)
-	 */
-	public void setXMLAttribute(String name, String value) {
-		String oldValue = getXMLAttributeValue(name);
-		PluginAttribute attr = (PluginAttribute) fAttributes.get(name);
-		try {
-			if (value == null)
-				value = ""; //$NON-NLS-1$
-				if (attr == null) {
-					attr = new PluginAttribute();
-					attr.setName(name);
-					attr.setEnclosingElement(this);
-					fAttributes.put(name, attr);
-				}
-				attr.setValue(value == null ? "" : value); //$NON-NLS-1$
-		} catch (CoreException e) {
-		}
-		if (fInTheModel)
-			firePropertyChanged(attr.getEnclosingElement(), attr
-					.getAttributeName(), oldValue, value);
-	}
-
-	protected void firePropertyChanged(IDocumentNode node, String property,
-			Object oldValue, Object newValue) {
-		if (fModel.isEditable()) {
-			fModel.fireModelObjectChanged(node, property, oldValue, newValue);
-		}
-	}
-
-	protected void fireStructureChanged(IPluginObject child, int changeType) {
-		IModel model = getModel();
-		if (model.isEditable() && model instanceof IModelChangeProvider) {
-			IModelChangedEvent e = new ModelChangedEvent(fModel, changeType,
-					new Object[]{child}, null);
-			fireModelChanged(e);
-		}
-	}
-
-	protected void fireModelChanged(IModelChangedEvent e) {
-		IModel model = getModel();
-		if (model.isEditable() && model instanceof IModelChangeProvider) {
-			IModelChangeProvider provider = (IModelChangeProvider) model;
-			provider.fireModelChanged(e);
-		}
-	}
-
-	public String getWritableString(String source) {
-		return CoreUtility.getWritableString(source);
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentNode#writeShallow()
-	 */
-	public String writeShallow(boolean terminate) {
-		return ""; //$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.pde.internal.ui.model.IDocumentNode#write()
-	 */
-	public String write(boolean indent) {
-		return ""; //$NON-NLS-1$
-	}
-
-	protected void appendAttribute(StringBuffer buffer, String attrName) {
-		appendAttribute(buffer, attrName, ""); //$NON-NLS-1$
-	}
-	
-	protected void appendAttribute(StringBuffer buffer, String attrName, String defaultValue) {
-		IDocumentAttribute attr = getDocumentAttribute(attrName);
-		if (attr != null) {
-			String value = attr.getAttributeValue();
-			if (value != null && value.trim().length() > 0 && !value.equals(defaultValue))
-				buffer.append(" " + attr.write()); //$NON-NLS-1$
-		}
-	}
-	
-	public String getLineDelimiter() {
-		return TextUtilities.getDefaultLineDelimiter(((IEditingModel)getModel()).getDocument());
-	}
-	
-
-
-}

diff --git a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginParentNode.java b/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginParentNode.java
deleted file mode 100644
index cd2bd45..0000000
--- a/ui/org.eclipse.pde.ui/src_Forms/org/eclipse/pde/internal/ui/model/plugin/PluginParentNode.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.model.plugin;
-
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.pde.core.*;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.ui.model.*;
-
-public class PluginParentNode extends PluginObjectNode implements IPluginParent {
-
-	private static final long serialVersionUID = 1L;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginParent#add(int, org.eclipse.pde.core.plugin.IPluginObject)
-	 */
-	public void add(int index, IPluginObject child) throws CoreException {
-		addChildNode((IDocumentNode)child, index);
-		fireStructureChanged(child, IModelChangedEvent.INSERT);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginParent#add(org.eclipse.pde.core.plugin.IPluginObject)
-	 */
-	public void add(IPluginObject child) throws CoreException {
-		add(getChildCount(), child);
-		child.setInTheModel(true);
-		((PluginObjectNode)child).setModel(getModel());
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginParent#getChildCount()
-	 */
-	public int getChildCount() {
-		return getChildNodes().length;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginParent#getIndexOf(org.eclipse.pde.core.plugin.IPluginObject)
-	 */
-	public int getIndexOf(IPluginObject child) {
-		return indexOf((IDocumentNode)child);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginParent#swap(org.eclipse.pde.core.plugin.IPluginObject, org.eclipse.pde.core.plugin.IPluginObject)
-	 */
-	public void swap(IPluginObject child1, IPluginObject child2)
-			throws CoreException {
-		swap((IDocumentNode)child1, (IDocumentNode)child2);
-		firePropertyChanged(this, P_SIBLING_ORDER, child1, child2);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginParent#getChildren()
-	 */
-	public IPluginObject[] getChildren() {
-		ArrayList result = new ArrayList();
-		IDocumentNode[] nodes = getChildNodes();
-		for (int i = 0; i < nodes.length; i++)
-			result.add(nodes[i]);
-					  
-		return (IPluginObject[])result.toArray(new IPluginObject[result.size()]);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.core.plugin.IPluginParent#remove(org.eclipse.pde.core.plugin.IPluginObject)
-	 */
-	public void remove(IPluginObject child) throws CoreException {
-		removeChildNode((IDocumentNode)child);
-		child.setInTheModel(false);
-		fireStructureChanged(child, IModelChangedEvent.REMOVE);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src_ant/org/eclipse/pde/internal/ui/ant/BaseExportTask.java b/ui/org.eclipse.pde.ui/src_ant/org/eclipse/pde/internal/ui/ant/BaseExportTask.java
deleted file mode 100644
index fb66342..0000000
--- a/ui/org.eclipse.pde.ui/src_ant/org/eclipse/pde/internal/ui/ant/BaseExportTask.java
+++ /dev/null

@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.ant;
-
-import org.apache.tools.ant.*;
-import org.eclipse.core.runtime.jobs.*;
-
-public abstract class BaseExportTask extends Task {
-	
-	protected String fDestination;
-	protected String fZipFilename;
-	protected boolean fToDirectory;
-	protected boolean fUseJarFormat;
-	protected boolean fExportSource;
-	protected String fJavacTarget;
-	protected String fJavacSource;
-
-	public BaseExportTask() {
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.apache.tools.ant.Task#execute()
-	 */
-	public void execute() throws BuildException {
-		if (fDestination == null)
-			throw new BuildException("No destination is specified"); //$NON-NLS-1$
-		
-		if (!fToDirectory && fZipFilename == null)
-			throw new BuildException("No zip file is specified"); //$NON-NLS-1$
-		
-		getExportJob().schedule(2000);
-	}
-	
-	public void setExportType(String type) {
-		fToDirectory = !"zip".equals(type); //$NON-NLS-1$
-	}
-	
-	public void setUseJARFormat(String useJarFormat) {
-		fUseJarFormat = "true".equals(useJarFormat); //$NON-NLS-1$
-	}
-	
-	public void setExportSource(String doExportSource) {
-		fExportSource = "true".equals(doExportSource); //$NON-NLS-1$
-	}
-	
-	public void setDestination(String destination) {
-		fDestination = destination;
-	}
-	
-	public void setFilename(String filename) {
-		fZipFilename = filename;
-	}
-	
-	public void setTarget(String target) {
-		fJavacTarget = target;
-	}
-	
-	public void setSource(String source) {
-		fJavacSource = source;
-	}
-	
-	protected abstract Job getExportJob();
-}

diff --git a/ui/org.eclipse.pde.ui/src_ant/org/eclipse/pde/internal/ui/ant/ExportBuildListener.java b/ui/org.eclipse.pde.ui/src_ant/org/eclipse/pde/internal/ui/ant/ExportBuildListener.java
deleted file mode 100644
index d3de7db..0000000
--- a/ui/org.eclipse.pde.ui/src_ant/org/eclipse/pde/internal/ui/ant/ExportBuildListener.java
+++ /dev/null

@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.ant;
-
-import org.apache.tools.ant.BuildEvent;
-import org.apache.tools.ant.BuildListener;
-import org.apache.tools.ant.Project;
-import org.eclipse.pde.internal.ui.build.FeatureExportJob;
-
-public class ExportBuildListener implements BuildListener {
-	
-	/* (non-Javadoc)
-	 * @see org.apache.tools.ant.BuildListener#buildStarted(org.apache.tools.ant.BuildEvent)
-	 */
-	public void buildStarted(BuildEvent event) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.tools.ant.BuildListener#buildFinished(org.apache.tools.ant.BuildEvent)
-	 */
-	public void buildFinished(BuildEvent event) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.tools.ant.BuildListener#targetStarted(org.apache.tools.ant.BuildEvent)
-	 */
-	public void targetStarted(BuildEvent event) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.tools.ant.BuildListener#targetFinished(org.apache.tools.ant.BuildEvent)
-	 */
-	public void targetFinished(BuildEvent event) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.tools.ant.BuildListener#taskStarted(org.apache.tools.ant.BuildEvent)
-	 */
-	public void taskStarted(BuildEvent event) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.tools.ant.BuildListener#taskFinished(org.apache.tools.ant.BuildEvent)
-	 */
-	public void taskFinished(BuildEvent event) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.tools.ant.BuildListener#messageLogged(org.apache.tools.ant.BuildEvent)
-	 */
-	public void messageLogged(BuildEvent event) {
-		if (event.getPriority() == Project.MSG_ERR) {
-			FeatureExportJob.errorFound();
-		}
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/src_ant/org/eclipse/pde/internal/ui/ant/FeatureExportTask.java b/ui/org.eclipse.pde.ui/src_ant/org/eclipse/pde/internal/ui/ant/FeatureExportTask.java
deleted file mode 100644
index 157f139..0000000
--- a/ui/org.eclipse.pde.ui/src_ant/org/eclipse/pde/internal/ui/ant/FeatureExportTask.java
+++ /dev/null

@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.ant;
-
-import java.util.ArrayList;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.WorkspaceModelManager;
-import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
-import org.eclipse.pde.internal.ui.build.FeatureExportInfo;
-import org.eclipse.pde.internal.ui.build.FeatureExportJob;
-
-public class FeatureExportTask extends BaseExportTask {
-	private IFeatureModel[] fFeatures = new IFeatureModel[0];
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.ant.BaseExportTask#getExportJob()
-	 */
-	protected Job getExportJob() {
-		FeatureExportInfo info = new FeatureExportInfo();
-		info.toDirectory = fToDirectory;
-		info.useJarFormat = fUseJarFormat;
-		info.exportSource = fExportSource;
-		info.destinationDirectory = fDestination;
-		info.zipFileName = fZipFilename;
-		info.items = fFeatures;
-		info.javacSource = fJavacSource;
-		info.javacTarget = fJavacTarget;
-		return new FeatureExportJob(info);
-	}
-	
-	public void setFeatures(String features) {
-		StringTokenizer tok = new StringTokenizer(features, ","); //$NON-NLS-1$
-		ArrayList list = new ArrayList();
-		while (tok.hasMoreTokens()) {
-			list.add(tok.nextToken().trim());
-		}
-		
-		WorkspaceModelManager manager = PDECore.getDefault().getWorkspaceModelManager();
-		ArrayList featureList = new ArrayList();
-		IFeatureModel[] models = manager.getFeatureModels();
-		for (int i = 0; i < models.length; i++) {
-			String id = models[i].getFeature().getId();
-			if (list.contains(id))
-				featureList.add(models[i]);			
-		}
-		fFeatures = (IFeatureModel[])featureList.toArray(new IFeatureModel[featureList.size()]);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src_ant/org/eclipse/pde/internal/ui/ant/PluginExportTask.java b/ui/org.eclipse.pde.ui/src_ant/org/eclipse/pde/internal/ui/ant/PluginExportTask.java
deleted file mode 100644
index 8f4758c..0000000
--- a/ui/org.eclipse.pde.ui/src_ant/org/eclipse/pde/internal/ui/ant/PluginExportTask.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.internal.ui.ant;
-
-import java.util.ArrayList;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.pde.core.plugin.IMatchRules;
-import org.eclipse.pde.core.plugin.IPluginModelBase;
-import org.eclipse.pde.internal.core.PDECore;
-import org.eclipse.pde.internal.core.PluginModelManager;
-import org.eclipse.pde.internal.ui.build.FeatureExportInfo;
-import org.eclipse.pde.internal.ui.build.PluginExportJob;
-
-public class PluginExportTask extends BaseExportTask {
-	protected IPluginModelBase[] fPlugins = new IPluginModelBase[0];
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.pde.internal.ui.ant.BaseExportTask#getExportJob()
-	 */
-	protected Job getExportJob() {
-		FeatureExportInfo info = new FeatureExportInfo();
-		info.toDirectory = fToDirectory;
-		info.useJarFormat = fUseJarFormat;
-		info.exportSource = fExportSource;
-		info.destinationDirectory = fDestination;
-		info.zipFileName = fZipFilename;
-		info.items = fPlugins;
-		info.javacSource = fJavacSource;
-		info.javacTarget = fJavacTarget;
-		return new PluginExportJob(info);
-	}
-	
-	public void setPlugins(String plugins) {
-		StringTokenizer tok = new StringTokenizer(plugins, ","); //$NON-NLS-1$
-		PluginModelManager manager = PDECore.getDefault().getModelManager();
-		ArrayList models = new ArrayList();
-		while (tok.hasMoreTokens()) {
-			String id = tok.nextToken().trim();
-			IPluginModelBase model = manager.findPlugin(id, null, IMatchRules.NONE);
-			if (model != null && model.getUnderlyingResource() != null)
-				models.add(model);
-		}
-		fPlugins = (IPluginModelBase[])models.toArray(new IPluginModelBase[models.size()]);
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/ProjectNamesPage.java b/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/ProjectNamesPage.java
deleted file mode 100644
index ac83caf..0000000
--- a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/ProjectNamesPage.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 Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.internal.samples;
-
-import java.util.HashSet;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.PlatformUI;
-
-/**
- *
- */
-public class ProjectNamesPage extends WizardPage {
-	private SampleWizard wizard;
-	private Composite container;
-	/**
-	 * @param pageName
-	 */
-	public ProjectNamesPage(SampleWizard wizard) {
-		super("projects"); //$NON-NLS-1$
-		this.wizard = wizard;
-		setTitle(PDEUIMessages.ProjectNamesPage_title); 
-		setDescription(PDEUIMessages.ProjectNamesPage_desc); 
-	}
-	public void setVisible(boolean visible) {
-		setPageComplete(wizard.getSelection()!=null);
-		if (container!=null) updateEntries();
-		super.setVisible(visible);
-	}
-	
-	private void updateEntries() {
-		IConfigurationElement selection = wizard.getSelection();
-		if (selection!=null) {
-			setMessage(null);
-			IConfigurationElement [] projects = selection.getChildren("project"); //$NON-NLS-1$
-			Control [] children = container.getChildren();
-			if (projects.length==1 && children.length==2) {
-				Text text = (Text)children[1];
-				text.setText(projects[0].getAttribute("name")); //$NON-NLS-1$
-				validateEntries();
-				return;
-			}
-			// dispose all
-			for (int i=0; i<children.length; i++) {
-				children[i].dispose();
-			}
-			// create entries
-			if (projects.length==1) {
-				createEntry(PDEUIMessages.ProjectNamesPage_projectName, projects[0].getAttribute("name")); //$NON-NLS-1$ 
-			}
-			else {
-				for (int i=0; i<projects.length; i++) {
-					String label = NLS.bind(PDEUIMessages.ProjectNamesPage_multiProjectName, ""+(i+1)); //$NON-NLS-1$ 
-					createEntry(label, projects[i].getAttribute("name")); //$NON-NLS-1$
-				}
-			}
-			container.layout();
-			validateEntries();
-		}
-		else {
-			setMessage(PDEUIMessages.ProjectNamesPage_noSampleFound, WizardPage.WARNING); 
-		}
-	}
-	public String [] getProjectNames() {
-		Control [] children = container.getChildren();
-		String [] names = new String[children.length/2];
-
-		int index=0;
-		for (int i=0; i<children.length; i++) {
-			if (children[i] instanceof Text) {
-				String name = ((Text)children[i]).getText();
-				names[index++] = name;
-			}
-		}
-		return names;
-	}
-	private void createEntry(String labelName, String projectName) {
-		Label label = new Label(container, SWT.NULL);
-		label.setText(labelName);
-		label.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_CENTER));
-		final Text text = new Text(container, SWT.SINGLE|SWT.BORDER);
-		text.setText(projectName);
-		text.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				validateEntries();
-			}
-		});
-		text.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-	}
-	private void validateEntries() {
-		Control [] children = container.getChildren();
-		boolean empty=false;
-		
-		HashSet set = new HashSet();
-		for (int i=0; i<children.length; i++) {
-			if (children[i] instanceof Text) {
-				String name = ((Text)children[i]).getText();
-				if (name.length()==0) {
-					empty=true;
-					break;
-				}
-				IStatus nameStatus = PDEPlugin.getWorkspace().validateName(name, IResource.PROJECT);
-				if (!nameStatus.isOK()) {
-					setErrorMessage(nameStatus.getMessage());
-					setPageComplete(false);
-					return;
-				}
-				set.add(name);
-			}
-		}
-		if (empty) {
-			setErrorMessage(PDEUIMessages.ProjectNamesPage_emptyName); 
-			setPageComplete(false);
-		}
-		else {
-			int nnames = set.size();
-			int nfields = children.length/2;
-			if (nfields>nnames) {
-				setErrorMessage(PDEUIMessages.ProjectNamesPage_duplicateNames); 
-				setPageComplete(false);
-			}
-			else {
-				setPageComplete(true);
-				setErrorMessage(null);
-			}
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		container = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		container.setLayout(layout);
-		setControl(container);
-		updateEntries();
-		
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(container, IHelpContextIds.PROJECT_NAMES);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/ReviewPage.java b/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/ReviewPage.java
deleted file mode 100644
index 1239893..0000000
--- a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/ReviewPage.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.internal.samples;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.HyperlinkSettings;
-import org.eclipse.ui.forms.widgets.ScrolledFormText;
-
-public class ReviewPage extends WizardPage {
-	private SampleWizard wizard;
-	private ScrolledFormText formText;
-	/**
-	 * @param pageName
-	 */
-	public ReviewPage(SampleWizard wizard) {
-		super("last"); //$NON-NLS-1$
-		this.wizard = wizard;
-		setTitle(PDEUIMessages.ReviewPage_title); 
-		setDescription(PDEUIMessages.ReviewPage_desc); 
-	}
-	public void setVisible(boolean visible) {
-		setPageComplete(wizard.getSelection()!=null);			
-		if (formText!=null)
-			updateContent();
-		super.setVisible(visible);
-	}
-	
-	private void updateContent() {
-		StringBuffer buf = new StringBuffer();
-		buf.append("<form>"); //$NON-NLS-1$
-		IConfigurationElement selection = wizard.getSelection();
-		if (selection!=null) {
-			setMessage(null);
-			IConfigurationElement [] desc = selection.getChildren("description");  //$NON-NLS-1$
-			if (desc.length==1)
-				buf.append(NLS.bind(PDEUIMessages.ReviewPage_descContent, (new String[]{selection.getAttribute("name"), desc[0].getValue()}))); //$NON-NLS-1$ 
-			else
-				buf.append(NLS.bind(PDEUIMessages.ReviewPage_content, selection.getAttribute("name"))); //$NON-NLS-1$ 
-		}
-		else {
-			setMessage(PDEUIMessages.ReviewPage_noSampleFound, WizardPage.WARNING); 
-		}
-		buf.append("</form>"); //$NON-NLS-1$
-		formText.setText(buf.toString());
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		container.setLayout(layout);
-		formText = new ScrolledFormText(container, true);
-		formText.setBackground(parent.getBackground());
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.widthHint = 300;
-		gd.heightHint = 300;
-		formText.setLayoutData(gd);
-		HyperlinkSettings settings = new HyperlinkSettings(parent.getDisplay());
-		formText.getFormText().setHyperlinkSettings(settings);
-		setControl(container);
-		updateContent();
-		
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(container, IHelpContextIds.REVIEW);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/SampleEditor.java b/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/SampleEditor.java
deleted file mode 100644
index 85cd8e8..0000000
--- a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/SampleEditor.java
+++ /dev/null

@@ -1,222 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.internal.samples;
-import java.io.*;
-import java.util.Properties;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.ui.ILaunchShortcut;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.pde.internal.ui.launcher.RuntimeWorkbenchShortcut;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.forms.events.*;
-import org.eclipse.ui.forms.widgets.*;
-import org.eclipse.ui.part.EditorPart;
-/**
- * @see EditorPart
- */
-public class SampleEditor extends EditorPart {
-	private FormToolkit toolkit;
-	private ScrolledForm form;
-	private FormText descText;
-	private FormText instText;
-	private ILaunchShortcut defaultShortcut;
-	private InputFileListener inputFileListener;
-	
-	class InputFileListener implements IResourceChangeListener, IResourceDeltaVisitor {
-		public void resourceChanged(IResourceChangeEvent event) {
-			if (event.getType()==IResourceChangeEvent.POST_CHANGE) {
-				IResourceDelta delta = event.getDelta();
-				try {
-					delta.accept(this);
-				}
-				catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		}
-		public boolean visit(IResourceDelta delta) throws CoreException {
-			IResource resource = delta.getResource();
-			if (resource instanceof IFile) {
-				IFile file = (IFile)resource;
-				if (file.equals(((IFileEditorInput)getEditorInput()).getFile())) {
-					if (delta.getKind()==IResourceDelta.REMOVED ||
-							delta.getKind()==IResourceDelta.REPLACED)
-						close();
-					return false;
-				}
-			}
-			return true;
-		}
-	}
-	/**
-	 *  
-	 */
-	public SampleEditor() {
-		defaultShortcut = new RuntimeWorkbenchShortcut();
-		PDEPlugin.getDefault().getLabelProvider().connect(this);
-	}
-	/**
-	 * @see EditorPart#createPartControl
-	 */
-	public void createPartControl(Composite parent) {
-		toolkit = new FormToolkit(parent.getDisplay());
-		form = toolkit.createScrolledForm(parent);
-		Properties properties = loadContent();
-		form.setText(properties.getProperty("name")); //$NON-NLS-1$
-		TableWrapLayout layout = new TableWrapLayout();
-		layout.verticalSpacing = 10;
-		layout.topMargin = 10;
-		layout.bottomMargin = 10;
-		layout.leftMargin = 10;
-		layout.rightMargin = 10;
-		form.getBody().setLayout(layout);
-		
-		final String launcher = properties.getProperty("launcher"); //$NON-NLS-1$
-		final String launchTarget = properties.getProperty("launchTarget"); //$NON-NLS-1$
-		
-		descText = toolkit.createFormText(form.getBody(), true);
-		descText.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
-		String desc = properties.getProperty("description"); //$NON-NLS-1$
-		String content = NLS.bind(PDEUIMessages.SampleEditor_desc, (desc!=null?desc:"")); //$NON-NLS-1$ 
-		descText.setText(content, true, false);
-		final String helpURL = properties.getProperty("helpHref"); //$NON-NLS-1$
-		if (helpURL!=null) {
-			Hyperlink moreLink = toolkit.createHyperlink(form.getBody(), "Read More", SWT.NULL); //$NON-NLS-1$
-			moreLink.addHyperlinkListener(new HyperlinkAdapter() {
-				public void linkActivated(HyperlinkEvent e) {
-					PlatformUI.getWorkbench().getHelpSystem().displayHelpResource(helpURL);
-				}
-			});
-		}
-		instText = toolkit.createFormText(form.getBody(), true);
-		instText.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
-		StringBuffer buf = new StringBuffer();
-		buf.append(PDEUIMessages.SampleEditor_content); 
-		instText.setText(buf.toString(), true, false);
-		instText.addHyperlinkListener(new HyperlinkAdapter() {
-			public void linkActivated(HyperlinkEvent e) {
-				Object href = e.getHref();
-				if (href.equals("help")) { //$NON-NLS-1$
-					PlatformUI.getWorkbench().getHelpSystem().displayHelpResource(helpURL);
-				}
-				else if (href.equals("run")) { //$NON-NLS-1$
-					doRun(launcher, launchTarget, false);
-				}
-				else if (href.equals("debug")) { //$NON-NLS-1$
-					doRun(launcher, launchTarget, true);
-				}
-			}
-		});
-		instText.setImage("run", PDEPlugin.getDefault().getLabelProvider().get(PDEPluginImages.DESC_RUN_EXC)); //$NON-NLS-1$
-		instText.setImage("debug", PDEPlugin.getDefault().getLabelProvider().get(PDEPluginImages.DESC_DEBUG_EXC)); //$NON-NLS-1$
-		instText.setImage("help", PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_INFO_TSK)); //$NON-NLS-1$
-	}
-	
-	private void doRun(String launcher, String target, final boolean debug) {
-		ILaunchShortcut shortcut = defaultShortcut;
-		final ISelection selection;
-		if (target!=null) {
-			selection = new StructuredSelection();
-		}
-		else
-			selection = new StructuredSelection();
-		final ILaunchShortcut fshortcut = shortcut;
-		BusyIndicator.showWhile(form.getDisplay(), new Runnable() {
-			public void run() {
-				fshortcut.launch(selection, debug?ILaunchManager.DEBUG_MODE:ILaunchManager.RUN_MODE);
-			}
-		});
-	}
-	
-	private Properties loadContent() {
-		IStorageEditorInput input = (IStorageEditorInput)getEditorInput();
-		Properties properties = new Properties();
-		try {
-			IStorage storage = input.getStorage();
-			InputStream is = storage.getContents();
-			properties.load(is);
-			is.close();
-		}
-		catch (IOException e) {
-			PDEPlugin.logException(e);
-		}
-		catch (CoreException e) {
-			PDEPlugin.logException(e);
-		}
-		return properties;
-	}
-	
-	public void dispose() {
-		if (inputFileListener!=null) {
-			PDEPlugin.getWorkspace().removeResourceChangeListener(inputFileListener);
-			inputFileListener = null;
-		}
-		toolkit.dispose();
-		PDEPlugin.getDefault().getLabelProvider().disconnect(this);
-		super.dispose();		
-	}
-	/**
-	 * @see EditorPart#setFocus
-	 */
-	public void setFocus() {
-		form.setFocus();
-	}
-	/**
-	 * @see EditorPart#doSave
-	 */
-	public void doSave(IProgressMonitor monitor) {
-	}
-	/**
-	 * @see EditorPart#doSaveAs
-	 */
-	public void doSaveAs() {
-	}
-	/**
-	 * @see EditorPart#isDirty
-	 */
-	public boolean isDirty() {
-		return false;
-	}
-	/**
-	 * @see EditorPart#isSaveAsAllowed
-	 */
-	public boolean isSaveAsAllowed() {
-		return false;
-	}
-	/**
-	 * @see EditorPart#init
-	 */
-	public void init(IEditorSite site, IEditorInput input)
-			throws PartInitException {
-		setSite(site);
-		setInput(input);
-		inputFileListener = new InputFileListener();
-		PDEPlugin.getWorkspace().addResourceChangeListener(inputFileListener);
-	}
-	public void close() {
-		Display display = getSite().getShell().getDisplay();
-		display.asyncExec(new Runnable() {
-			public void run() {
-				if (toolkit != null) {
-					getSite().getPage().closeEditor(SampleEditor.this, false);
-				}
-			}
-		});
-	}	
-}

diff --git a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/SampleOperation.java b/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/SampleOperation.java
deleted file mode 100644
index 6d50211..0000000
--- a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/SampleOperation.java
+++ /dev/null

@@ -1,236 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.internal.samples;
-
-import java.io.*;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
-import java.util.Properties;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.ui.dialogs.IOverwriteQuery;
-import org.eclipse.ui.wizards.datatransfer.*;
-import org.osgi.framework.*;
-
-public class SampleOperation implements IRunnableWithProgress {
-	private static final String SAMPLE_PROPERTIES = "sample.properties"; //$NON-NLS-1$
-
-	private IConfigurationElement sample;
-
-	private String[] projectNames;
-
-	private IFile sampleManifest;
-
-	private IOverwriteQuery query;
-    
-    private boolean yesToAll;
-    
-    private boolean cancel;
-
-	private IProject[] createdProjects;
-
-	/**
-	 *  
-	 */
-	public SampleOperation(IConfigurationElement sample, String[] projectNames,
-			IOverwriteQuery query) {
-		this.sample = sample;
-		this.query = query;
-		this.projectNames = projectNames;
-	}
-
-	public IFile getSampleManifest() {
-		return sampleManifest;
-	}
-
-	public IProject[] getCreatedProjects() {
-		return createdProjects;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.operation.IRunnableWithProgress#run(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void run(IProgressMonitor monitor) throws InvocationTargetException,
-			InterruptedException {
-		try {
-			IWorkspaceRunnable op = new IWorkspaceRunnable() {
-				public void run(IProgressMonitor monitor) throws CoreException {
-					IConfigurationElement[] projects = sample
-							.getChildren("project"); //$NON-NLS-1$
-					monitor
-							.beginTask(
-									PDEUIMessages.SampleOperation_creating, 4 * projects.length); 
-					createdProjects = new IProject[projects.length];
-					try {
-					for (int i = 0; i < projects.length; i++) {
-						IFile file = importProject(projectNames[i],
-								projects[i], new SubProgressMonitor(monitor, 4));
-						if (file != null && sampleManifest == null)
-							sampleManifest = file;
-						if (file != null) {
-							createdProjects[i] = file.getProject();
-						}
-                        if(cancel)
-                            // if user has cancelled operation, exit.
-                            break;
-					}
-					}
-					catch (InterruptedException e) {
-						throw new OperationCanceledException();
-					}
-					catch (InvocationTargetException e) {
-						throwCoreException(e);
-					}
-				}
-			};
-			PDEPlugin.getWorkspace().run(op, monitor);
-		} catch (CoreException e) {
-			throw new InvocationTargetException(e);
-		} catch (OperationCanceledException e) {
-			throw e;
-		} finally {
-			monitor.done();
-		}
-	}
-	
-	private void throwCoreException(InvocationTargetException e) throws CoreException {
-		Throwable t = e.getCause();
-		Status status= new Status(IStatus.ERROR, 
-				PDEPlugin.PLUGIN_ID,
-				IStatus.OK,
-				e.getMessage(),
-				t);
-		throw new CoreException(status);
-	}
-
-	private IFile importProject(String name, IConfigurationElement config,
-			IProgressMonitor monitor) throws CoreException,
-			InvocationTargetException, InterruptedException {
-		String path = config.getAttribute("archive"); //$NON-NLS-1$
-		if (name == null || path == null)
-			return null;
-		IWorkspace workspace = PDEPlugin.getWorkspace();
-		IWorkspaceRoot root = workspace.getRoot();
-		IProject project = root.getProject(name);
-		boolean skip = false;
-        if (project.exists()) {
-            if (!yesToAll) {
-                String returnId = query.queryOverwrite(project.getFullPath()
-                    .toString());
-                if (returnId.equals(IOverwriteQuery.ALL)) {
-                    yesToAll = true;
-                    skip = false;
-                } else if (returnId.equals(IOverwriteQuery.YES)) {
-                    skip = false;
-                }  else if (returnId.equals(IOverwriteQuery.NO)) {
-                    skip = true;
-                } else if (returnId.equals(IOverwriteQuery.CANCEL)) {
-                    skip = true;
-                    cancel = true;
-                }
-            }
-            if (!skip) {
-                project.delete(true, true, new SubProgressMonitor(monitor, 1));
-                project = root.getProject(name);
-            } else
-                monitor.worked(1);
-        }
-        if (skip) {
-            monitor.worked(3);
-            IFile manifest = project.getFile(SAMPLE_PROPERTIES);
-            return manifest;
-        }
-        
-		project.create(new SubProgressMonitor(monitor, 1));
-		project.open(new NullProgressMonitor());
-		Bundle bundle = Platform.getBundle(sample.getNamespace());
-		ZipFile zipFile = getZipFileFromPluginDir(path, bundle);
-		importFilesFromZip(zipFile, project.getFullPath(),
-				new SubProgressMonitor(monitor, 1));
-		return createSampleManifest(project, config, new SubProgressMonitor(
-				monitor, 1));
-	}
-
-	private IFile createSampleManifest(IProject project,
-			IConfigurationElement config, IProgressMonitor monitor)
-			throws CoreException {
-		IFile file = project.getFile(SAMPLE_PROPERTIES);
-		if (!file.exists()) {
-			try {
-				ByteArrayOutputStream out = new ByteArrayOutputStream();
-				Properties properties = new Properties();
-				createSampleManifestContent(
-						config.getAttribute("name"), properties); //$NON-NLS-1$
-				properties.store(out, ""); //$NON-NLS-1$
-				out.flush();
-				String contents = out.toString();
-				out.close();
-				ByteArrayInputStream stream = new ByteArrayInputStream(contents
-						.getBytes("UTF8")); //$NON-NLS-1$
-				file.create(stream, true, monitor);
-				stream.close();
-			} catch (UnsupportedEncodingException e) {
-			} catch (IOException e) {
-			}
-		}
-		return file;
-	}
-
-	private void createSampleManifestContent(String projectName,
-			Properties properties) {
-		writeProperty(properties, "id", sample.getAttribute("id")); //$NON-NLS-1$ //$NON-NLS-2$
-		writeProperty(properties, "name", sample.getAttribute("name")); //$NON-NLS-1$ //$NON-NLS-2$
-		writeProperty(properties, "projectName", projectName); //$NON-NLS-1$
-		writeProperty(properties, "launcher", sample.getAttribute("launcher")); //$NON-NLS-1$ //$NON-NLS-2$
-		IConfigurationElement desc[] = sample.getChildren("description"); //$NON-NLS-1$
-		if (desc.length == 1) {
-			writeProperty(properties, "helpHref", desc[0] //$NON-NLS-1$
-					.getAttribute("helpHref")); //$NON-NLS-1$
-			writeProperty(properties, "description", desc[0].getValue()); //$NON-NLS-1$
-		}
-	}
-
-	private void writeProperty(Properties properties, String name, String value) {
-		if (value == null)
-			return;
-		properties.setProperty(name, value);
-	}
-
-	private ZipFile getZipFileFromPluginDir(String pluginRelativePath,
-			Bundle bundle) throws CoreException {
-		try {
-			URL starterURL = Platform.resolve(bundle.getEntry(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, PDEPlugin.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, query);
-		op.run(monitor);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/SampleStandbyContent.java b/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/SampleStandbyContent.java
deleted file mode 100644
index d627ec7..0000000
--- a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/SampleStandbyContent.java
+++ /dev/null

@@ -1,317 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.internal.samples;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Properties;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-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.Platform;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.ui.ILaunchShortcut;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.launcher.RuntimeWorkbenchShortcut;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.events.HyperlinkAdapter;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.widgets.FormText;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Hyperlink;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
-import org.eclipse.ui.intro.IIntroPart;
-import org.eclipse.ui.intro.config.IStandbyContentPart;
-import org.eclipse.ui.part.ISetSelectionTarget;
-
-public class SampleStandbyContent implements IStandbyContentPart {
-	private ScrolledForm form;
-	private Hyperlink moreLink;
-	private String helpURL;
-	private String launcher;
-	private String launchTarget;
-	private FormText descText;
-	private FormText instText;
-	private ILaunchShortcut defaultShortcut;
-	private IConfigurationElement sample;
-	// cached input.
-	private String input;
-	
-	private static String MEMENTO_SAMPLE_ID_ATT = "sampleId"; //$NON-NLS-1$
-	
-	/**
-	 *  
-	 */
-	public SampleStandbyContent() {
-		defaultShortcut = new RuntimeWorkbenchShortcut();
-		PDEPlugin.getDefault().getLabelProvider().connect(this);
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.intro.internal.parts.IStandbyContentPart#createPartControl(org.eclipse.swt.widgets.Composite,
-	 *      org.eclipse.ui.forms.widgets.FormToolkit)
-	 */
-	public void createPartControl(Composite parent, FormToolkit toolkit) {
-		form = toolkit.createScrolledForm(parent);
-		//form.setBackgroundImage(PDEPlugin.getDefault().getLabelProvider().get(
-		//		PDEPluginImages.DESC_FORM_BANNER));
-		TableWrapLayout layout = new TableWrapLayout();
-		layout.verticalSpacing = 10;
-		layout.topMargin = 10;
-		layout.bottomMargin = 10;
-		layout.leftMargin = 10;
-		layout.rightMargin = 10;
-		form.getBody().setLayout(layout);
-		descText = toolkit.createFormText(form.getBody(), true);
-		descText.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
-		descText.setText("", false, false); //$NON-NLS-1$
-		moreLink = toolkit.createHyperlink(form.getBody(), "Read More", //$NON-NLS-1$
-				SWT.NULL);
-		moreLink.addHyperlinkListener(new HyperlinkAdapter() {
-			public void linkActivated(HyperlinkEvent e) {
-				if (helpURL != null)
-					PlatformUI.getWorkbench().getHelpSystem().displayHelpResource(helpURL);
-			}
-		});
-		instText = toolkit.createFormText(form.getBody(), true);
-		instText.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));
-		StringBuffer buf = new StringBuffer();
-		buf.append(PDEUIMessages.SampleStandbyContent_content); 
-		instText.setText(buf.toString(), true, false);
-		instText.addHyperlinkListener(new HyperlinkAdapter() {
-			public void linkActivated(HyperlinkEvent e) {
-				Object href = e.getHref();
-				if (href.equals("help")) { //$NON-NLS-1$
-					PlatformUI.getWorkbench().getHelpSystem().displayHelpResource(helpURL);
-				} else if (href.equals("browse")) { //$NON-NLS-1$
-					doBrowse();
-				} else if (href.equals("run")) { //$NON-NLS-1$
-					doRun(launcher, launchTarget, false);
-				} else if (href.equals("debug")) { //$NON-NLS-1$
-					doRun(launcher, launchTarget, true);
-				}
-			}
-		});
-		instText.setImage("run", PDEPlugin.getDefault().getLabelProvider().get( //$NON-NLS-1$
-				PDEPluginImages.DESC_RUN_EXC));
-		instText.setImage("debug", PDEPlugin.getDefault().getLabelProvider() //$NON-NLS-1$
-				.get(PDEPluginImages.DESC_DEBUG_EXC));
-		instText.setImage("help", PlatformUI.getWorkbench().getSharedImages() //$NON-NLS-1$
-				.getImage(ISharedImages.IMG_OBJS_INFO_TSK));
-	}
-	private void doRun(String launcher, String target, final boolean debug) {
-		ILaunchShortcut shortcut = defaultShortcut;
-		final ISelection selection;
-		if (target != null) {
-			selection = new StructuredSelection();
-		} else
-			selection = new StructuredSelection();
-		final ILaunchShortcut fshortcut = shortcut;
-		BusyIndicator.showWhile(form.getDisplay(), new Runnable() {
-			public void run() {
-				fshortcut.launch(selection, debug
-						? ILaunchManager.DEBUG_MODE
-						: ILaunchManager.RUN_MODE);
-			}
-		});
-	}
-	private void doBrowse() {
-		IWorkspaceRoot root = PDEPlugin.getWorkspace().getRoot();
-		IProject[] projects = root.getProjects();
-		ISetSelectionTarget target = findTarget();
-		if (target == null)
-			return;
-		String sid = sample.getAttribute("id"); //$NON-NLS-1$
-		if (sid == null)
-			return;
-		ArrayList items = new ArrayList();
-		for (int i = 0; i < projects.length; i++) {
-			IProject project = projects[i];
-			if (!project.exists() || !project.isOpen())
-				continue;
-			IFile pfile = project.getFile("sample.properties"); //$NON-NLS-1$
-			if (pfile.exists()) {
-				try {
-					InputStream is = pfile.getContents();
-					Properties prop = new Properties();
-					prop.load(is);
-					is.close();
-					String id = prop.getProperty("id"); //$NON-NLS-1$
-					if (id != null && id.equals(sid)) {
-						//match
-						IResource res = findSelectReveal(project, prop
-								.getProperty("projectName")); //$NON-NLS-1$
-						if (res != null)
-							items.add(res);
-					}
-				} catch (IOException e) {
-					PDEPlugin.logException(e);
-				} catch (CoreException e) {
-					PDEPlugin.logException(e);
-				}
-			}
-		}
-		if (items.size() > 0)
-			target.selectReveal(new StructuredSelection(items));
-	}
-	private ISetSelectionTarget findTarget() {
-		String id = sample.getAttribute("targetViewId"); //$NON-NLS-1$
-		if (id == null)
-			return null;
-		IViewPart view = PDEPlugin.getActivePage().findView(id);
-		if (view == null || !(view instanceof ISetSelectionTarget))
-			return null;
-		return (ISetSelectionTarget) view;
-	}
-	private IResource findSelectReveal(IProject project, String originalName) {
-		IConfigurationElement[] projects = sample.getChildren("project"); //$NON-NLS-1$
-		for (int i = 0; i < projects.length; i++) {
-			if (originalName.equals(projects[i].getAttribute("name"))) { //$NON-NLS-1$
-				String path = projects[i].getAttribute("selectReveal"); //$NON-NLS-1$
-				if (path == null)
-					continue;
-				IResource res = project.findMember(path);
-				if (res.exists())
-					return res;
-			}
-		}
-		return null;
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.intro.internal.parts.IStandbyContentPart#getControl()
-	 */
-	public Control getControl() {
-		return form;
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.intro.internal.parts.IStandbyContentPart#init(org.eclipse.ui.intro.IIntroPart)
-	 */
-	public void init(IIntroPart introPart) {
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.intro.internal.parts.IStandbyContentPart#setInput(java.lang.Object)
-	 */
-	public void setInput(Object input) {
-	    // if the new input is null, use cached input from momento.
-        if (input != null)
-            this.input = (String) input;
-		String sampleId = this.input.toString();
-		IConfigurationElement[] samples = Platform.getExtensionRegistry()
-				.getConfigurationElementsFor("org.eclipse.pde.ui.samples"); //$NON-NLS-1$
-		for (int i = 0; i < samples.length; i++) {
-			IConfigurationElement sample = samples[i];
-			String id = sample.getAttribute("id"); //$NON-NLS-1$
-			if (id != null && id.equals(sampleId)) {
-				update(sample);
-				return;
-			}
-		}
-		update(null);
-	}
-	private void update(IConfigurationElement sample) {
-		this.sample = sample;
-		if (form == null)
-			return;
-		String title = sample != null ? sample.getAttribute("name") : ""; //$NON-NLS-1$ //$NON-NLS-2$
-		form.setText(title);
-		if (sample != null) {
-			launcher = sample.getAttribute("launcher"); //$NON-NLS-1$
-			launchTarget = sample.getAttribute("launchTarget"); //$NON-NLS-1$
-		} else {
-			launcher = null;
-			launchTarget = null;
-		}
-		IConfigurationElement[] descConfig = sample != null ? sample
-				.getChildren("description") : null; //$NON-NLS-1$
-		if (descConfig != null && descConfig.length == 1) {
-			String desc = descConfig[0].getValue();
-			String content = NLS.bind(PDEUIMessages.SampleStandbyContent_desc, (desc != null ? desc : "")); //$NON-NLS-1$ 
-			helpURL = descConfig[0].getAttribute("helpHref"); //$NON-NLS-1$
-			moreLink.setVisible(helpURL != null);
-			descText.setText(content, true, false);
-		} else {
-			moreLink.setVisible(false);
-			descText.setText("", false, false); //$NON-NLS-1$
-		}
-		form.reflow(true);
-	} /*
-	   * (non-Javadoc)
-	   * 
-	   * @see org.eclipse.ui.intro.internal.parts.IStandbyContentPart#setFocus()
-	   */
-	public void setFocus() {
-		form.setFocus();
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.intro.internal.parts.IStandbyContentPart#dispose()
-	 */
-	public void dispose() {
-		PDEPlugin.getDefault().getLabelProvider().disconnect(this);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.intro.config.IStandbyContentPart#init(org.eclipse.ui.intro.IIntroPart, org.eclipse.ui.IMemento)
-	 */
-	public void init(IIntroPart introPart, IMemento memento) {
-	    // try to restore last state.
-        input = getCachedInput(memento);
-
-	}
-	
-	 /**
-     * Tries to create the last content part viewed, based on sample id.
-     * 
-     * @param memento
-     * @return
-     */
-    private String getCachedInput(IMemento memento) {
-        if (memento == null)
-            return null;
-        return memento.getString(MEMENTO_SAMPLE_ID_ATT);
-
-    }
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.intro.config.IStandbyContentPart#saveState(org.eclipse.ui.IMemento)
-	 */
-	public void saveState(IMemento memento) {
-	    String currentSampleId = input;
-        if (input != null)
-            memento.putString(MEMENTO_SAMPLE_ID_ATT, currentSampleId);
-
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/SampleWizard.java b/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/SampleWizard.java
deleted file mode 100644
index 3b1912b..0000000
--- a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/SampleWizard.java
+++ /dev/null

@@ -1,279 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.internal.samples;
-import java.lang.reflect.InvocationTargetException;
-import java.util.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.dialogs.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.pde.internal.ui.*;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.*;
-import org.eclipse.ui.activities.IWorkbenchActivitySupport;
-import org.eclipse.ui.dialogs.IOverwriteQuery;
-import org.eclipse.ui.ide.IDE;
-
-public class SampleWizard extends Wizard
-		implements
-			INewWizard,
-			IExecutableExtension {
-	private IConfigurationElement[] samples;
-	private IConfigurationElement selection;
-	private ProjectNamesPage namesPage;
-	private ReviewPage lastPage;
-	
-	private boolean sampleEditorNeeded=true;
-	private boolean switchPerspective=true;
-	private boolean selectRevealEnabled=true;
-	private boolean activitiesEnabled=true;
-	
-	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 = PDEUIMessages.SampleWizard_title; 
-					String msg = NLS.bind(PDEUIMessages.SampleWizard_overwrite, file); 
-					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];
-		}
-	}
-	/**
-	 * The default constructor.
-	 *  
-	 */
-	public SampleWizard() {
-		PDEPlugin.getDefault().getLabelProvider().connect(this);
-		setDefaultPageImageDescriptor(PDEPluginImages.DESC_NEWEXP_WIZ);
-		samples = Platform.getExtensionRegistry().getConfigurationElementsFor(
-				"org.eclipse.pde.ui.samples"); //$NON-NLS-1$
-		namesPage= new ProjectNamesPage(this);
-		lastPage = new ReviewPage(this);
-		setNeedsProgressMonitor(true);
-        setWindowTitle(PDEUIMessages.ShowSampleAction_title); 
-	}
-	public void dispose() {
-		PDEPlugin.getDefault().getLabelProvider().disconnect(this);
-		super.dispose();
-	}
-	public IConfigurationElement[] getSamples() {
-		return samples;
-	}
-	/**
-	 *  
-	 */
-	public void addPages() {
-		if (selection == null) {
-			addPage(new SelectionPage(this));
-		}
-		addPage(namesPage);
-		addPage(lastPage);
-	}
-	/**
-	 *  
-	 */
-	public boolean performFinish() {
-		try {
-			String perspId = selection.getAttribute("perspectiveId"); //$NON-NLS-1$
-			IWorkbenchPage page = PDEPlugin.getActivePage();
-			if (perspId != null && switchPerspective) {
-				PlatformUI.getWorkbench().showPerspective(perspId, page.getWorkbenchWindow());
-			}
-			SampleOperation op = new SampleOperation(selection,
-					namesPage.getProjectNames(),
-					new ImportOverwriteQuery());
-			getContainer().run(true, true, op);
-			IFile sampleManifest = op.getSampleManifest();
-			if (selectRevealEnabled) {
-				selectReveal(getShell());
-			}
-			if (activitiesEnabled)
-				enableActivities();
-			if (sampleEditorNeeded && sampleManifest != null)
-				IDE.openEditor(page, sampleManifest, true);
-		} catch (InvocationTargetException e) {
-			PDEPlugin.logException(e);
-			return false;
-		} catch (InterruptedException e) {
-			//PDEPlugin.logException(e);
-			return false;
-		} catch (CoreException e) {
-			PDEPlugin.logException(e);
-			return false;
-		} catch (OperationCanceledException e) {
-			return false;
-		}
-		return true;
-	}
-
-	public void selectReveal(Shell shell) {
-		/*
-		shell.getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				doSelectReveal();
-			}
-		});
-		*/
-	}
-
-	/*private void doSelectReveal() {
-		if (selection == null || createdProjects==null)
-			return;
-		String viewId = selection.getAttribute("targetViewId"); //$NON-NLS-1$
-		if (viewId == null)
-			return;
-		IWorkbenchWindow window = PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow();
-		if (window == null)
-			return;
-		IWorkbenchPage page = window.getActivePage();
-		if (page == null)
-			return;
-		IViewPart view = page.findView(viewId);
-		if (view == null || !(view instanceof ISetSelectionTarget))
-			return;
-		ISetSelectionTarget target = (ISetSelectionTarget) view;
-		IConfigurationElement[] projects = selection.getChildren("project"); //$NON-NLS-1$
-
-		ArrayList items = new ArrayList();
-		for (int i = 0; i < projects.length; i++) {
-			String path = projects[i].getAttribute("selectReveal"); //$NON-NLS-1$
-			if (path == null)
-				continue;
-			IResource resource = createdProjects[i].findMember(path);
-			if (resource.exists())
-				items.add(resource);
-		}
-		if (items.size() > 0)
-			target.selectReveal(new StructuredSelection(items));
-	}
-	*/
-	public void enableActivities() {
-		IConfigurationElement [] elements = selection.getChildren("activity"); //$NON-NLS-1$
-		HashSet activitiesToEnable=new HashSet();
-		IWorkbenchActivitySupport workbenchActivitySupport = PlatformUI.getWorkbench().getActivitySupport();
-		
-		for (int i=0; i<elements.length; i++) {
-			IConfigurationElement element = elements[i];
-			String id=element.getAttribute("id"); //$NON-NLS-1$
-			if (id==null) continue;
-			activitiesToEnable.add(id);
-		}
-		HashSet set = new HashSet(workbenchActivitySupport.getActivityManager().getEnabledActivityIds());
-		set.addAll(activitiesToEnable);
-		workbenchActivitySupport.setEnabledActivityIds(set);
-	}
-	/**
-	 *  
-	 */
-	public void setInitializationData(IConfigurationElement config,
-			String propertyName, Object data) throws CoreException {
-		String variable = data != null && data instanceof String ? data
-				.toString() : null;
-		if (variable != null) {
-			for (int i = 0; i < samples.length; i++) {
-				IConfigurationElement element = samples[i];
-				String id = element.getAttribute("id"); //$NON-NLS-1$
-				if (id != null && id.equals(variable)) {
-					setSelection(element);
-					break;
-				}
-			}
-		}
-	}
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-	}
-	/**
-	 * @return Returns the selection.
-	 */
-	public IConfigurationElement getSelection() {
-		return selection;
-	}
-	/**
-	 * @param selection
-	 *            The selection to set.
-	 */
-	public void setSelection(IConfigurationElement selection) {
-		this.selection = selection;
-	}
-	/**
-	 * @return Returns the sampleEditorNeeded.
-	 */
-	public boolean isSampleEditorNeeded() {
-		return sampleEditorNeeded;
-	}
-	/**
-	 * @param sampleEditorNeeded
-	 *            The sampleEditorNeeded to set.
-	 */
-	public void setSampleEditorNeeded(boolean sampleEditorNeeded) {
-		this.sampleEditorNeeded = sampleEditorNeeded;
-	}
-	/**
-	 * @return Returns the switchPerspective.
-	 * @todo Generated comment
-	 */
-	public boolean isSwitchPerspective() {
-		return switchPerspective;
-	}
-	/**
-	 * @param switchPerspective The switchPerspective to set.
-	 * @todo Generated comment
-	 */
-	public void setSwitchPerspective(boolean switchPerspective) {
-		this.switchPerspective = switchPerspective;
-	}
-	/**
-	 * @return Returns the selectRevealEnabled.
-	 * @todo Generated comment
-	 */
-	public boolean isSelectRevealEnabled() {
-		return selectRevealEnabled;
-	}
-	/**
-	 * @param selectRevealEnabled The selectRevealEnabled to set.
-	 * @todo Generated comment
-	 */
-	public void setSelectRevealEnabled(boolean selectRevealEnabled) {
-		this.selectRevealEnabled = selectRevealEnabled;
-	}
-	/**
-	 * @return Returns the activitiesEnabled.
-	 * @todo Generated comment
-	 */
-	public boolean getActivitiesEnabled() {
-		return activitiesEnabled;
-	}
-	/**
-	 * @param activitiesEnabled The activitiesEnabled to set.
-	 * @todo Generated comment
-	 */
-	public void setActivitiesEnabled(boolean activitiesEnabled) {
-		this.activitiesEnabled = activitiesEnabled;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/SelectionPage.java b/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/SelectionPage.java
deleted file mode 100644
index fe8d37f..0000000
--- a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/SelectionPage.java
+++ /dev/null

@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.internal.samples;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.pde.internal.ui.IHelpContextIds;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEPluginImages;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.pde.internal.ui.elements.DefaultContentProvider;
-import org.eclipse.pde.internal.ui.parts.TablePart;
-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.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-
-public class SelectionPage extends WizardPage {
-	private TablePart part;
-	private Text desc;
-	private SampleWizard wizard;
-	
-	class SelectionPart extends TablePart {
-		public SelectionPart() {
-			super(new String [] { "More Info" }); //$NON-NLS-1$
-		}
-		protected void buttonSelected(Button button, int index) {
-			if (index == 0)
-				doMoreInfo();
-		}
-		
-		protected void selectionChanged(IStructuredSelection selection) {
-			updateSelection(selection);
-		}
-		protected void handleDoubleClick(IStructuredSelection selection) {
-		}
-	}
-	
-	class SampleProvider extends DefaultContentProvider implements IStructuredContentProvider {
-		public Object [] getElements(Object input) {
-			return wizard.getSamples();
-		}
-	}
-	
-	class SampleLabelProvider extends LabelProvider {
-		private Image image;
-		public SampleLabelProvider() {
-			image = PDEPlugin.getDefault().getLabelProvider().get(PDEPluginImages.DESC_NEWEXP_TOOL); 
-		}
-		public String getText(Object obj) {
-			IConfigurationElement sample = (IConfigurationElement)obj;
-			return sample.getAttribute("name"); //$NON-NLS-1$
-		}
-		public Image getImage(Object obj) {
-			return image;
-		}
-	}
-	/**
-	 * @param pageName
-	 */
-	public SelectionPage(SampleWizard wizard) {
-		super("selection"); //$NON-NLS-1$
-		this.wizard = wizard;
-		setTitle(PDEUIMessages.SelectionPage_title); 
-		setDescription(PDEUIMessages.SelectionPage_desc); 
-		part  = new SelectionPart();
-	}
-
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		container.setLayout(layout);
-		layout.numColumns = 2;
-		part.setMinimumSize(300, 300);
-		part.createControl(container, SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER, 2, null);
-		part.getTableViewer().setContentProvider(new SampleProvider());
-		part.getTableViewer().setLabelProvider(new SampleLabelProvider());
-		desc = new Text(container, SWT.MULTI|SWT.BORDER|SWT.WRAP|SWT.V_SCROLL);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.heightHint = 64;
-		desc.setLayoutData(gd);
-		part.getTableViewer().setInput(this);
-		updateSelection(null);
-		setControl(container);
-		
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(container, IHelpContextIds.SELECTION);
-	}
-	private void doMoreInfo() {
-		if (wizard.getSelection()!=null) {
-			IConfigurationElement desc[] = wizard.getSelection().getChildren("description"); //$NON-NLS-1$
-			String helpHref = desc[0].getAttribute("helpHref"); //$NON-NLS-1$
-			PlatformUI.getWorkbench().getHelpSystem().displayHelpResource(helpHref);
-		}
-	}
-	private void updateSelection(IStructuredSelection selection) {
-		if (selection==null) {
-			desc.setText(""); //$NON-NLS-1$
-			part.setButtonEnabled(0, false);
-			setPageComplete(false);
-		}
-		else {
-			IConfigurationElement sample = (IConfigurationElement)selection.getFirstElement();
-			String text = ""; //$NON-NLS-1$
-			String helpHref=null;
-			IConfigurationElement [] sampleDesc = sample.getChildren("description"); //$NON-NLS-1$
-			if (sampleDesc.length==1) {
-				text = sampleDesc[0].getValue();
-				helpHref = sampleDesc[0].getAttribute("helpHref"); //$NON-NLS-1$
-			}
-			desc.setText(text);
-			part.setButtonEnabled(0, helpHref!=null);
-			wizard.setSelection(sample);
-			setPageComplete(true);
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/ShowSampleAction.java b/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/ShowSampleAction.java
deleted file mode 100644
index 33af247..0000000
--- a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/ShowSampleAction.java
+++ /dev/null

@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.internal.samples;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Properties;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.pde.internal.ui.PDEPlugin;
-import org.eclipse.pde.internal.ui.PDEUIMessages;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.*;
-import org.eclipse.ui.intro.IIntroSite;
-import org.eclipse.ui.intro.config.*;
-import org.eclipse.update.configurator.*;
-import org.eclipse.update.standalone.InstallCommand;
-
-public class ShowSampleAction extends Action implements IIntroAction {
-	private static final String SAMPLE_FEATURE_ID = "org.eclipse.sdk.samples"; //$NON-NLS-1$
-	private static final String SAMPLE_FEATURE_VERSION = "3.1.0"; //$NON-NLS-1$
-	private static final String UPDATE_SITE = "http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/pde-ui-home/samples/"; //$NON-NLS-1$
-	private String sampleId;
-	/**
-	 *  
-	 */
-	public ShowSampleAction() {
-	}
-
-	public void run(IIntroSite site, Properties params) {
-		sampleId = params.getProperty("id"); //$NON-NLS-1$
-		if (sampleId == null)
-			return;
-        
-         Runnable r= new Runnable() {
-                public void run() {
-		    if (!ensureSampleFeaturePresent())
-		        return;
-        
-                SampleWizard wizard = new SampleWizard();
-                try {
-                    wizard.setInitializationData(null, "class", sampleId); //$NON-NLS-1$
-                    wizard.setSampleEditorNeeded(false);
-                    wizard.setSwitchPerspective(false);
-                    wizard.setSelectRevealEnabled(false);
-                    wizard.setActivitiesEnabled(false);
-                    WizardDialog dialog = new WizardDialog(PDEPlugin
-                            .getActiveWorkbenchShell(), wizard);
-                    dialog.create();
-                    dialog.setPageSize(450, 500);
-                    if (dialog.open() == WizardDialog.OK) {
-                        switchToSampleStandby(wizard);
-                    }
-                } catch (CoreException e) {
-                    PDEPlugin.logException(e);
-                }
-            }
-        };
-        
-        Shell currentShell = PlatformUI.getWorkbench()
-            .getActiveWorkbenchWindow().getShell();
-        currentShell.getDisplay().asyncExec(r);
-	}
-    
-	private void switchToSampleStandby(SampleWizard wizard) {
-		StringBuffer url = new StringBuffer();
-		url.append("http://org.eclipse.ui.intro/showStandby?"); //$NON-NLS-1$
-		url.append("pluginId=org.eclipse.pde.ui"); //$NON-NLS-1$
-		url.append("&"); //$NON-NLS-1$
-		url.append("partId=org.eclipse.pde.ui.sampleStandbyPart"); //$NON-NLS-1$
-		url.append("&"); //$NON-NLS-1$
-		url.append("input="); //$NON-NLS-1$
-		url.append(sampleId);
-		IIntroURL introURL = IntroURLFactory.createIntroURL(url.toString());
-		if (introURL != null) {
-			introURL.execute();
-			ensureProperContext(wizard);
-		}
-	}
-	private void ensureProperContext(SampleWizard wizard) {
-		IConfigurationElement sample = wizard.getSelection();
-		String perspId = sample.getAttribute("perspectiveId"); //$NON-NLS-1$
-		if (perspId!=null) {
-			try {
-				wizard.enableActivities();
-				PlatformUI.getWorkbench().showPerspective(perspId, PDEPlugin.getActiveWorkbenchWindow());
-				wizard.selectReveal(PDEPlugin.getActiveWorkbenchShell());
-			}
-			catch (WorkbenchException e) {
-				PDEPlugin.logException(e);
-			}
-		}
-		enableActivities(sample);
-	}
-	private void enableActivities(IConfigurationElement sample) {
-	}
-	private boolean ensureSampleFeaturePresent() {
-		if (checkFeature())
-			return true;
-		// the feature is not present - ask to download
-		if (MessageDialog
-				.openQuestion(
-						PDEPlugin.getActiveWorkbenchShell(),
-						PDEUIMessages.ShowSampleAction_msgTitle, 
-						PDEUIMessages.ShowSampleAction_msgDesc)) { 
-			return downloadFeature();
-		}
-		return false;
-	}
-	private boolean checkFeature() {
-		IPlatformConfiguration config = ConfiguratorUtils
-				.getCurrentPlatformConfiguration();
-		IPlatformConfiguration.IFeatureEntry [] features = config
-				.getConfiguredFeatureEntries();
-		PluginVersionIdentifier sampleVersion = new PluginVersionIdentifier(
-				SAMPLE_FEATURE_VERSION);
-		for (int i = 0; i < features.length; i++) {
-			String id = features[i].getFeatureIdentifier();
-			if (SAMPLE_FEATURE_ID.equals(id)) {
-				String version = features[i].getFeatureVersion();
-				PluginVersionIdentifier fversion = new PluginVersionIdentifier(
-						version);
-				if (fversion.isCompatibleWith(sampleVersion))
-					return true;
-			}
-		}
-		return false;
-	}
-	private boolean downloadFeature() {
-		IRunnableWithProgress op = new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor)
-					throws InvocationTargetException {
-				try {
-					InstallCommand command = new InstallCommand(
-							SAMPLE_FEATURE_ID, SAMPLE_FEATURE_VERSION,
-							UPDATE_SITE, null, "false"); //$NON-NLS-1$
-					command.run(monitor);
-					command.applyChangesNow();
-				} catch (Exception e) {
-					throw new InvocationTargetException(e);
-				}
-			}
-		};
-		try {
-			PlatformUI.getWorkbench().getProgressService().busyCursorWhile(op);
-		} catch (InvocationTargetException e) {
-			PDEPlugin.logException(e);
-			return false;
-		} catch (InterruptedException e) {
-			PDEPlugin.logException(e);
-		}
-		return true;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/ShowTargetPlatformAction.java b/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/ShowTargetPlatformAction.java
deleted file mode 100644
index 821b45c..0000000
--- a/ui/org.eclipse.pde.ui/src_samples/org/eclipse/pde/ui/internal/samples/ShowTargetPlatformAction.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.pde.ui.internal.samples;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.preference.IPreferenceNode;
-import org.eclipse.jface.preference.PreferenceDialog;
-import org.eclipse.jface.preference.PreferenceManager;
-import org.eclipse.pde.internal.ui.preferences.TargetPlatformPreferenceNode;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-public class ShowTargetPlatformAction extends Action {
-	
-	// Bring up Target Platform prefrences page
-	public void run() {
-		final IPreferenceNode targetNode = new TargetPlatformPreferenceNode();
-		PreferenceManager manager = new PreferenceManager();
-		manager.addToRoot(targetNode);
-		Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-		final PreferenceDialog dialog =	new PreferenceDialog(shell, manager);
-		BusyIndicator.showWhile(Display.getCurrent(), new Runnable() {
-			public void run() {
-				dialog.create();
-				dialog.setMessage(targetNode.getLabelText());
-				dialog.open();
-			}
-		});
-	}
-	
-}

diff --git a/ui/org.eclipse.pde.ui/templates/builder/java/$builderClassName$.java b/ui/org.eclipse.pde.ui/templates/builder/java/$builderClassName$.java
deleted file mode 100644
index 5c3aee9..0000000
--- a/ui/org.eclipse.pde.ui/templates/builder/java/$builderClassName$.java
+++ /dev/null

@@ -1,166 +0,0 @@
-package $packageName$;
-
-import java.util.Map;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.helpers.DefaultHandler;
-
-public class $builderClassName$ extends IncrementalProjectBuilder {
-
-	class SampleDeltaVisitor implements IResourceDeltaVisitor {
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
-		 */
-		public boolean visit(IResourceDelta delta) throws CoreException {
-			IResource resource = delta.getResource();
-			switch (delta.getKind()) {
-			case IResourceDelta.ADDED:
-				// handle added resource
-				checkXML(resource);
-				break;
-			case IResourceDelta.REMOVED:
-				// handle removed resource
-				break;
-			case IResourceDelta.CHANGED:
-				// handle changed resource
-				checkXML(resource);
-				break;
-			}
-			//return true to continue visiting children.
-			return true;
-		}
-	}
-
-	class SampleResourceVisitor implements IResourceVisitor {
-		public boolean visit(IResource resource) {
-			checkXML(resource);
-			//return true to continue visiting children.
-			return true;
-		}
-	}
-
-	class XMLErrorHandler extends DefaultHandler {
-		
-		private IFile file;
-
-		public XMLErrorHandler(IFile file) {
-			this.file = file;
-		}
-
-		private void addMarker(SAXParseException e, int severity) {
-			$builderClassName$.this.addMarker(file, e.getMessage(), e
-					.getLineNumber(), severity);
-		}
-
-		public void error(SAXParseException exception) throws SAXException {
-			addMarker(exception, IMarker.SEVERITY_ERROR);
-		}
-
-		public void fatalError(SAXParseException exception) throws SAXException {
-			addMarker(exception, IMarker.SEVERITY_ERROR);
-		}
-
-		public void warning(SAXParseException exception) throws SAXException {
-			addMarker(exception, IMarker.SEVERITY_WARNING);
-		}
-	}
-
-	public static final String BUILDER_ID = "$pluginId$.$builderId$";
-
-	private static final String MARKER_TYPE = "$pluginId$.xmlProblem";
-
-	private SAXParserFactory parserFactory;
-
-	private void addMarker(IFile file, String message, int lineNumber,
-			int severity) {
-		try {
-			IMarker marker = file.createMarker(MARKER_TYPE);
-			marker.setAttribute(IMarker.MESSAGE, message);
-			marker.setAttribute(IMarker.SEVERITY, severity);
-			if (lineNumber == -1) {
-				lineNumber = 1;
-			}
-			marker.setAttribute(IMarker.LINE_NUMBER, lineNumber);
-		} catch (CoreException e) {
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.internal.events.InternalBuilder#build(int,
-	 *      java.util.Map, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected IProject[] build(int kind, Map args, IProgressMonitor monitor)
-			throws CoreException {
-		if (kind == FULL_BUILD) {
-			fullBuild(monitor);
-		} else {
-			IResourceDelta delta = getDelta(getProject());
-			if (delta == null) {
-				fullBuild(monitor);
-			} else {
-				incrementalBuild(delta, monitor);
-			}
-		}
-		return null;
-	}
-
-	void checkXML(IResource resource) {
-		if (resource instanceof IFile && resource.getName().endsWith(".xml")) {
-			IFile file = (IFile) resource;
-			deleteMarkers(file);
-			XMLErrorHandler reporter = new XMLErrorHandler(file);
-			try {
-				getParser().parse(file.getContents(), reporter);
-			} catch (Exception e1) {
-			}
-		}
-	}
-
-	private void deleteMarkers(IFile file) {
-		try {
-			file.deleteMarkers(MARKER_TYPE, false, IResource.DEPTH_ZERO);
-		} catch (CoreException ce) {
-		}
-	}
-
-	protected void fullBuild(final IProgressMonitor monitor)
-			throws CoreException {
-		try {
-			getProject().accept(new SampleResourceVisitor());
-		} catch (CoreException e) {
-		}
-	}
-
-	private SAXParser getParser() throws ParserConfigurationException,
-			SAXException {
-		if (parserFactory == null) {
-			parserFactory = SAXParserFactory.newInstance();
-		}
-		return parserFactory.newSAXParser();
-	}
-
-	protected void incrementalBuild(IResourceDelta delta,
-			IProgressMonitor monitor) throws CoreException {
-		// the visitor does the work.
-		delta.accept(new SampleDeltaVisitor());
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates/builder/java/$natureClassName$.java b/ui/org.eclipse.pde.ui/templates/builder/java/$natureClassName$.java
deleted file mode 100644
index c2a8458..0000000
--- a/ui/org.eclipse.pde.ui/templates/builder/java/$natureClassName$.java
+++ /dev/null

@@ -1,80 +0,0 @@
-package $packageName$;
-
-import org.eclipse.core.resources.ICommand;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IProjectNature;
-import org.eclipse.core.runtime.CoreException;
-
-public class $natureClassName$ implements IProjectNature {
-
-	/**
-	 * ID of this project nature
-	 */
-	public static final String NATURE_ID = "$pluginId$.$natureId$";
-
-	private IProject project;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.resources.IProjectNature#configure()
-	 */
-	public void configure() throws CoreException {
-		IProjectDescription desc = project.getDescription();
-		ICommand[] commands = desc.getBuildSpec();
-
-		for (int i = 0; i < commands.length; ++i) {
-			if (commands[i].getBuilderName().equals($builderClassName$.BUILDER_ID)) {
-				return;
-			}
-		}
-
-		ICommand[] newCommands = new ICommand[commands.length + 1];
-		System.arraycopy(commands, 0, newCommands, 0, commands.length);
-		ICommand command = desc.newCommand();
-		command.setBuilderName($builderClassName$.BUILDER_ID);
-		newCommands[newCommands.length - 1] = command;
-		desc.setBuildSpec(newCommands);
-		project.setDescription(desc, null);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.resources.IProjectNature#deconfigure()
-	 */
-	public void deconfigure() throws CoreException {
-		IProjectDescription description = getProject().getDescription();
-		ICommand[] commands = description.getBuildSpec();
-		for (int i = 0; i < commands.length; ++i) {
-			if (commands[i].getBuilderName().equals($builderClassName$.BUILDER_ID)) {
-				ICommand[] newCommands = new ICommand[commands.length - 1];
-				System.arraycopy(commands, 0, newCommands, 0, i);
-				System.arraycopy(commands, i + 1, newCommands, i,
-						commands.length - i - 1);
-				description.setBuildSpec(newCommands);
-				return;
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.resources.IProjectNature#getProject()
-	 */
-	public IProject getProject() {
-		return project;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.resources.IProjectNature#setProject(org.eclipse.core.resources.IProject)
-	 */
-	public void setProject(IProject project) {
-		this.project = project;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/templates/builder/java/ToggleNatureAction.java b/ui/org.eclipse.pde.ui/templates/builder/java/ToggleNatureAction.java
deleted file mode 100644
index eaf0744..0000000
--- a/ui/org.eclipse.pde.ui/templates/builder/java/ToggleNatureAction.java
+++ /dev/null

@@ -1,96 +0,0 @@
-package $packageName$;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-
-public class ToggleNatureAction implements IObjectActionDelegate {
-
-	private ISelection selection;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		if (selection instanceof IStructuredSelection) {
-			for (Iterator it = ((IStructuredSelection) selection).iterator(); it
-					.hasNext();) {
-				Object element = it.next();
-				IProject project = null;
-				if (element instanceof IProject) {
-					project = (IProject) element;
-				} else if (element instanceof IAdaptable) {
-					project = (IProject) ((IAdaptable) element)
-							.getAdapter(IProject.class);
-				}
-				if (project != null) {
-					toggleNature(project);
-				}
-			}
-		}
-	}
-
-	/*
-	 * (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) {
-		this.selection = selection;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction,
-	 *      org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-	}
-
-	/**
-	 * Toggles sample nature on a project
-	 * 
-	 * @param project
-	 *            to have sample nature added or removed
-	 */
-	private void toggleNature(IProject project) {
-		try {
-			IProjectDescription description = project.getDescription();
-			String[] natures = description.getNatureIds();
-
-			for (int i = 0; i < natures.length; ++i) {
-				if ($natureClassName$.NATURE_ID.equals(natures[i])) {
-					// Remove the nature
-					String[] newNatures = new String[natures.length - 1];
-					System.arraycopy(natures, 0, newNatures, 0, i);
-					System.arraycopy(natures, i + 1, newNatures, i,
-							natures.length - i - 1);
-					description.setNatureIds(newNatures);
-					project.setDescription(description, null);
-					return;
-				}
-			}
-
-			// Add the nature
-			String[] newNatures = new String[natures.length + 1];
-			System.arraycopy(natures, 0, newNatures, 0, natures.length);
-			newNatures[natures.length] = $natureClassName$.NATURE_ID;
-			description.setNatureIds(newNatures);
-			project.setDescription(description, null);
-		} catch (CoreException e) {
-		}
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/templates/editor/bin/icons/sample.gif b/ui/org.eclipse.pde.ui/templates/editor/bin/icons/sample.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/ui/org.eclipse.pde.ui/templates/editor/bin/icons/sample.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/templates/editor/java/$editorClass$.java b/ui/org.eclipse.pde.ui/templates/editor/java/$editorClass$.java
deleted file mode 100644
index d248dae..0000000
--- a/ui/org.eclipse.pde.ui/templates/editor/java/$editorClass$.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package $packageName$;
-
-import org.eclipse.ui.editors.text.TextEditor;
-
-public class $editorClass$ extends TextEditor {
-
-	private ColorManager colorManager;
-
-	public $editorClass$() {
-		super();
-		colorManager = new ColorManager();
-		setSourceViewerConfiguration(new XMLConfiguration(colorManager));
-		setDocumentProvider(new XMLDocumentProvider());
-	}
-	public void dispose() {
-		colorManager.dispose();
-		super.dispose();
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/templates/editor/java/ColorManager.java b/ui/org.eclipse.pde.ui/templates/editor/java/ColorManager.java
deleted file mode 100644
index f98c700..0000000
--- a/ui/org.eclipse.pde.ui/templates/editor/java/ColorManager.java
+++ /dev/null

@@ -1,28 +0,0 @@
-package $packageName$;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Display;
-
-public class ColorManager {
-
-	protected Map fColorTable = new HashMap(10);
-
-	public void dispose() {
-		Iterator e = fColorTable.values().iterator();
-		while (e.hasNext())
-			 ((Color) e.next()).dispose();
-	}
-	public Color getColor(RGB rgb) {
-		Color color = (Color) fColorTable.get(rgb);
-		if (color == null) {
-			color = new Color(Display.getCurrent(), rgb);
-			fColorTable.put(rgb, color);
-		}
-		return color;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates/editor/java/IXMLColorConstants.java b/ui/org.eclipse.pde.ui/templates/editor/java/IXMLColorConstants.java
deleted file mode 100644
index 8425b44..0000000
--- a/ui/org.eclipse.pde.ui/templates/editor/java/IXMLColorConstants.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package $packageName$;
-
-import org.eclipse.swt.graphics.RGB;
-
-public interface IXMLColorConstants {
-	RGB XML_COMMENT = new RGB(128, 0, 0);
-	RGB PROC_INSTR = new RGB(128, 128, 128);
-	RGB STRING = new RGB(0, 128, 0);
-	RGB DEFAULT = new RGB(0, 0, 0);
-	RGB TAG = new RGB(0, 0, 128);
-}

diff --git a/ui/org.eclipse.pde.ui/templates/editor/java/NonRuleBasedDamagerRepairer.java b/ui/org.eclipse.pde.ui/templates/editor/java/NonRuleBasedDamagerRepairer.java
deleted file mode 100644
index 2a90346..0000000
--- a/ui/org.eclipse.pde.ui/templates/editor/java/NonRuleBasedDamagerRepairer.java
+++ /dev/null

@@ -1,138 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.text.BadLocationException;
-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.presentation.IPresentationDamager;
-import org.eclipse.jface.text.presentation.IPresentationRepairer;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.swt.custom.StyleRange;
-
-public class NonRuleBasedDamagerRepairer
-	implements IPresentationDamager, IPresentationRepairer {
-
-	/** The document this object works on */
-	protected IDocument fDocument;
-	/** The default text attribute if non is returned as data by the current token */
-	protected TextAttribute fDefaultTextAttribute;
-	
-	/**
-	 * Constructor for NonRuleBasedDamagerRepairer.
-	 */
-	public NonRuleBasedDamagerRepairer(TextAttribute defaultTextAttribute) {
-		Assert.isNotNull(defaultTextAttribute);
-
-		fDefaultTextAttribute = defaultTextAttribute;
-	}
-
-	/**
-	 * @see IPresentationRepairer#setDocument(IDocument)
-	 */
-	public void setDocument(IDocument document) {
-		fDocument = document;
-	}
-
-	/**
-	 * Returns the end offset of the line that contains the specified offset or
-	 * if the offset is inside a line delimiter, the end offset of the next line.
-	 *
-	 * @param offset the offset whose line end offset must be computed
-	 * @return the line end offset for the given offset
-	 * @exception BadLocationException if offset is invalid in the current document
-	 */
-	protected int endOfLineOf(int offset) throws BadLocationException {
-
-		IRegion info = fDocument.getLineInformationOfOffset(offset);
-		if (offset <= info.getOffset() + info.getLength())
-			return info.getOffset() + info.getLength();
-
-		int line = fDocument.getLineOfOffset(offset);
-		try {
-			info = fDocument.getLineInformation(line + 1);
-			return info.getOffset() + info.getLength();
-		} catch (BadLocationException x) {
-			return fDocument.getLength();
-		}
-	}
-
-	/**
-	 * @see IPresentationDamager#getDamageRegion(ITypedRegion, DocumentEvent, boolean)
-	 */
-	public IRegion getDamageRegion(
-		ITypedRegion partition,
-		DocumentEvent event,
-		boolean documentPartitioningChanged) {
-		if (!documentPartitioningChanged) {
-			try {
-
-				IRegion info =
-					fDocument.getLineInformationOfOffset(event.getOffset());
-				int start = Math.max(partition.getOffset(), info.getOffset());
-
-				int end =
-					event.getOffset()
-						+ (event.getText() == null
-							? event.getLength()
-							: event.getText().length());
-
-				if (info.getOffset() <= end
-					&& end <= info.getOffset() + info.getLength()) {
-					// optimize the case of the same line
-					end = info.getOffset() + info.getLength();
-				} else
-					end = endOfLineOf(end);
-
-				end =
-					Math.min(
-						partition.getOffset() + partition.getLength(),
-						end);
-				return new Region(start, end - start);
-
-			} catch (BadLocationException x) {
-			}
-		}
-
-		return partition;
-	}
-
-	/**
-	 * @see IPresentationRepairer#createPresentation(TextPresentation, ITypedRegion)
-	 */
-	public void createPresentation(
-		TextPresentation presentation,
-		ITypedRegion region) {
-		addRange(
-			presentation,
-			region.getOffset(),
-			region.getLength(),
-			fDefaultTextAttribute);
-	}
-
-	/**
-	 * Adds style information to the given text presentation.
-	 *
-	 * @param presentation the text presentation to be extended
-	 * @param offset the offset of the range to be styled
-	 * @param length the length of the range to be styled
-	 * @param attr the attribute describing the style of the range to be styled
-	 */
-	protected void addRange(
-		TextPresentation presentation,
-		int offset,
-		int length,
-		TextAttribute attr) {
-		if (attr != null)
-			presentation.addStyleRange(
-				new StyleRange(
-					offset,
-					length,
-					attr.getForeground(),
-					attr.getBackground(),
-					attr.getStyle()));
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates/editor/java/TagRule.java b/ui/org.eclipse.pde.ui/templates/editor/java/TagRule.java
deleted file mode 100644
index a9efd22..0000000
--- a/ui/org.eclipse.pde.ui/templates/editor/java/TagRule.java
+++ /dev/null

@@ -1,31 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.text.rules.*;
-
-public class TagRule extends MultiLineRule {
-
-	public TagRule(IToken token) {
-		super("<", ">", token);
-	}
-	protected boolean sequenceDetected(
-		ICharacterScanner scanner,
-		char[] sequence,
-		boolean eofAllowed) {
-		int c = scanner.read();
-		if (sequence[0] == '<') {
-			if (c == '?') {
-				// processing instruction - abort
-				scanner.unread();
-				return false;
-			}
-			if (c == '!') {
-				scanner.unread();
-				// comment - abort
-				return false;
-			}
-		} else if (sequence[0] == '>') {
-			scanner.unread();
-		}
-		return super.sequenceDetected(scanner, sequence, eofAllowed);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates/editor/java/XMLConfiguration.java b/ui/org.eclipse.pde.ui/templates/editor/java/XMLConfiguration.java
deleted file mode 100644
index 31d0c0c..0000000
--- a/ui/org.eclipse.pde.ui/templates/editor/java/XMLConfiguration.java
+++ /dev/null

@@ -1,79 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextDoubleClickStrategy;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.jface.text.presentation.IPresentationReconciler;
-import org.eclipse.jface.text.presentation.PresentationReconciler;
-import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
-import org.eclipse.jface.text.rules.Token;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.text.source.SourceViewerConfiguration;
-
-public class XMLConfiguration extends SourceViewerConfiguration {
-	private XMLDoubleClickStrategy doubleClickStrategy;
-	private XMLTagScanner tagScanner;
-	private XMLScanner scanner;
-	private ColorManager colorManager;
-
-	public XMLConfiguration(ColorManager colorManager) {
-		this.colorManager = colorManager;
-	}
-	public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
-		return new String[] {
-			IDocument.DEFAULT_CONTENT_TYPE,
-			XMLPartitionScanner.XML_COMMENT,
-			XMLPartitionScanner.XML_TAG };
-	}
-	public ITextDoubleClickStrategy getDoubleClickStrategy(
-		ISourceViewer sourceViewer,
-		String contentType) {
-		if (doubleClickStrategy == null)
-			doubleClickStrategy = new XMLDoubleClickStrategy();
-		return doubleClickStrategy;
-	}
-
-	protected XMLScanner getXMLScanner() {
-		if (scanner == null) {
-			scanner = new XMLScanner(colorManager);
-			scanner.setDefaultReturnToken(
-				new Token(
-					new TextAttribute(
-						colorManager.getColor(IXMLColorConstants.DEFAULT))));
-		}
-		return scanner;
-	}
-	protected XMLTagScanner getXMLTagScanner() {
-		if (tagScanner == null) {
-			tagScanner = new XMLTagScanner(colorManager);
-			tagScanner.setDefaultReturnToken(
-				new Token(
-					new TextAttribute(
-						colorManager.getColor(IXMLColorConstants.TAG))));
-		}
-		return tagScanner;
-	}
-
-	public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) {
-		PresentationReconciler reconciler = new PresentationReconciler();
-
-		DefaultDamagerRepairer dr =
-			new DefaultDamagerRepairer(getXMLTagScanner());
-		reconciler.setDamager(dr, XMLPartitionScanner.XML_TAG);
-		reconciler.setRepairer(dr, XMLPartitionScanner.XML_TAG);
-
-		dr = new DefaultDamagerRepairer(getXMLScanner());
-		reconciler.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE);
-		reconciler.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);
-
-		NonRuleBasedDamagerRepairer ndr =
-			new NonRuleBasedDamagerRepairer(
-				new TextAttribute(
-					colorManager.getColor(IXMLColorConstants.XML_COMMENT)));
-		reconciler.setDamager(ndr, XMLPartitionScanner.XML_COMMENT);
-		reconciler.setRepairer(ndr, XMLPartitionScanner.XML_COMMENT);
-
-		return reconciler;
-	}
-
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates/editor/java/XMLDocumentProvider.java b/ui/org.eclipse.pde.ui/templates/editor/java/XMLDocumentProvider.java
deleted file mode 100644
index 023b5aa..0000000
--- a/ui/org.eclipse.pde.ui/templates/editor/java/XMLDocumentProvider.java
+++ /dev/null

@@ -1,25 +0,0 @@
-package $packageName$;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.rules.DefaultPartitioner;
-import org.eclipse.ui.editors.text.FileDocumentProvider;
-
-public class XMLDocumentProvider extends FileDocumentProvider {
-
-	protected IDocument createDocument(Object element) throws CoreException {
-		IDocument document = super.createDocument(element);
-		if (document != null) {
-			IDocumentPartitioner partitioner =
-				new DefaultPartitioner(
-					new XMLPartitionScanner(),
-					new String[] {
-						XMLPartitionScanner.XML_TAG,
-						XMLPartitionScanner.XML_COMMENT });
-			partitioner.connect(document);
-			document.setDocumentPartitioner(partitioner);
-		}
-		return document;
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates/editor/java/XMLDoubleClickStrategy.java b/ui/org.eclipse.pde.ui/templates/editor/java/XMLDoubleClickStrategy.java
deleted file mode 100644
index bc901f7..0000000
--- a/ui/org.eclipse.pde.ui/templates/editor/java/XMLDoubleClickStrategy.java
+++ /dev/null

@@ -1,112 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.text.*;
-
-public class XMLDoubleClickStrategy implements ITextDoubleClickStrategy {
-	protected ITextViewer fText;
-
-	public void doubleClicked(ITextViewer part) {
-		int pos = part.getSelectedRange().x;
-
-		if (pos < 0)
-			return;
-
-		fText = part;
-
-		if (!selectComment(pos)) {
-			selectWord(pos);
-		}
-	}
-	protected boolean selectComment(int caretPos) {
-		IDocument doc = fText.getDocument();
-		int startPos, endPos;
-
-		try {
-			int pos = caretPos;
-			char c = ' ';
-
-			while (pos >= 0) {
-				c = doc.getChar(pos);
-				if (c == '\\') {
-					pos -= 2;
-					continue;
-				}
-				if (c == Character.LINE_SEPARATOR || c == '\"')
-					break;
-				--pos;
-			}
-
-			if (c != '\"')
-				return false;
-
-			startPos = pos;
-
-			pos = caretPos;
-			int length = doc.getLength();
-			c = ' ';
-
-			while (pos < length) {
-				c = doc.getChar(pos);
-				if (c == Character.LINE_SEPARATOR || c == '\"')
-					break;
-				++pos;
-			}
-			if (c != '\"')
-				return false;
-
-			endPos = pos;
-
-			int offset = startPos + 1;
-			int len = endPos - offset;
-			fText.setSelectedRange(offset, len);
-			return true;
-		} catch (BadLocationException x) {
-		}
-
-		return false;
-	}
-	protected boolean selectWord(int caretPos) {
-
-		IDocument doc = fText.getDocument();
-		int startPos, endPos;
-
-		try {
-
-			int pos = caretPos;
-			char c;
-
-			while (pos >= 0) {
-				c = doc.getChar(pos);
-				if (!Character.isJavaIdentifierPart(c))
-					break;
-				--pos;
-			}
-
-			startPos = pos;
-
-			pos = caretPos;
-			int length = doc.getLength();
-
-			while (pos < length) {
-				c = doc.getChar(pos);
-				if (!Character.isJavaIdentifierPart(c))
-					break;
-				++pos;
-			}
-
-			endPos = pos;
-			selectRange(startPos, endPos);
-			return true;
-
-		} catch (BadLocationException x) {
-		}
-
-		return false;
-	}
-
-	private void selectRange(int startPos, int stopPos) {
-		int offset = startPos + 1;
-		int length = stopPos - offset;
-		fText.setSelectedRange(offset, length);
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates/editor/java/XMLPartitionScanner.java b/ui/org.eclipse.pde.ui/templates/editor/java/XMLPartitionScanner.java
deleted file mode 100644
index bbd1ef4..0000000
--- a/ui/org.eclipse.pde.ui/templates/editor/java/XMLPartitionScanner.java
+++ /dev/null

@@ -1,22 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.text.rules.*;
-
-public class XMLPartitionScanner extends RuleBasedPartitionScanner {
-	public final static String XML_DEFAULT = "__xml_default";
-	public final static String XML_COMMENT = "__xml_comment";
-	public final static String XML_TAG = "__xml_tag";
-
-	public XMLPartitionScanner() {
-
-		IToken xmlComment = new Token(XML_COMMENT);
-		IToken tag = new Token(XML_TAG);
-
-		IPredicateRule[] rules = new IPredicateRule[2];
-
-		rules[0] = new MultiLineRule("<!--", "-->", xmlComment);
-		rules[1] = new TagRule(tag);
-
-		setPredicateRules(rules);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates/editor/java/XMLScanner.java b/ui/org.eclipse.pde.ui/templates/editor/java/XMLScanner.java
deleted file mode 100644
index c0a2bc2..0000000
--- a/ui/org.eclipse.pde.ui/templates/editor/java/XMLScanner.java
+++ /dev/null

@@ -1,22 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.text.rules.*;
-import org.eclipse.jface.text.*;
-
-public class XMLScanner extends RuleBasedScanner {
-
-	public XMLScanner(ColorManager manager) {
-		IToken procInstr =
-			new Token(
-				new TextAttribute(
-					manager.getColor(IXMLColorConstants.PROC_INSTR)));
-
-		IRule[] rules = new IRule[2];
-		//Add rule for processing instructions
-		rules[0] = new SingleLineRule("<?", "?>", procInstr);
-		// Add generic whitespace rule.
-		rules[1] = new WhitespaceRule(new XMLWhitespaceDetector());
-
-		setRules(rules);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates/editor/java/XMLTagScanner.java b/ui/org.eclipse.pde.ui/templates/editor/java/XMLTagScanner.java
deleted file mode 100644
index 109a6ee..0000000
--- a/ui/org.eclipse.pde.ui/templates/editor/java/XMLTagScanner.java
+++ /dev/null

@@ -1,24 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.text.*;
-import org.eclipse.jface.text.rules.*;
-
-public class XMLTagScanner extends RuleBasedScanner {
-
-	public XMLTagScanner(ColorManager manager) {
-		IToken string =
-			new Token(
-				new TextAttribute(manager.getColor(IXMLColorConstants.STRING)));
-
-		IRule[] rules = new IRule[3];
-
-		// Add rule for double quotes
-		rules[0] = new SingleLineRule("\"", "\"", string, '\\');
-		// Add a rule for single quotes
-		rules[1] = new SingleLineRule("'", "'", string, '\\');
-		// Add generic whitespace rule.
-		rules[2] = new WhitespaceRule(new XMLWhitespaceDetector());
-
-		setRules(rules);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates/editor/java/XMLWhitespaceDetector.java b/ui/org.eclipse.pde.ui/templates/editor/java/XMLWhitespaceDetector.java
deleted file mode 100644
index 3faa92a..0000000
--- a/ui/org.eclipse.pde.ui/templates/editor/java/XMLWhitespaceDetector.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.text.rules.IWhitespaceDetector;
-
-public class XMLWhitespaceDetector implements IWhitespaceDetector {
-
-	public boolean isWhitespace(char c) {
-		return (c == ' ' || c == '\t' || c == '\n' || c == '\r');
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates/helloWorld/bin/icons/sample.gif b/ui/org.eclipse.pde.ui/templates/helloWorld/bin/icons/sample.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/ui/org.eclipse.pde.ui/templates/helloWorld/bin/icons/sample.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/templates/helloWorld/java/$className$.java b/ui/org.eclipse.pde.ui/templates/helloWorld/java/$className$.java
deleted file mode 100644
index 632fc8a..0000000
--- a/ui/org.eclipse.pde.ui/templates/helloWorld/java/$className$.java
+++ /dev/null

@@ -1,64 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.jface.dialogs.MessageDialog;
-
-/**
- * Our sample action implements workbench action delegate.
- * The action proxy will be created by the workbench and
- * shown in the UI. When the user tries to use the action,
- * this delegate will be created and execution will be 
- * delegated to it.
- * @see IWorkbenchWindowActionDelegate
- */
-public class $className$ implements IWorkbenchWindowActionDelegate {
-	private IWorkbenchWindow window;
-	/**
-	 * The constructor.
-	 */
-	public $className$() {
-	}
-
-	/**
-	 * The action has been activated. The argument of the
-	 * method represents the 'real' action sitting
-	 * in the workbench UI.
-	 * @see IWorkbenchWindowActionDelegate#run
-	 */
-	public void run(IAction action) {
-		MessageDialog.openInformation(
-			window.getShell(),
-			"$pluginName$",
-			"$message$");
-	}
-
-	/**
-	 * Selection in the workbench has been changed. We 
-	 * can change the state of the 'real' action here
-	 * if we want, but this can only happen after 
-	 * the delegate has been created.
-	 * @see IWorkbenchWindowActionDelegate#selectionChanged
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-	}
-
-	/**
-	 * We can use this method to dispose of any system
-	 * resources we previously allocated.
-	 * @see IWorkbenchWindowActionDelegate#dispose
-	 */
-	public void dispose() {
-	}
-
-	/**
-	 * We will cache window object in order to
-	 * be able to provide parent shell for the message dialog.
-	 * @see IWorkbenchWindowActionDelegate#init
-	 */
-	public void init(IWorkbenchWindow window) {
-		this.window = window;
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates/help/bin/html/concepts/maintopic.html b/ui/org.eclipse.pde.ui/templates/help/bin/html/concepts/maintopic.html
deleted file mode 100644
index a476078..0000000
--- a/ui/org.eclipse.pde.ui/templates/help/bin/html/concepts/maintopic.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Main Topic</title>
-</head>
-
-<body>
-<h1>Main Topic</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates/help/bin/html/concepts/subtopic.html b/ui/org.eclipse.pde.ui/templates/help/bin/html/concepts/subtopic.html
deleted file mode 100644
index 8a61c50..0000000
--- a/ui/org.eclipse.pde.ui/templates/help/bin/html/concepts/subtopic.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Sub Topic</title>
-</head>
-
-<body>
-<h1>Sub Topic</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates/help/bin/html/concepts/subtopic2.html b/ui/org.eclipse.pde.ui/templates/help/bin/html/concepts/subtopic2.html
deleted file mode 100644
index 86bcbf9..0000000
--- a/ui/org.eclipse.pde.ui/templates/help/bin/html/concepts/subtopic2.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Sub Topic 2</title>
-</head>
-
-<body>
-<h1>Sub Topic 2</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates/help/bin/html/gettingstarted/maintopic.html b/ui/org.eclipse.pde.ui/templates/help/bin/html/gettingstarted/maintopic.html
deleted file mode 100644
index a476078..0000000
--- a/ui/org.eclipse.pde.ui/templates/help/bin/html/gettingstarted/maintopic.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Main Topic</title>
-</head>
-
-<body>
-<h1>Main Topic</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates/help/bin/html/gettingstarted/subtopic.html b/ui/org.eclipse.pde.ui/templates/help/bin/html/gettingstarted/subtopic.html
deleted file mode 100644
index 8a61c50..0000000
--- a/ui/org.eclipse.pde.ui/templates/help/bin/html/gettingstarted/subtopic.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Sub Topic</title>
-</head>
-
-<body>
-<h1>Sub Topic</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates/help/bin/html/gettingstarted/subtopic2.html b/ui/org.eclipse.pde.ui/templates/help/bin/html/gettingstarted/subtopic2.html
deleted file mode 100644
index 86bcbf9..0000000
--- a/ui/org.eclipse.pde.ui/templates/help/bin/html/gettingstarted/subtopic2.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Sub Topic 2</title>
-</head>
-
-<body>
-<h1>Sub Topic 2</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates/help/bin/html/maintopic.html b/ui/org.eclipse.pde.ui/templates/help/bin/html/maintopic.html
deleted file mode 100644
index a476078..0000000
--- a/ui/org.eclipse.pde.ui/templates/help/bin/html/maintopic.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Main Topic</title>
-</head>
-
-<body>
-<h1>Main Topic</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates/help/bin/html/reference/maintopic.html b/ui/org.eclipse.pde.ui/templates/help/bin/html/reference/maintopic.html
deleted file mode 100644
index a476078..0000000
--- a/ui/org.eclipse.pde.ui/templates/help/bin/html/reference/maintopic.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Main Topic</title>
-</head>
-
-<body>
-<h1>Main Topic</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates/help/bin/html/reference/subtopic.html b/ui/org.eclipse.pde.ui/templates/help/bin/html/reference/subtopic.html
deleted file mode 100644
index 8a61c50..0000000
--- a/ui/org.eclipse.pde.ui/templates/help/bin/html/reference/subtopic.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Sub Topic</title>
-</head>
-
-<body>
-<h1>Sub Topic</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates/help/bin/html/reference/subtopic2.html b/ui/org.eclipse.pde.ui/templates/help/bin/html/reference/subtopic2.html
deleted file mode 100644
index 86bcbf9..0000000
--- a/ui/org.eclipse.pde.ui/templates/help/bin/html/reference/subtopic2.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Sub Topic 2</title>
-</head>
-
-<body>
-<h1>Sub Topic 2</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates/help/bin/html/samples/maintopic.html b/ui/org.eclipse.pde.ui/templates/help/bin/html/samples/maintopic.html
deleted file mode 100644
index a476078..0000000
--- a/ui/org.eclipse.pde.ui/templates/help/bin/html/samples/maintopic.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Main Topic</title>
-</head>
-
-<body>
-<h1>Main Topic</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates/help/bin/html/samples/subtopic.html b/ui/org.eclipse.pde.ui/templates/help/bin/html/samples/subtopic.html
deleted file mode 100644
index 8a61c50..0000000
--- a/ui/org.eclipse.pde.ui/templates/help/bin/html/samples/subtopic.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Sub Topic</title>
-</head>
-
-<body>
-<h1>Sub Topic</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates/help/bin/html/samples/subtopic2.html b/ui/org.eclipse.pde.ui/templates/help/bin/html/samples/subtopic2.html
deleted file mode 100644
index 86bcbf9..0000000
--- a/ui/org.eclipse.pde.ui/templates/help/bin/html/samples/subtopic2.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Sub Topic 2</title>
-</head>
-
-<body>
-<h1>Sub Topic 2</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates/help/bin/html/subtopic.html b/ui/org.eclipse.pde.ui/templates/help/bin/html/subtopic.html
deleted file mode 100644
index 8a61c50..0000000
--- a/ui/org.eclipse.pde.ui/templates/help/bin/html/subtopic.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Sub Topic</title>
-</head>
-
-<body>
-<h1>Sub Topic</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates/help/bin/html/tasks/maintopic.html b/ui/org.eclipse.pde.ui/templates/help/bin/html/tasks/maintopic.html
deleted file mode 100644
index a476078..0000000
--- a/ui/org.eclipse.pde.ui/templates/help/bin/html/tasks/maintopic.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Main Topic</title>
-</head>
-
-<body>
-<h1>Main Topic</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates/help/bin/html/tasks/subtopic.html b/ui/org.eclipse.pde.ui/templates/help/bin/html/tasks/subtopic.html
deleted file mode 100644
index 8a61c50..0000000
--- a/ui/org.eclipse.pde.ui/templates/help/bin/html/tasks/subtopic.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Sub Topic</title>
-</head>
-
-<body>
-<h1>Sub Topic</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates/help/bin/html/tasks/subtopic2.html b/ui/org.eclipse.pde.ui/templates/help/bin/html/tasks/subtopic2.html
deleted file mode 100644
index 86bcbf9..0000000
--- a/ui/org.eclipse.pde.ui/templates/help/bin/html/tasks/subtopic2.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Sub Topic 2</title>
-</head>
-
-<body>
-<h1>Sub Topic 2</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates/help/bin/html/toc.html b/ui/org.eclipse.pde.ui/templates/help/bin/html/toc.html
deleted file mode 100644
index 326f0a9..0000000
--- a/ui/org.eclipse.pde.ui/templates/help/bin/html/toc.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Table of Contents</title>
-</head>
-
-<body>
-<h1>Table of Contents</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates/help/bin/tocconcepts.xml b/ui/org.eclipse.pde.ui/templates/help/bin/tocconcepts.xml
deleted file mode 100644
index d01f925..0000000
--- a/ui/org.eclipse.pde.ui/templates/help/bin/tocconcepts.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Concepts" link_to="toc.xml#concepts"> 
-	<topic label="Main Topic"  href="html/concepts/maintopic.html"> 
-		<topic label="Sub Topic" href="html/concepts/subtopic.html" /> 
-	</topic>
-	<topic label="Main Topic 2">
-		<topic label="Sub Topic 2" href="html/concepts/subtopic2.html" /> 
-	</topic> 
-</toc>

diff --git a/ui/org.eclipse.pde.ui/templates/help/bin/tocgettingstarted.xml b/ui/org.eclipse.pde.ui/templates/help/bin/tocgettingstarted.xml
deleted file mode 100644
index 38f27e0..0000000
--- a/ui/org.eclipse.pde.ui/templates/help/bin/tocgettingstarted.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Getting Started" link_to="toc.xml#gettingstarted"> 
-	<topic label="Main Topic"  href="html/gettingstarted/maintopic.html"> 
-		<topic label="Sub Topic" href="html/gettingstarted/subtopic.html" /> 
-	</topic>
-	<topic label="Main Topic 2">
-		<topic label="Sub Topic 2" href="html/gettingstarted/subtopic2.html" />
-	</topic> 
-</toc>

diff --git a/ui/org.eclipse.pde.ui/templates/help/bin/tocreference.xml b/ui/org.eclipse.pde.ui/templates/help/bin/tocreference.xml
deleted file mode 100644
index 660cdec..0000000
--- a/ui/org.eclipse.pde.ui/templates/help/bin/tocreference.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Reference" link_to="toc.xml#reference"> 
-	<topic label="Main Topic"  href="html/reference/maintopic.html"> 
-		<topic label="Sub Topic" href="html/reference/subtopic.html" /> 
-	</topic>
-	<topic label="Main Topic 2">
-		<topic label="Sub Topic 2" href="html/reference/subtopic2.html" /> 
-	</topic> 
-</toc>

diff --git a/ui/org.eclipse.pde.ui/templates/help/bin/tocsamples.xml b/ui/org.eclipse.pde.ui/templates/help/bin/tocsamples.xml
deleted file mode 100644
index ddfa61e..0000000
--- a/ui/org.eclipse.pde.ui/templates/help/bin/tocsamples.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Samples" link_to="toc.xml#samples"> 
-	<topic label="Main Topic"  href="html/samples/maintopic.html"> 
-		<topic label="Sub Topic" href="html/samples/subtopic.html" /> 
-	</topic>
-	<topic label="Main Topic 2">
-		<topic label="Sub Topic 2" href="html/samples/subtopic2.html" /> 
-	</topic> 
-</toc>

diff --git a/ui/org.eclipse.pde.ui/templates/help/bin/toctasks.xml b/ui/org.eclipse.pde.ui/templates/help/bin/toctasks.xml
deleted file mode 100644
index c96b94b..0000000
--- a/ui/org.eclipse.pde.ui/templates/help/bin/toctasks.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Tasks" link_to="toc.xml#tasks"> 
-	<topic label="Main Topic"  href="html/tasks/maintopic.html"> 
-		<topic label="Sub Topic" href="html/tasks/subtopic.html" /> 
-	</topic>
-	<topic label="Main Topic 2">
-		<topic label="Sub Topic 2" href="html/tasks/subtopic2.html" /> 
-	</topic> 
-</toc>

diff --git a/ui/org.eclipse.pde.ui/templates/help/testToc.xml b/ui/org.eclipse.pde.ui/templates/help/testToc.xml
deleted file mode 100644
index bf1e67a..0000000
--- a/ui/org.eclipse.pde.ui/templates/help/testToc.xml
+++ /dev/null

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Test TOC" topic="html/toc.html">
-	<link toc="toc.xml" />
-</toc>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates/help/toc.xml b/ui/org.eclipse.pde.ui/templates/help/toc.xml
deleted file mode 100644
index a07728d..0000000
--- a/ui/org.eclipse.pde.ui/templates/help/toc.xml
+++ /dev/null

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-%if isPrimary
-<toc label="$tocLabel$" topic="html/toc.html">
-%else
-<toc label="$tocLabel$">
-%endif
-%if isPrimary && gettingStarted
-   <topic label="Getting Started">
-      <anchor id="gettingstarted"/>
-   </topic>
-%endif
-%if isPrimary && concepts
-   <topic label="Concepts">
-      <anchor id="concepts"/>
-   </topic>
-%endif
-%if isPrimary && tasks
-   <topic label="Tasks">
-      <anchor id="tasks"/>
-   </topic>
-%endif
-%if isPrimary && reference
-   <topic label="Reference">
-      <anchor id="reference"/>
-   </topic>
-%endif
-%if isPrimary && samples
-   <topic label="Samples">
-      <anchor id="samples"/>
-   </topic>
-%endif
-%if isPrimary && (gettingStarted || concepts || tasks || reference || samples) 
-%else
-	<topic label="Main Topic"  href="html/maintopic.html"> 
-		<topic label="Sub Topic" href="html/subtopic.html"/> 
-	</topic>
-	<topic label="Main Topic 2"/>
-%endif
-</toc>

diff --git a/ui/org.eclipse.pde.ui/templates/multiPageEditor/bin/icons/sample.gif b/ui/org.eclipse.pde.ui/templates/multiPageEditor/bin/icons/sample.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/ui/org.eclipse.pde.ui/templates/multiPageEditor/bin/icons/sample.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/templates/multiPageEditor/java/$contributorClassName$.java b/ui/org.eclipse.pde.ui/templates/multiPageEditor/java/$contributorClassName$.java
deleted file mode 100644
index 495d100..0000000
--- a/ui/org.eclipse.pde.ui/templates/multiPageEditor/java/$contributorClassName$.java
+++ /dev/null

@@ -1,102 +0,0 @@
-package $packageName$;
-
-
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.part.MultiPageEditorActionBarContributor;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.texteditor.ITextEditorActionConstants;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ISharedImages;
-
-/**
- * Manages the installation/deinstallation of global actions for multi-page editors.
- * Responsible for the redirection of global actions to the active editor.
- * Multi-page contributor replaces the contributors for the individual editors in the multi-page editor.
- */
-public class $contributorClassName$ extends MultiPageEditorActionBarContributor {
-	private IEditorPart activeEditorPart;
-	private Action sampleAction;
-	/**
-	 * Creates a multi-page contributor.
-	 */
-	public $contributorClassName$() {
-		super();
-		createActions();
-	}
-	/**
-	 * Returns the action registed with the given text editor.
-	 * @return IAction or null if editor is null.
-	 */
-	protected IAction getAction(ITextEditor editor, String actionID) {
-		return (editor == null ? null : editor.getAction(actionID));
-	}
-	/* (non-JavaDoc)
-	 * Method declared in AbstractMultiPageEditorActionBarContributor.
-	 */
-
-	public void setActivePage(IEditorPart part) {
-		if (activeEditorPart == part)
-			return;
-
-		activeEditorPart = part;
-
-		IActionBars actionBars = getActionBars();
-		if (actionBars != null) {
-
-			ITextEditor editor = (part instanceof ITextEditor) ? (ITextEditor) part : null;
-
-			actionBars.setGlobalActionHandler(
-				IWorkbenchActionConstants.DELETE,
-				getAction(editor, ITextEditorActionConstants.DELETE));
-			actionBars.setGlobalActionHandler(
-				IWorkbenchActionConstants.UNDO,
-				getAction(editor, ITextEditorActionConstants.UNDO));
-			actionBars.setGlobalActionHandler(
-				IWorkbenchActionConstants.REDO,
-				getAction(editor, ITextEditorActionConstants.REDO));
-			actionBars.setGlobalActionHandler(
-				IWorkbenchActionConstants.CUT,
-				getAction(editor, ITextEditorActionConstants.CUT));
-			actionBars.setGlobalActionHandler(
-				IWorkbenchActionConstants.COPY,
-				getAction(editor, ITextEditorActionConstants.COPY));
-			actionBars.setGlobalActionHandler(
-				IWorkbenchActionConstants.PASTE,
-				getAction(editor, ITextEditorActionConstants.PASTE));
-			actionBars.setGlobalActionHandler(
-				IWorkbenchActionConstants.SELECT_ALL,
-				getAction(editor, ITextEditorActionConstants.SELECT_ALL));
-			actionBars.setGlobalActionHandler(
-				IWorkbenchActionConstants.FIND,
-				getAction(editor, ITextEditorActionConstants.FIND));
-			actionBars.setGlobalActionHandler(
-				IWorkbenchActionConstants.BOOKMARK,
-				getAction(editor, ITextEditorActionConstants.BOOKMARK));
-			actionBars.updateActionBars();
-		}
-	}
-	private void createActions() {
-		sampleAction = new Action() {
-			public void run() {
-				MessageDialog.openInformation(null, "$pluginName$", "Sample Action Executed");
-			}
-		};
-		sampleAction.setText("Sample Action");
-		sampleAction.setToolTipText("Sample Action tool tip");
-		sampleAction.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().
-				getImageDescriptor(ISharedImages.IMG_OBJS_TASK_TSK));
-	}
-	public void contributeToMenu(IMenuManager manager) {
-		IMenuManager menu = new MenuManager("Editor &Menu");
-		manager.prependToGroup(IWorkbenchActionConstants.MB_ADDITIONS, menu);
-		menu.add(sampleAction);
-	}
-	public void contributeToToolBar(IToolBarManager manager) {
-		manager.add(new Separator());
-		manager.add(sampleAction);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates/multiPageEditor/java/$editorClassName$.java b/ui/org.eclipse.pde.ui/templates/multiPageEditor/java/$editorClassName$.java
deleted file mode 100644
index 071fab7..0000000
--- a/ui/org.eclipse.pde.ui/templates/multiPageEditor/java/$editorClassName$.java
+++ /dev/null

@@ -1,238 +0,0 @@
-package $packageName$;
-
-
-import java.io.StringWriter;
-import java.text.Collator;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.layout.FillLayout;
-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.Display;
-import org.eclipse.swt.widgets.FontDialog;
-import org.eclipse.ui.*;
-import org.eclipse.ui.editors.text.TextEditor;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.MultiPageEditorPart;
-
-/**
- * An example showing how to create a multi-page editor.
- * This example has 3 pages:
- * <ul>
- * <li>page 0 contains a nested text editor.
- * <li>page 1 allows you to change the font used in page 2
- * <li>page 2 shows the words in page 0 in sorted order
- * </ul>
- */
-public class $editorClassName$ extends MultiPageEditorPart implements IResourceChangeListener{
-
-	/** The text editor used in page 0. */
-	private TextEditor editor;
-
-	/** The font chosen in page 1. */
-	private Font font;
-
-	/** The text widget used in page 2. */
-	private StyledText text;
-	/**
-	 * Creates a multi-page editor example.
-	 */
-	public $editorClassName$() {
-		super();
-		ResourcesPlugin.getWorkspace().addResourceChangeListener(this);
-	}
-	/**
-	 * Creates page 0 of the multi-page editor,
-	 * which contains a text editor.
-	 */
-	void createPage0() {
-		try {
-			editor = new TextEditor();
-			int index = addPage(editor, getEditorInput());
-			setPageText(index, editor.getTitle());
-		} catch (PartInitException e) {
-			ErrorDialog.openError(
-				getSite().getShell(),
-				"Error creating nested text editor",
-				null,
-				e.getStatus());
-		}
-	}
-	/**
-	 * Creates page 1 of the multi-page editor,
-	 * which allows you to change the font used in page 2.
-	 */
-	void createPage1() {
-
-		Composite composite = new Composite(getContainer(), SWT.NONE);
-		GridLayout layout = new GridLayout();
-		composite.setLayout(layout);
-		layout.numColumns = 2;
-
-		Button fontButton = new Button(composite, SWT.NONE);
-		GridData gd = new GridData(GridData.BEGINNING);
-		gd.horizontalSpan = 2;
-		fontButton.setLayoutData(gd);
-		fontButton.setText("Change Font...");
-		
-		fontButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				setFont();
-			}
-		});
-
-		int index = addPage(composite);
-		setPageText(index, "Properties");
-	}
-	/**
-	 * Creates page 2 of the multi-page editor,
-	 * which shows the sorted text.
-	 */
-	void createPage2() {
-		Composite composite = new Composite(getContainer(), SWT.NONE);
-		FillLayout layout = new FillLayout();
-		composite.setLayout(layout);
-		text = new StyledText(composite, SWT.H_SCROLL | SWT.V_SCROLL);
-		text.setEditable(false);
-
-		int index = addPage(composite);
-		setPageText(index, "Preview");
-	}
-	/**
-	 * Creates the pages of the multi-page editor.
-	 */
-	protected void createPages() {
-		createPage0();
-		createPage1();
-		createPage2();
-	}
-	/**
-	 * The <code>MultiPageEditorPart</code> implementation of this 
-	 * <code>IWorkbenchPart</code> method disposes all nested editors.
-	 * Subclasses may extend.
-	 */
-	public void dispose() {
-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
-		super.dispose();
-	}
-	/**
-	 * Saves the multi-page editor's document.
-	 */
-	public void doSave(IProgressMonitor monitor) {
-		getEditor(0).doSave(monitor);
-	}
-	/**
-	 * Saves the multi-page editor's document as another file.
-	 * Also updates the text for page 0's tab, and updates this multi-page editor's input
-	 * to correspond to the nested editor's.
-	 */
-	public void doSaveAs() {
-		IEditorPart editor = getEditor(0);
-		editor.doSaveAs();
-		setPageText(0, editor.getTitle());
-		setInput(editor.getEditorInput());
-	}
-	/* (non-Javadoc)
-	 * Method declared on IEditorPart
-	 */
-	public void gotoMarker(IMarker marker) {
-		setActivePage(0);
-		getEditor(0).gotoMarker(marker);
-	}
-	/**
-	 * The <code>MultiPageEditorExample</code> implementation of this method
-	 * checks that the input is an instance of <code>IFileEditorInput</code>.
-	 */
-	public void init(IEditorSite site, IEditorInput editorInput)
-		throws PartInitException {
-		if (!(editorInput instanceof IFileEditorInput))
-			throw new PartInitException("Invalid Input: Must be IFileEditorInput");
-		super.init(site, editorInput);
-	}
-	/* (non-Javadoc)
-	 * Method declared on IEditorPart.
-	 */
-	public boolean isSaveAsAllowed() {
-		return true;
-	}
-	/**
-	 * Calculates the contents of page 2 when the it is activated.
-	 */
-	protected void pageChange(int newPageIndex) {
-		super.pageChange(newPageIndex);
-		if (newPageIndex == 2) {
-			sortWords();
-		}
-	}
-	/**
-	 * Closes all project files on project close.
-	 */
-	public void resourceChanged(final IResourceChangeEvent event){
-		if(event.getType() == IResourceChangeEvent.PRE_CLOSE){
-			Display.getDefault().asyncExec(new Runnable(){
-				public void run(){
-					IWorkbenchPage[] pages = getSite().getWorkbenchWindow().getPages();
-					for (int i = 0; i<pages.length; i++){
-						if(((FileEditorInput)editor.getEditorInput()).getFile().getProject().equals(event.getResource())){
-							IEditorPart editorPart = pages[i].findEditor((FileEditorInput)editor.getEditorInput());
-							pages[i].closeEditor(editorPart,true);
-						}
-					}
-				}            
-			});
-		}
-	}
-	/**
-	 * Sets the font related data to be applied to the text in page 2.
-	 */
-	void setFont() {
-		FontDialog fontDialog = new FontDialog(getSite().getShell());
-		fontDialog.setFontList(text.getFont().getFontData());
-		FontData fontData = fontDialog.open();
-		if (fontData != null) {
-			if (font != null)
-				font.dispose();
-			font = new Font(text.getDisplay(), fontData);
-			text.setFont(font);
-		}
-	}
-	/**
-	 * Sorts the words in page 0, and shows them in page 2.
-	 */
-	void sortWords() {
-
-		String editorText =
-			editor.getDocumentProvider().getDocument(editor.getEditorInput()).get();
-
-		StringTokenizer tokenizer =
-			new StringTokenizer(editorText, " \t\n\r\f!@#\u0024%^&*()-_=+`~[]{};:'\",.<>/?|\\");
-		ArrayList editorWords = new ArrayList();
-		while (tokenizer.hasMoreTokens()) {
-			editorWords.add(tokenizer.nextToken());
-		}
-
-		Collections.sort(editorWords, Collator.getInstance());
-		StringWriter displayText = new StringWriter();
-		for (int i = 0; i < editorWords.size(); i++) {
-			displayText.write(((String) editorWords.get(i)));
-			displayText.write(System.getProperty("line.separator"));
-		}
-		text.setText(displayText.toString());
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates/newWizard/bin/icons/sample.gif b/ui/org.eclipse.pde.ui/templates/newWizard/bin/icons/sample.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/ui/org.eclipse.pde.ui/templates/newWizard/bin/icons/sample.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/templates/newWizard/java/$wizardClassName$.java b/ui/org.eclipse.pde.ui/templates/newWizard/java/$wizardClassName$.java
deleted file mode 100644
index f26bd2b..0000000
--- a/ui/org.eclipse.pde.ui/templates/newWizard/java/$wizardClassName$.java
+++ /dev/null

@@ -1,149 +0,0 @@
-package $packageName$;
-
-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.core.runtime.*;
-import org.eclipse.jface.operation.*;
-import java.lang.reflect.InvocationTargetException;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.CoreException;
-import java.io.*;
-import org.eclipse.ui.*;
-
-/**
- * This is a sample new wizard. Its role is to create a new file 
- * resource in the provided container. If the container resource
- * (a folder or a project) is selected in the workspace 
- * when the wizard is opened, it will accept it as the target
- * container. The wizard creates one file with the extension
- * "$extension$". If a sample multi-page editor (also available
- * as a template) is registered for the same extension, it will
- * be able to open it.
- */
-
-public class $wizardClassName$ extends Wizard implements INewWizard {
-	private $wizardPageClassName$ page;
-	private ISelection selection;
-
-	/**
-	 * Constructor for $wizardClassName$.
-	 */
-	public $wizardClassName$() {
-		super();
-		setNeedsProgressMonitor(true);
-	}
-	
-	/**
-	 * Adding the page to the wizard.
-	 */
-
-	public void addPages() {
-		page = new $wizardPageClassName$(selection);
-		addPage(page);
-	}
-
-	/**
-	 * This method is called when 'Finish' button is pressed in
-	 * the wizard. We will create an operation and run it
-	 * using wizard as execution context.
-	 */
-	public boolean performFinish() {
-		final String containerName = page.getContainerName();
-		final String fileName = page.getFileName();
-		IRunnableWithProgress op = new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor) throws InvocationTargetException {
-				try {
-					doFinish(containerName, fileName, monitor);
-				} catch (CoreException e) {
-					throw new InvocationTargetException(e);
-				} finally {
-					monitor.done();
-				}
-			}
-		};
-		try {
-			getContainer().run(true, false, op);
-		} catch (InterruptedException e) {
-			return false;
-		} catch (InvocationTargetException e) {
-			Throwable realException = e.getTargetException();
-			MessageDialog.openError(getShell(), "Error", realException.getMessage());
-			return false;
-		}
-		return true;
-	}
-	
-	/**
-	 * The worker method. It will find the container, create the
-	 * file if missing or just replace its contents, and open
-	 * the editor on the newly created file.
-	 */
-
-	private void doFinish(
-		String containerName,
-		String fileName,
-		IProgressMonitor monitor)
-		throws CoreException {
-		// create a sample file
-		monitor.beginTask("Creating " + fileName, 2);
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		IResource resource = root.findMember(new Path(containerName));
-		if (!resource.exists() || !(resource instanceof IContainer)) {
-			throwCoreException("Container \"" + containerName + "\" does not exist.");
-		}
-		IContainer container = (IContainer) resource;
-		final IFile file = container.getFile(new Path(fileName));
-		try {
-			InputStream stream = openContentStream();
-			if (file.exists()) {
-				file.setContents(stream, true, true, monitor);
-			} else {
-				file.create(stream, true, monitor);
-			}
-			stream.close();
-		} catch (IOException e) {
-		}
-		monitor.worked(1);
-		monitor.setTaskName("Opening file for editing...");
-		getShell().getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				IWorkbenchPage page =
-					PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-				try {
-					page.openEditor(file);
-				} catch (PartInitException e) {
-				}
-			}
-		});
-		monitor.worked(1);
-	}
-	
-	/**
-	 * We will initialize file contents with a sample text.
-	 */
-
-	private InputStream openContentStream() {
-		String contents =
-			"This is the initial file contents for *.$extension$ file that should be word-sorted in the Preview page of the multi-page editor";
-		return new ByteArrayInputStream(contents.getBytes());
-	}
-
-	private void throwCoreException(String message) throws CoreException {
-		IStatus status =
-			new Status(IStatus.ERROR, "$pluginId$", IStatus.OK, message, null);
-		throw new CoreException(status);
-	}
-
-	/**
-	 * We will accept the selection in the workbench to see if
-	 * we can initialize from it.
-	 * @see IWorkbenchWizard#init(IWorkbench, IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		this.selection = selection;
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates/newWizard/java/$wizardPageClassName$.java b/ui/org.eclipse.pde.ui/templates/newWizard/java/$wizardPageClassName$.java
deleted file mode 100644
index c7b2c5d..0000000
--- a/ui/org.eclipse.pde.ui/templates/newWizard/java/$wizardPageClassName$.java
+++ /dev/null

@@ -1,160 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.swt.events.*;
-import org.eclipse.ui.dialogs.ContainerSelectionDialog;
-import org.eclipse.jface.viewers.*;
-
-/**
- * The "New" wizard page allows setting the container for
- * the new file as well as the file name. The page
- * will only accept file name without the extension OR
- * with the extension that matches the expected one ($extension$).
- */
-
-public class $wizardPageClassName$ extends WizardPage {
-	private Text containerText;
-	private Text fileText;
-	private ISelection selection;
-
-	/**
-	 * Constructor for SampleNewWizardPage.
-	 * @param pageName
-	 */
-	public $wizardPageClassName$(ISelection selection) {
-		super("wizardPage");
-		setTitle("Multi-page Editor File");
-		setDescription("This wizard creates a new file with *.$extension$ extension that can be opened by a multi-page editor.");
-		this.selection = selection;
-	}
-
-	/**
-	 * @see IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		container.setLayout(layout);
-		layout.numColumns = 3;
-		layout.verticalSpacing = 9;
-		Label label = new Label(container, SWT.NULL);
-		label.setText("&Container:");
-
-		containerText = new Text(container, SWT.BORDER | SWT.SINGLE);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		containerText.setLayoutData(gd);
-		containerText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				dialogChanged();
-			}
-		});
-
-		Button button = new Button(container, SWT.PUSH);
-		button.setText("Browse...");
-		button.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleBrowse();
-			}
-		});
-		label = new Label(container, SWT.NULL);
-		label.setText("&File name:");
-
-		fileText = new Text(container, SWT.BORDER | SWT.SINGLE);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		fileText.setLayoutData(gd);
-		fileText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				dialogChanged();
-			}
-		});
-		initialize();
-		dialogChanged();
-		setControl(container);
-	}
-	
-	/**
-	 * Tests if the current workbench selection is a suitable
-	 * container to use.
-	 */
-	
-	private void initialize() {
-		if (selection!=null && selection.isEmpty()==false && selection instanceof IStructuredSelection) {
-			IStructuredSelection ssel = (IStructuredSelection)selection;
-			if (ssel.size()>1) return;
-			Object obj = ssel.getFirstElement();
-			if (obj instanceof IResource) {
-				IContainer container;
-				if (obj instanceof IContainer)
-					container = (IContainer)obj;
-				else
-					container = ((IResource)obj).getParent();
-				containerText.setText(container.getFullPath().toString());
-			}
-		}
-		fileText.setText("$initialFileName$");
-	}
-	
-	/**
-	 * Uses the standard container selection dialog to
-	 * choose the new value for the container field.
-	 */
-
-	private void handleBrowse() {
-		ContainerSelectionDialog dialog =
-			new ContainerSelectionDialog(
-				getShell(),
-				ResourcesPlugin.getWorkspace().getRoot(),
-				false,
-				"Select new file container");
-		if (dialog.open() == ContainerSelectionDialog.OK) {
-			Object[] result = dialog.getResult();
-			if (result.length == 1) {
-				containerText.setText(((Path)result[0]).toOSString());
-			}
-		}
-	}
-	
-	/**
-	 * Ensures that both text fields are set.
-	 */
-
-	private void dialogChanged() {
-		String container = getContainerName();
-		String fileName = getFileName();
-
-		if (container.length() == 0) {
-			updateStatus("File container must be specified");
-			return;
-		}
-		if (fileName.length() == 0) {
-			updateStatus("File name must be specified");
-			return;
-		}
-		int dotLoc = fileName.lastIndexOf('.');
-		if (dotLoc != -1) {
-			String ext = fileName.substring(dotLoc + 1);
-			if (ext.equalsIgnoreCase("$extension$") == false) {
-				updateStatus("File extension must be \"$extension$\"");
-				return;
-			}
-		}
-		updateStatus(null);
-	}
-
-	private void updateStatus(String message) {
-		setErrorMessage(message);
-		setPageComplete(message == null);
-	}
-
-	public String getContainerName() {
-		return containerText.getText();
-	}
-	public String getFileName() {
-		return fileText.getText();
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates/popupMenus/java/$actionClass$.java b/ui/org.eclipse.pde.ui/templates/popupMenus/java/$actionClass$.java
deleted file mode 100644
index 5073eb4..0000000
--- a/ui/org.eclipse.pde.ui/templates/popupMenus/java/$actionClass$.java
+++ /dev/null

@@ -1,42 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-
-public class $actionClass$ implements IObjectActionDelegate {
-
-	/**
-	 * Constructor for Action1.
-	 */
-	public $actionClass$() {
-		super();
-	}
-
-	/**
-	 * @see IObjectActionDelegate#setActivePart(IAction, IWorkbenchPart)
-	 */
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-	}
-
-	/**
-	 * @see IActionDelegate#run(IAction)
-	 */
-	public void run(IAction action) {
-		Shell shell = new Shell();
-		MessageDialog.openInformation(
-			shell,
-			"$pluginName$",
-			"$actionLabel$ was executed.");
-	}
-
-	/**
-	 * @see IActionDelegate#selectionChanged(IAction, ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/templates/preferences/java/$pageClassName$.java b/ui/org.eclipse.pde.ui/templates/preferences/java/$pageClassName$.java
deleted file mode 100644
index 0a59691..0000000
--- a/ui/org.eclipse.pde.ui/templates/preferences/java/$pageClassName$.java
+++ /dev/null

@@ -1,83 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.preference.*;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.IWorkbench;
-import $fullPluginClassName$;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-/**
- * This class represents a preference page that
- * is contributed to the Preferences dialog. By 
- * subclassing <samp>FieldEditorPreferencePage</samp>, we
- * can use the field support built into JFace that allows
- * us to create a page that is small and knows how to 
- * save, restore and apply itself.
- * <p>
- * This page is used to modify preferences only. They
- * are stored in the preference store that belongs to
- * the main plug-in class. That way, preferences can
- * be accessed directly via the preference store.
- */
-
-%Options in the template
-%hasDefault
-
-public class $pageClassName$
-	extends FieldEditorPreferencePage
-	implements IWorkbenchPreferencePage {
-	public static final String P_PATH = "pathPreference";
-	public static final String P_BOOLEAN = "booleanPreference";
-	public static final String P_CHOICE = "choicePreference";
-	public static final String P_STRING = "stringPreference";
-
-	public $pageClassName$() {
-		super(GRID);
-%if hasDefault
-		setPreferenceStore($pluginClassName$.getDefault().getPreferenceStore());
-%else
-		setPreferenceStore($pluginClassName$.getDefault().getPreferenceStore());
-%endif
-		setDescription("A demonstration of a preference page implementation");
-		initializeDefaults();
-	}
-/**
- * Sets the default values of the preferences.
- */
-	private void initializeDefaults() {
-		IPreferenceStore store = getPreferenceStore();
-		store.setDefault(P_BOOLEAN, true);
-		store.setDefault(P_CHOICE, "choice2");
-		store.setDefault(P_STRING, "Default value");
-	}
-	
-/**
- * Creates the field editors. Field editors are abstractions of
- * the common GUI blocks needed to manipulate various types
- * of preferences. Each field editor knows how to save and
- * restore itself.
- */
-
-	public void createFieldEditors() {
-		addField(new DirectoryFieldEditor(P_PATH, 
-				"&Directory preference:", getFieldEditorParent()));
-		addField(
-			new BooleanFieldEditor(
-				P_BOOLEAN,
-				"&An example of a boolean preference",
-				getFieldEditorParent()));
-
-		addField(new RadioGroupFieldEditor(
-			P_CHOICE,
-			"An example of a multiple-choice preference",
-			1,
-			new String[][] { { "&Choice 1", "choice1" }, {
-				"C&hoice 2", "choice2" }
-		}, getFieldEditorParent()));
-		addField(
-			new StringFieldEditor(P_STRING, "A &text preference:", getFieldEditorParent()));
-	}
-	
-	public void init(IWorkbench workbench) {
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates/propertyPages/java/$className$.java b/ui/org.eclipse.pde.ui/templates/propertyPages/java/$className$.java
deleted file mode 100644
index 14c2b18..0000000
--- a/ui/org.eclipse.pde.ui/templates/propertyPages/java/$className$.java
+++ /dev/null

@@ -1,125 +0,0 @@
-package $packageName$;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.QualifiedName;
-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;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.PropertyPage;
-
-public class $className$ extends PropertyPage {
-
-	private static final String PATH_TITLE = "Path:";
-	private static final String OWNER_TITLE = "&Owner:";
-	private static final String OWNER_PROPERTY = "OWNER";
-	private static final String DEFAULT_OWNER = "John Doe";
-
-	private static final int TEXT_FIELD_WIDTH = 50;
-
-	private Text ownerText;
-
-	/**
-	 * Constructor for SamplePropertyPage.
-	 */
-	public $className$() {
-		super();
-	}
-
-	private void addFirstSection(Composite parent) {
-		Composite composite = createDefaultComposite(parent);
-
-		//Label for path field
-		Label pathLabel = new Label(composite, SWT.NONE);
-		pathLabel.setText(PATH_TITLE);
-
-		// Path text field
-		Text pathValueText = new Text(composite, SWT.WRAP | SWT.READ_ONLY);
-		pathValueText.setText(((IResource) getElement()).getFullPath().toString());
-	}
-
-	private void addSeparator(Composite parent) {
-		Label separator = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
-		GridData gridData = new GridData();
-		gridData.horizontalAlignment = GridData.FILL;
-		gridData.grabExcessHorizontalSpace = true;
-		separator.setLayoutData(gridData);
-	}
-
-	private void addSecondSection(Composite parent) {
-		Composite composite = createDefaultComposite(parent);
-
-		// Label for owner field
-		Label ownerLabel = new Label(composite, SWT.NONE);
-		ownerLabel.setText(OWNER_TITLE);
-
-		// Owner text field
-		ownerText = new Text(composite, SWT.SINGLE | SWT.BORDER);
-		GridData gd = new GridData();
-		gd.widthHint = convertWidthInCharsToPixels(TEXT_FIELD_WIDTH);
-		ownerText.setLayoutData(gd);
-
-		// Populate owner text field
-		try {
-			String owner =
-				((IResource) getElement()).getPersistentProperty(
-					new QualifiedName("", OWNER_PROPERTY));
-			ownerText.setText((owner != null) ? owner : DEFAULT_OWNER);
-		} catch (CoreException e) {
-			ownerText.setText(DEFAULT_OWNER);
-		}
-	}
-
-	/**
-	 * @see PreferencePage#createContents(Composite)
-	 */
-	protected Control createContents(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		composite.setLayout(layout);
-		GridData data = new GridData(GridData.FILL);
-		data.grabExcessHorizontalSpace = true;
-		composite.setLayoutData(data);
-
-		addFirstSection(composite);
-		addSeparator(composite);
-		addSecondSection(composite);
-		return composite;
-	}
-
-	private Composite createDefaultComposite(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		composite.setLayout(layout);
-
-		GridData data = new GridData();
-		data.verticalAlignment = GridData.FILL;
-		data.horizontalAlignment = GridData.FILL;
-		composite.setLayoutData(data);
-
-		return composite;
-	}
-
-	protected void performDefaults() {
-		// Populate the owner text field with the default value
-		ownerText.setText(DEFAULT_OWNER);
-	}
-	
-	public boolean performOk() {
-		// store the value in the owner text field
-		try {
-			((IResource) getElement()).setPersistentProperty(
-				new QualifiedName("", OWNER_PROPERTY),
-				ownerText.getText());
-		} catch (CoreException e) {
-			return false;
-		}
-		return true;
-	}
-
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates/view/bin/icons/sample.gif b/ui/org.eclipse.pde.ui/templates/view/bin/icons/sample.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/ui/org.eclipse.pde.ui/templates/view/bin/icons/sample.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/templates/view/java/$className$.java b/ui/org.eclipse.pde.ui/templates/view/java/$className$.java
deleted file mode 100644
index c11035a..0000000
--- a/ui/org.eclipse.pde.ui/templates/view/java/$className$.java
+++ /dev/null

@@ -1,384 +0,0 @@
-package $packageName$;
-
-%  if viewType =="treeViewer"
-import java.util.ArrayList;
-% endif
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.part.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.ui.*;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.SWT;
-% if viewType == "treeViewer"
-import org.eclipse.core.runtime.IAdaptable;
-% endif
-
-
-/**
- * This sample class demonstrates how to plug-in a new
- * workbench view. The view shows data obtained from the
- * model. The sample creates a dummy model on the fly,
- * but a real implementation would connect to the model
- * available either in this or another plug-in (e.g. the workspace).
- * The view is connected to the model using a content provider.
- * <p>
- * The view uses a label provider to define how model
- * objects should be presented in the view. Each
- * view can present the same model objects using
- * different labels and icons, if needed. Alternatively,
- * a single label provider can be shared between views
- * in order to ensure that objects of the same type are
- * presented in the same way everywhere.
- * <p>
- */
-% Options in the template:
-%
-% packageName
-% className
-% viewName
-% viewCategoryId
-% viewCategoryName
-% viewType
-% doubleClick
-% popup
-% localToolbar
-% localPulldown
-% sorter
-% filter
-% drillDown
-
-public class $className$ extends ViewPart {
-%if viewType == "tableViewer"
-	private TableViewer viewer;
-%else
-%  if viewType == "treeViewer"
-	private TreeViewer viewer;
-	private DrillDownAdapter drillDownAdapter;
-%  endif
-%endif
-%if (localToolbar || localPulldown || popup)
-	private Action action1;
-	private Action action2;
-%endif
-%if doubleClick
-	private Action doubleClickAction;
-%endif
-
-	/*
-	 * The content provider class is responsible for
-	 * providing objects to the view. It can wrap
-	 * existing objects in adapters or simply return
-	 * objects as-is. These objects may be sensitive
-	 * to the current input of the view, or ignore
-	 * it and always show the same content 
-	 * (like Task List, for example).
-	 */
-	 
-%if viewType == "tableViewer"
-	class ViewContentProvider implements IStructuredContentProvider {
-		public void inputChanged(Viewer v, Object oldInput, Object newInput) {
-		}
-		public void dispose() {
-		}
-		public Object[] getElements(Object parent) {
-			return new String[] { "One", "Two", "Three" };
-		}
-	}
-%else
-%  if viewType =="treeViewer"
-	class TreeObject implements IAdaptable {
-		private String name;
-		private TreeParent parent;
-		
-		public TreeObject(String name) {
-			this.name = name;
-		}
-		public String getName() {
-			return name;
-		}
-		public void setParent(TreeParent parent) {
-			this.parent = parent;
-		}
-		public TreeParent getParent() {
-			return parent;
-		}
-		public String toString() {
-			return getName();
-		}
-		public Object getAdapter(Class key) {
-			return null;
-		}
-	}
-	
-	class TreeParent extends TreeObject {
-		private ArrayList children;
-		public TreeParent(String name) {
-			super(name);
-			children = new ArrayList();
-		}
-		public void addChild(TreeObject child) {
-			children.add(child);
-			child.setParent(this);
-		}
-		public void removeChild(TreeObject child) {
-			children.remove(child);
-			child.setParent(null);
-		}
-		public TreeObject [] getChildren() {
-			return (TreeObject [])children.toArray(new TreeObject[children.size()]);
-		}
-		public boolean hasChildren() {
-			return children.size()>0;
-		}
-	}
-
-	class ViewContentProvider implements IStructuredContentProvider, 
-										   ITreeContentProvider {
-		private TreeParent invisibleRoot;
-
-		public void inputChanged(Viewer v, Object oldInput, Object newInput) {
-		}
-		public void dispose() {
-		}
-		public Object[] getElements(Object parent) {
-			if (parent.equals(getViewSite())) {
-				if (invisibleRoot==null) initialize();
-				return getChildren(invisibleRoot);
-			}
-			return getChildren(parent);
-		}
-		public Object getParent(Object child) {
-			if (child instanceof TreeObject) {
-				return ((TreeObject)child).getParent();
-			}
-			return null;
-		}
-		public Object [] getChildren(Object parent) {
-			if (parent instanceof TreeParent) {
-				return ((TreeParent)parent).getChildren();
-			}
-			return new Object[0];
-		}
-		public boolean hasChildren(Object parent) {
-			if (parent instanceof TreeParent)
-				return ((TreeParent)parent).hasChildren();
-			return false;
-		}
-/*
- * We will set up a dummy model to initialize tree heararchy.
- * In a real code, you will connect to a real model and
- * expose its hierarchy.
- */
-		private void initialize() {
-			TreeObject to1 = new TreeObject("Leaf 1");
-			TreeObject to2 = new TreeObject("Leaf 2");
-			TreeObject to3 = new TreeObject("Leaf 3");
-			TreeParent p1 = new TreeParent("Parent 1");
-			p1.addChild(to1);
-			p1.addChild(to2);
-			p1.addChild(to3);
-			
-			TreeObject to4 = new TreeObject("Leaf 4");
-			TreeParent p2 = new TreeParent("Parent 2");
-			p2.addChild(to4);
-			
-			TreeParent root = new TreeParent("Root");
-			root.addChild(p1);
-			root.addChild(p2);
-			
-			invisibleRoot = new TreeParent("");
-			invisibleRoot.addChild(root);
-		}
-	}
-%  endif
-%endif
-%if viewType == "tableViewer"
-	class ViewLabelProvider extends LabelProvider implements ITableLabelProvider {
-		public String getColumnText(Object obj, int index) {
-			return getText(obj);
-		}
-		public Image getColumnImage(Object obj, int index) {
-			return getImage(obj);
-		}
-		public Image getImage(Object obj) {
-			return PlatformUI.getWorkbench().
-					getSharedImages().getImage(ISharedImages.IMG_OBJ_ELEMENT);
-		}
-	}
-%else
-	class ViewLabelProvider extends LabelProvider {
-
-		public String getText(Object obj) {
-			return obj.toString();
-		}
-		public Image getImage(Object obj) {
-			String imageKey = ISharedImages.IMG_OBJ_ELEMENT;
-			if (obj instanceof TreeParent)
-			   imageKey = ISharedImages.IMG_OBJ_FOLDER;
-			return PlatformUI.getWorkbench().getSharedImages().getImage(imageKey);
-		}
-	}
-%endif
-%if sorter
-	class NameSorter extends ViewerSorter {
-	}
-%endif
-
-	/**
-	 * The constructor.
-	 */
-	public $className$() {
-	}
-
-	/**
-	 * This is a callback that will allow us
-	 * to create the viewer and initialize it.
-	 */
-	public void createPartControl(Composite parent) {
-%if viewType =="tableViewer"
-		viewer = new TableViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
-%else
-%  if viewType =="treeViewer"
-		viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
-		drillDownAdapter = new DrillDownAdapter(viewer);
-%  endif
-%endif
-		viewer.setContentProvider(new ViewContentProvider());
-		viewer.setLabelProvider(new ViewLabelProvider());
-%if sorter
-		viewer.setSorter(new NameSorter());
-%endif
-		viewer.setInput(getViewSite());
-%if (localToolbar || localPulldown || popup)
-		makeActions();
-%endif
-%if popup
-		hookContextMenu();
-%endif
-%if doubleClick
-		hookDoubleClickAction();
-%endif
-%if (localToolbar || localPulldown)
-		contributeToActionBars();
-%endif
-	}
-
-%if popup	
-	private void hookContextMenu() {
-		MenuManager menuMgr = new MenuManager("#PopupMenu");
-		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(new IMenuListener() {
-			public void menuAboutToShow(IMenuManager manager) {
-				$className$.this.fillContextMenu(manager);
-			}
-		});
-		Menu menu = menuMgr.createContextMenu(viewer.getControl());
-		viewer.getControl().setMenu(menu);
-		getSite().registerContextMenu(menuMgr, viewer);
-	}
-%endif
-
-%if (localToolbar || localPulldown)	
-	private void contributeToActionBars() {
-		IActionBars bars = getViewSite().getActionBars();
-%if localPulldown
-		fillLocalPullDown(bars.getMenuManager());
-%endif
-%if localToolbar
-		fillLocalToolBar(bars.getToolBarManager());
-%endif
-	}
-%endif
-
-%if localPulldown	
-	private void fillLocalPullDown(IMenuManager manager) {
-		manager.add(action1);
-		manager.add(new Separator());
-		manager.add(action2);
-	}
-%endif
-
-%if popup	
-	private void fillContextMenu(IMenuManager manager) {
-		manager.add(action1);
-		manager.add(action2);
-%   if viewType == "treeViewer"
-		manager.add(new Separator());
-		drillDownAdapter.addNavigationActions(manager);
-%   endif
-		// Other plug-ins can contribute there actions here
-		manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-	}
-%endif
-	
-%if localToolbar
-	private void fillLocalToolBar(IToolBarManager manager) {
-		manager.add(action1);
-		manager.add(action2);
-%   if viewType == "treeViewer"
-		manager.add(new Separator());
-		drillDownAdapter.addNavigationActions(manager);
-%  endif
-	}
-%endif
-
-%if (localToolbar || localPulldown || popup)	
-	private void makeActions() {
-		action1 = new Action() {
-			public void run() {
-				showMessage("Action 1 executed");
-			}
-		};
-		action1.setText("Action 1");
-		action1.setToolTipText("Action 1 tooltip");
-		action1.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().
-			getImageDescriptor(ISharedImages.IMG_OBJS_INFO_TSK));
-		
-		action2 = new Action() {
-			public void run() {
-				showMessage("Action 2 executed");
-			}
-		};
-		action2.setText("Action 2");
-		action2.setToolTipText("Action 2 tooltip");
-		action2.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().
-			getImageDescriptor(ISharedImages.IMG_OBJS_TASK_TSK));
-%   if doubleClick		
-		doubleClickAction = new Action() {
-			public void run() {
-				ISelection selection = viewer.getSelection();
-				Object obj = ((IStructuredSelection)selection).getFirstElement();
-				showMessage("Double-click detected on "+obj.toString());
-			}
-		};
-%   endif
-	}
-%endif
-
-%if doubleClick	
-	private void hookDoubleClickAction() {
-		viewer.addDoubleClickListener(new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent event) {
-				doubleClickAction.run();
-			}
-		});
-	}
-%endif	
-	private void showMessage(String message) {
-		MessageDialog.openInformation(
-			viewer.getControl().getShell(),
-			"$viewName$",
-			message);
-	}
-
-	/**
-	 * Passing the focus request to the viewer's control.
-	 */
-	public void setFocus() {
-		viewer.getControl().setFocus();
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/builder/java/$builderClassName$.java b/ui/org.eclipse.pde.ui/templates_3.0/builder/java/$builderClassName$.java
deleted file mode 100644
index 5c3aee9..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/builder/java/$builderClassName$.java
+++ /dev/null

@@ -1,166 +0,0 @@
-package $packageName$;
-
-import java.util.Map;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.helpers.DefaultHandler;
-
-public class $builderClassName$ extends IncrementalProjectBuilder {
-
-	class SampleDeltaVisitor implements IResourceDeltaVisitor {
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
-		 */
-		public boolean visit(IResourceDelta delta) throws CoreException {
-			IResource resource = delta.getResource();
-			switch (delta.getKind()) {
-			case IResourceDelta.ADDED:
-				// handle added resource
-				checkXML(resource);
-				break;
-			case IResourceDelta.REMOVED:
-				// handle removed resource
-				break;
-			case IResourceDelta.CHANGED:
-				// handle changed resource
-				checkXML(resource);
-				break;
-			}
-			//return true to continue visiting children.
-			return true;
-		}
-	}
-
-	class SampleResourceVisitor implements IResourceVisitor {
-		public boolean visit(IResource resource) {
-			checkXML(resource);
-			//return true to continue visiting children.
-			return true;
-		}
-	}
-
-	class XMLErrorHandler extends DefaultHandler {
-		
-		private IFile file;
-
-		public XMLErrorHandler(IFile file) {
-			this.file = file;
-		}
-
-		private void addMarker(SAXParseException e, int severity) {
-			$builderClassName$.this.addMarker(file, e.getMessage(), e
-					.getLineNumber(), severity);
-		}
-
-		public void error(SAXParseException exception) throws SAXException {
-			addMarker(exception, IMarker.SEVERITY_ERROR);
-		}
-
-		public void fatalError(SAXParseException exception) throws SAXException {
-			addMarker(exception, IMarker.SEVERITY_ERROR);
-		}
-
-		public void warning(SAXParseException exception) throws SAXException {
-			addMarker(exception, IMarker.SEVERITY_WARNING);
-		}
-	}
-
-	public static final String BUILDER_ID = "$pluginId$.$builderId$";
-
-	private static final String MARKER_TYPE = "$pluginId$.xmlProblem";
-
-	private SAXParserFactory parserFactory;
-
-	private void addMarker(IFile file, String message, int lineNumber,
-			int severity) {
-		try {
-			IMarker marker = file.createMarker(MARKER_TYPE);
-			marker.setAttribute(IMarker.MESSAGE, message);
-			marker.setAttribute(IMarker.SEVERITY, severity);
-			if (lineNumber == -1) {
-				lineNumber = 1;
-			}
-			marker.setAttribute(IMarker.LINE_NUMBER, lineNumber);
-		} catch (CoreException e) {
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.internal.events.InternalBuilder#build(int,
-	 *      java.util.Map, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected IProject[] build(int kind, Map args, IProgressMonitor monitor)
-			throws CoreException {
-		if (kind == FULL_BUILD) {
-			fullBuild(monitor);
-		} else {
-			IResourceDelta delta = getDelta(getProject());
-			if (delta == null) {
-				fullBuild(monitor);
-			} else {
-				incrementalBuild(delta, monitor);
-			}
-		}
-		return null;
-	}
-
-	void checkXML(IResource resource) {
-		if (resource instanceof IFile && resource.getName().endsWith(".xml")) {
-			IFile file = (IFile) resource;
-			deleteMarkers(file);
-			XMLErrorHandler reporter = new XMLErrorHandler(file);
-			try {
-				getParser().parse(file.getContents(), reporter);
-			} catch (Exception e1) {
-			}
-		}
-	}
-
-	private void deleteMarkers(IFile file) {
-		try {
-			file.deleteMarkers(MARKER_TYPE, false, IResource.DEPTH_ZERO);
-		} catch (CoreException ce) {
-		}
-	}
-
-	protected void fullBuild(final IProgressMonitor monitor)
-			throws CoreException {
-		try {
-			getProject().accept(new SampleResourceVisitor());
-		} catch (CoreException e) {
-		}
-	}
-
-	private SAXParser getParser() throws ParserConfigurationException,
-			SAXException {
-		if (parserFactory == null) {
-			parserFactory = SAXParserFactory.newInstance();
-		}
-		return parserFactory.newSAXParser();
-	}
-
-	protected void incrementalBuild(IResourceDelta delta,
-			IProgressMonitor monitor) throws CoreException {
-		// the visitor does the work.
-		delta.accept(new SampleDeltaVisitor());
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/builder/java/$natureClassName$.java b/ui/org.eclipse.pde.ui/templates_3.0/builder/java/$natureClassName$.java
deleted file mode 100644
index c2a8458..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/builder/java/$natureClassName$.java
+++ /dev/null

@@ -1,80 +0,0 @@
-package $packageName$;
-
-import org.eclipse.core.resources.ICommand;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IProjectNature;
-import org.eclipse.core.runtime.CoreException;
-
-public class $natureClassName$ implements IProjectNature {
-
-	/**
-	 * ID of this project nature
-	 */
-	public static final String NATURE_ID = "$pluginId$.$natureId$";
-
-	private IProject project;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.resources.IProjectNature#configure()
-	 */
-	public void configure() throws CoreException {
-		IProjectDescription desc = project.getDescription();
-		ICommand[] commands = desc.getBuildSpec();
-
-		for (int i = 0; i < commands.length; ++i) {
-			if (commands[i].getBuilderName().equals($builderClassName$.BUILDER_ID)) {
-				return;
-			}
-		}
-
-		ICommand[] newCommands = new ICommand[commands.length + 1];
-		System.arraycopy(commands, 0, newCommands, 0, commands.length);
-		ICommand command = desc.newCommand();
-		command.setBuilderName($builderClassName$.BUILDER_ID);
-		newCommands[newCommands.length - 1] = command;
-		desc.setBuildSpec(newCommands);
-		project.setDescription(desc, null);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.resources.IProjectNature#deconfigure()
-	 */
-	public void deconfigure() throws CoreException {
-		IProjectDescription description = getProject().getDescription();
-		ICommand[] commands = description.getBuildSpec();
-		for (int i = 0; i < commands.length; ++i) {
-			if (commands[i].getBuilderName().equals($builderClassName$.BUILDER_ID)) {
-				ICommand[] newCommands = new ICommand[commands.length - 1];
-				System.arraycopy(commands, 0, newCommands, 0, i);
-				System.arraycopy(commands, i + 1, newCommands, i,
-						commands.length - i - 1);
-				description.setBuildSpec(newCommands);
-				return;
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.resources.IProjectNature#getProject()
-	 */
-	public IProject getProject() {
-		return project;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.resources.IProjectNature#setProject(org.eclipse.core.resources.IProject)
-	 */
-	public void setProject(IProject project) {
-		this.project = project;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/builder/java/ToggleNatureAction.java b/ui/org.eclipse.pde.ui/templates_3.0/builder/java/ToggleNatureAction.java
deleted file mode 100644
index eaf0744..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/builder/java/ToggleNatureAction.java
+++ /dev/null

@@ -1,96 +0,0 @@
-package $packageName$;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-
-public class ToggleNatureAction implements IObjectActionDelegate {
-
-	private ISelection selection;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		if (selection instanceof IStructuredSelection) {
-			for (Iterator it = ((IStructuredSelection) selection).iterator(); it
-					.hasNext();) {
-				Object element = it.next();
-				IProject project = null;
-				if (element instanceof IProject) {
-					project = (IProject) element;
-				} else if (element instanceof IAdaptable) {
-					project = (IProject) ((IAdaptable) element)
-							.getAdapter(IProject.class);
-				}
-				if (project != null) {
-					toggleNature(project);
-				}
-			}
-		}
-	}
-
-	/*
-	 * (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) {
-		this.selection = selection;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction,
-	 *      org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-	}
-
-	/**
-	 * Toggles sample nature on a project
-	 * 
-	 * @param project
-	 *            to have sample nature added or removed
-	 */
-	private void toggleNature(IProject project) {
-		try {
-			IProjectDescription description = project.getDescription();
-			String[] natures = description.getNatureIds();
-
-			for (int i = 0; i < natures.length; ++i) {
-				if ($natureClassName$.NATURE_ID.equals(natures[i])) {
-					// Remove the nature
-					String[] newNatures = new String[natures.length - 1];
-					System.arraycopy(natures, 0, newNatures, 0, i);
-					System.arraycopy(natures, i + 1, newNatures, i,
-							natures.length - i - 1);
-					description.setNatureIds(newNatures);
-					project.setDescription(description, null);
-					return;
-				}
-			}
-
-			// Add the nature
-			String[] newNatures = new String[natures.length + 1];
-			System.arraycopy(natures, 0, newNatures, 0, natures.length);
-			newNatures[natures.length] = $natureClassName$.NATURE_ID;
-			description.setNatureIds(newNatures);
-			project.setDescription(description, null);
-		} catch (CoreException e) {
-		}
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/editor/bin/icons/sample.gif b/ui/org.eclipse.pde.ui/templates_3.0/editor/bin/icons/sample.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/editor/bin/icons/sample.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/editor/java/$editorClass$.java b/ui/org.eclipse.pde.ui/templates_3.0/editor/java/$editorClass$.java
deleted file mode 100644
index d248dae..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/editor/java/$editorClass$.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package $packageName$;
-
-import org.eclipse.ui.editors.text.TextEditor;
-
-public class $editorClass$ extends TextEditor {
-
-	private ColorManager colorManager;
-
-	public $editorClass$() {
-		super();
-		colorManager = new ColorManager();
-		setSourceViewerConfiguration(new XMLConfiguration(colorManager));
-		setDocumentProvider(new XMLDocumentProvider());
-	}
-	public void dispose() {
-		colorManager.dispose();
-		super.dispose();
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/editor/java/ColorManager.java b/ui/org.eclipse.pde.ui/templates_3.0/editor/java/ColorManager.java
deleted file mode 100644
index f98c700..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/editor/java/ColorManager.java
+++ /dev/null

@@ -1,28 +0,0 @@
-package $packageName$;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Display;
-
-public class ColorManager {
-
-	protected Map fColorTable = new HashMap(10);
-
-	public void dispose() {
-		Iterator e = fColorTable.values().iterator();
-		while (e.hasNext())
-			 ((Color) e.next()).dispose();
-	}
-	public Color getColor(RGB rgb) {
-		Color color = (Color) fColorTable.get(rgb);
-		if (color == null) {
-			color = new Color(Display.getCurrent(), rgb);
-			fColorTable.put(rgb, color);
-		}
-		return color;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/editor/java/IXMLColorConstants.java b/ui/org.eclipse.pde.ui/templates_3.0/editor/java/IXMLColorConstants.java
deleted file mode 100644
index 8425b44..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/editor/java/IXMLColorConstants.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package $packageName$;
-
-import org.eclipse.swt.graphics.RGB;
-
-public interface IXMLColorConstants {
-	RGB XML_COMMENT = new RGB(128, 0, 0);
-	RGB PROC_INSTR = new RGB(128, 128, 128);
-	RGB STRING = new RGB(0, 128, 0);
-	RGB DEFAULT = new RGB(0, 0, 0);
-	RGB TAG = new RGB(0, 0, 128);
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/editor/java/NonRuleBasedDamagerRepairer.java b/ui/org.eclipse.pde.ui/templates_3.0/editor/java/NonRuleBasedDamagerRepairer.java
deleted file mode 100644
index 2a90346..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/editor/java/NonRuleBasedDamagerRepairer.java
+++ /dev/null

@@ -1,138 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.text.BadLocationException;
-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.presentation.IPresentationDamager;
-import org.eclipse.jface.text.presentation.IPresentationRepairer;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.swt.custom.StyleRange;
-
-public class NonRuleBasedDamagerRepairer
-	implements IPresentationDamager, IPresentationRepairer {
-
-	/** The document this object works on */
-	protected IDocument fDocument;
-	/** The default text attribute if non is returned as data by the current token */
-	protected TextAttribute fDefaultTextAttribute;
-	
-	/**
-	 * Constructor for NonRuleBasedDamagerRepairer.
-	 */
-	public NonRuleBasedDamagerRepairer(TextAttribute defaultTextAttribute) {
-		Assert.isNotNull(defaultTextAttribute);
-
-		fDefaultTextAttribute = defaultTextAttribute;
-	}
-
-	/**
-	 * @see IPresentationRepairer#setDocument(IDocument)
-	 */
-	public void setDocument(IDocument document) {
-		fDocument = document;
-	}
-
-	/**
-	 * Returns the end offset of the line that contains the specified offset or
-	 * if the offset is inside a line delimiter, the end offset of the next line.
-	 *
-	 * @param offset the offset whose line end offset must be computed
-	 * @return the line end offset for the given offset
-	 * @exception BadLocationException if offset is invalid in the current document
-	 */
-	protected int endOfLineOf(int offset) throws BadLocationException {
-
-		IRegion info = fDocument.getLineInformationOfOffset(offset);
-		if (offset <= info.getOffset() + info.getLength())
-			return info.getOffset() + info.getLength();
-
-		int line = fDocument.getLineOfOffset(offset);
-		try {
-			info = fDocument.getLineInformation(line + 1);
-			return info.getOffset() + info.getLength();
-		} catch (BadLocationException x) {
-			return fDocument.getLength();
-		}
-	}
-
-	/**
-	 * @see IPresentationDamager#getDamageRegion(ITypedRegion, DocumentEvent, boolean)
-	 */
-	public IRegion getDamageRegion(
-		ITypedRegion partition,
-		DocumentEvent event,
-		boolean documentPartitioningChanged) {
-		if (!documentPartitioningChanged) {
-			try {
-
-				IRegion info =
-					fDocument.getLineInformationOfOffset(event.getOffset());
-				int start = Math.max(partition.getOffset(), info.getOffset());
-
-				int end =
-					event.getOffset()
-						+ (event.getText() == null
-							? event.getLength()
-							: event.getText().length());
-
-				if (info.getOffset() <= end
-					&& end <= info.getOffset() + info.getLength()) {
-					// optimize the case of the same line
-					end = info.getOffset() + info.getLength();
-				} else
-					end = endOfLineOf(end);
-
-				end =
-					Math.min(
-						partition.getOffset() + partition.getLength(),
-						end);
-				return new Region(start, end - start);
-
-			} catch (BadLocationException x) {
-			}
-		}
-
-		return partition;
-	}
-
-	/**
-	 * @see IPresentationRepairer#createPresentation(TextPresentation, ITypedRegion)
-	 */
-	public void createPresentation(
-		TextPresentation presentation,
-		ITypedRegion region) {
-		addRange(
-			presentation,
-			region.getOffset(),
-			region.getLength(),
-			fDefaultTextAttribute);
-	}
-
-	/**
-	 * Adds style information to the given text presentation.
-	 *
-	 * @param presentation the text presentation to be extended
-	 * @param offset the offset of the range to be styled
-	 * @param length the length of the range to be styled
-	 * @param attr the attribute describing the style of the range to be styled
-	 */
-	protected void addRange(
-		TextPresentation presentation,
-		int offset,
-		int length,
-		TextAttribute attr) {
-		if (attr != null)
-			presentation.addStyleRange(
-				new StyleRange(
-					offset,
-					length,
-					attr.getForeground(),
-					attr.getBackground(),
-					attr.getStyle()));
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/editor/java/TagRule.java b/ui/org.eclipse.pde.ui/templates_3.0/editor/java/TagRule.java
deleted file mode 100644
index a9efd22..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/editor/java/TagRule.java
+++ /dev/null

@@ -1,31 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.text.rules.*;
-
-public class TagRule extends MultiLineRule {
-
-	public TagRule(IToken token) {
-		super("<", ">", token);
-	}
-	protected boolean sequenceDetected(
-		ICharacterScanner scanner,
-		char[] sequence,
-		boolean eofAllowed) {
-		int c = scanner.read();
-		if (sequence[0] == '<') {
-			if (c == '?') {
-				// processing instruction - abort
-				scanner.unread();
-				return false;
-			}
-			if (c == '!') {
-				scanner.unread();
-				// comment - abort
-				return false;
-			}
-		} else if (sequence[0] == '>') {
-			scanner.unread();
-		}
-		return super.sequenceDetected(scanner, sequence, eofAllowed);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/editor/java/XMLConfiguration.java b/ui/org.eclipse.pde.ui/templates_3.0/editor/java/XMLConfiguration.java
deleted file mode 100644
index 31d0c0c..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/editor/java/XMLConfiguration.java
+++ /dev/null

@@ -1,79 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextDoubleClickStrategy;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.jface.text.presentation.IPresentationReconciler;
-import org.eclipse.jface.text.presentation.PresentationReconciler;
-import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
-import org.eclipse.jface.text.rules.Token;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.text.source.SourceViewerConfiguration;
-
-public class XMLConfiguration extends SourceViewerConfiguration {
-	private XMLDoubleClickStrategy doubleClickStrategy;
-	private XMLTagScanner tagScanner;
-	private XMLScanner scanner;
-	private ColorManager colorManager;
-
-	public XMLConfiguration(ColorManager colorManager) {
-		this.colorManager = colorManager;
-	}
-	public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
-		return new String[] {
-			IDocument.DEFAULT_CONTENT_TYPE,
-			XMLPartitionScanner.XML_COMMENT,
-			XMLPartitionScanner.XML_TAG };
-	}
-	public ITextDoubleClickStrategy getDoubleClickStrategy(
-		ISourceViewer sourceViewer,
-		String contentType) {
-		if (doubleClickStrategy == null)
-			doubleClickStrategy = new XMLDoubleClickStrategy();
-		return doubleClickStrategy;
-	}
-
-	protected XMLScanner getXMLScanner() {
-		if (scanner == null) {
-			scanner = new XMLScanner(colorManager);
-			scanner.setDefaultReturnToken(
-				new Token(
-					new TextAttribute(
-						colorManager.getColor(IXMLColorConstants.DEFAULT))));
-		}
-		return scanner;
-	}
-	protected XMLTagScanner getXMLTagScanner() {
-		if (tagScanner == null) {
-			tagScanner = new XMLTagScanner(colorManager);
-			tagScanner.setDefaultReturnToken(
-				new Token(
-					new TextAttribute(
-						colorManager.getColor(IXMLColorConstants.TAG))));
-		}
-		return tagScanner;
-	}
-
-	public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) {
-		PresentationReconciler reconciler = new PresentationReconciler();
-
-		DefaultDamagerRepairer dr =
-			new DefaultDamagerRepairer(getXMLTagScanner());
-		reconciler.setDamager(dr, XMLPartitionScanner.XML_TAG);
-		reconciler.setRepairer(dr, XMLPartitionScanner.XML_TAG);
-
-		dr = new DefaultDamagerRepairer(getXMLScanner());
-		reconciler.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE);
-		reconciler.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);
-
-		NonRuleBasedDamagerRepairer ndr =
-			new NonRuleBasedDamagerRepairer(
-				new TextAttribute(
-					colorManager.getColor(IXMLColorConstants.XML_COMMENT)));
-		reconciler.setDamager(ndr, XMLPartitionScanner.XML_COMMENT);
-		reconciler.setRepairer(ndr, XMLPartitionScanner.XML_COMMENT);
-
-		return reconciler;
-	}
-
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/editor/java/XMLDocumentProvider.java b/ui/org.eclipse.pde.ui/templates_3.0/editor/java/XMLDocumentProvider.java
deleted file mode 100644
index 023b5aa..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/editor/java/XMLDocumentProvider.java
+++ /dev/null

@@ -1,25 +0,0 @@
-package $packageName$;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.rules.DefaultPartitioner;
-import org.eclipse.ui.editors.text.FileDocumentProvider;
-
-public class XMLDocumentProvider extends FileDocumentProvider {
-
-	protected IDocument createDocument(Object element) throws CoreException {
-		IDocument document = super.createDocument(element);
-		if (document != null) {
-			IDocumentPartitioner partitioner =
-				new DefaultPartitioner(
-					new XMLPartitionScanner(),
-					new String[] {
-						XMLPartitionScanner.XML_TAG,
-						XMLPartitionScanner.XML_COMMENT });
-			partitioner.connect(document);
-			document.setDocumentPartitioner(partitioner);
-		}
-		return document;
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/editor/java/XMLDoubleClickStrategy.java b/ui/org.eclipse.pde.ui/templates_3.0/editor/java/XMLDoubleClickStrategy.java
deleted file mode 100644
index bc901f7..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/editor/java/XMLDoubleClickStrategy.java
+++ /dev/null

@@ -1,112 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.text.*;
-
-public class XMLDoubleClickStrategy implements ITextDoubleClickStrategy {
-	protected ITextViewer fText;
-
-	public void doubleClicked(ITextViewer part) {
-		int pos = part.getSelectedRange().x;
-
-		if (pos < 0)
-			return;
-
-		fText = part;
-
-		if (!selectComment(pos)) {
-			selectWord(pos);
-		}
-	}
-	protected boolean selectComment(int caretPos) {
-		IDocument doc = fText.getDocument();
-		int startPos, endPos;
-
-		try {
-			int pos = caretPos;
-			char c = ' ';
-
-			while (pos >= 0) {
-				c = doc.getChar(pos);
-				if (c == '\\') {
-					pos -= 2;
-					continue;
-				}
-				if (c == Character.LINE_SEPARATOR || c == '\"')
-					break;
-				--pos;
-			}
-
-			if (c != '\"')
-				return false;
-
-			startPos = pos;
-
-			pos = caretPos;
-			int length = doc.getLength();
-			c = ' ';
-
-			while (pos < length) {
-				c = doc.getChar(pos);
-				if (c == Character.LINE_SEPARATOR || c == '\"')
-					break;
-				++pos;
-			}
-			if (c != '\"')
-				return false;
-
-			endPos = pos;
-
-			int offset = startPos + 1;
-			int len = endPos - offset;
-			fText.setSelectedRange(offset, len);
-			return true;
-		} catch (BadLocationException x) {
-		}
-
-		return false;
-	}
-	protected boolean selectWord(int caretPos) {
-
-		IDocument doc = fText.getDocument();
-		int startPos, endPos;
-
-		try {
-
-			int pos = caretPos;
-			char c;
-
-			while (pos >= 0) {
-				c = doc.getChar(pos);
-				if (!Character.isJavaIdentifierPart(c))
-					break;
-				--pos;
-			}
-
-			startPos = pos;
-
-			pos = caretPos;
-			int length = doc.getLength();
-
-			while (pos < length) {
-				c = doc.getChar(pos);
-				if (!Character.isJavaIdentifierPart(c))
-					break;
-				++pos;
-			}
-
-			endPos = pos;
-			selectRange(startPos, endPos);
-			return true;
-
-		} catch (BadLocationException x) {
-		}
-
-		return false;
-	}
-
-	private void selectRange(int startPos, int stopPos) {
-		int offset = startPos + 1;
-		int length = stopPos - offset;
-		fText.setSelectedRange(offset, length);
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/editor/java/XMLPartitionScanner.java b/ui/org.eclipse.pde.ui/templates_3.0/editor/java/XMLPartitionScanner.java
deleted file mode 100644
index bbd1ef4..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/editor/java/XMLPartitionScanner.java
+++ /dev/null

@@ -1,22 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.text.rules.*;
-
-public class XMLPartitionScanner extends RuleBasedPartitionScanner {
-	public final static String XML_DEFAULT = "__xml_default";
-	public final static String XML_COMMENT = "__xml_comment";
-	public final static String XML_TAG = "__xml_tag";
-
-	public XMLPartitionScanner() {
-
-		IToken xmlComment = new Token(XML_COMMENT);
-		IToken tag = new Token(XML_TAG);
-
-		IPredicateRule[] rules = new IPredicateRule[2];
-
-		rules[0] = new MultiLineRule("<!--", "-->", xmlComment);
-		rules[1] = new TagRule(tag);
-
-		setPredicateRules(rules);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/editor/java/XMLScanner.java b/ui/org.eclipse.pde.ui/templates_3.0/editor/java/XMLScanner.java
deleted file mode 100644
index c0a2bc2..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/editor/java/XMLScanner.java
+++ /dev/null

@@ -1,22 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.text.rules.*;
-import org.eclipse.jface.text.*;
-
-public class XMLScanner extends RuleBasedScanner {
-
-	public XMLScanner(ColorManager manager) {
-		IToken procInstr =
-			new Token(
-				new TextAttribute(
-					manager.getColor(IXMLColorConstants.PROC_INSTR)));
-
-		IRule[] rules = new IRule[2];
-		//Add rule for processing instructions
-		rules[0] = new SingleLineRule("<?", "?>", procInstr);
-		// Add generic whitespace rule.
-		rules[1] = new WhitespaceRule(new XMLWhitespaceDetector());
-
-		setRules(rules);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/editor/java/XMLTagScanner.java b/ui/org.eclipse.pde.ui/templates_3.0/editor/java/XMLTagScanner.java
deleted file mode 100644
index 109a6ee..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/editor/java/XMLTagScanner.java
+++ /dev/null

@@ -1,24 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.text.*;
-import org.eclipse.jface.text.rules.*;
-
-public class XMLTagScanner extends RuleBasedScanner {
-
-	public XMLTagScanner(ColorManager manager) {
-		IToken string =
-			new Token(
-				new TextAttribute(manager.getColor(IXMLColorConstants.STRING)));
-
-		IRule[] rules = new IRule[3];
-
-		// Add rule for double quotes
-		rules[0] = new SingleLineRule("\"", "\"", string, '\\');
-		// Add a rule for single quotes
-		rules[1] = new SingleLineRule("'", "'", string, '\\');
-		// Add generic whitespace rule.
-		rules[2] = new WhitespaceRule(new XMLWhitespaceDetector());
-
-		setRules(rules);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/editor/java/XMLWhitespaceDetector.java b/ui/org.eclipse.pde.ui/templates_3.0/editor/java/XMLWhitespaceDetector.java
deleted file mode 100644
index 3faa92a..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/editor/java/XMLWhitespaceDetector.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.text.rules.IWhitespaceDetector;
-
-public class XMLWhitespaceDetector implements IWhitespaceDetector {
-
-	public boolean isWhitespace(char c) {
-		return (c == ' ' || c == '\t' || c == '\n' || c == '\r');
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/helloNonUIRCP/java/$applicationClass$.java b/ui/org.eclipse.pde.ui/templates_3.0/helloNonUIRCP/java/$applicationClass$.java
deleted file mode 100644
index 573c4b9..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/helloNonUIRCP/java/$applicationClass$.java
+++ /dev/null

@@ -1,19 +0,0 @@
-package $packageName$;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-
-/**
- * This class controls all aspects of the application's execution
- */
-public class $applicationClass$ implements IPlatformRunnable {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.IPlatformRunnable#run(java.lang.Object)
-	 */
-	public Object run(Object args) throws Exception {
-		System.out.println("$message$");
-		return IPlatformRunnable.EXIT_OK;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/helloOSGi/java/$applicationClass$.java b/ui/org.eclipse.pde.ui/templates_3.0/helloOSGi/java/$applicationClass$.java
deleted file mode 100644
index 69a0724..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/helloOSGi/java/$applicationClass$.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package $packageName$;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-public class $applicationClass$ implements BundleActivator {
-
-	public void start(BundleContext context) throws Exception {
-		System.out.println("$startMessage$");
-	}
-	
-	public void stop(BundleContext context) throws Exception {
-		System.out.println("$stopMessage$");
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/helloRCP/java/$applicationClass$.java b/ui/org.eclipse.pde.ui/templates_3.0/helloRCP/java/$applicationClass$.java
deleted file mode 100644
index d926eaa..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/helloRCP/java/$applicationClass$.java
+++ /dev/null

@@ -1,27 +0,0 @@
-package $packageName$;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * This class controls all aspects of the application's execution
- */
-public class $applicationClass$ implements IPlatformRunnable {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IPlatformRunnable#run(java.lang.Object)
-	 */
-	public Object run(Object args) throws Exception {
-		Display display = PlatformUI.createDisplay();
-		try {
-			int returnCode = PlatformUI.createAndRunWorkbench(display, new ApplicationWorkbenchAdvisor());
-			if (returnCode == PlatformUI.RETURN_RESTART) {
-				return IPlatformRunnable.EXIT_RESTART;
-			}
-			return IPlatformRunnable.EXIT_OK;
-		} finally {
-			display.dispose();
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/helloRCP/java/ApplicationWorkbenchAdvisor.java b/ui/org.eclipse.pde.ui/templates_3.0/helloRCP/java/ApplicationWorkbenchAdvisor.java
deleted file mode 100644
index e9b4543..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/helloRCP/java/ApplicationWorkbenchAdvisor.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package $packageName$;
-
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
-import org.eclipse.ui.application.WorkbenchAdvisor;
-
-public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
-	
-	private static final String PERSPECTIVE_ID = "$pluginId$.perspective";
-
-	public String getInitialWindowPerspectiveId() {
-		return PERSPECTIVE_ID;
-	}
-
-	public void preWindowOpen(IWorkbenchWindowConfigurer configurer) {
-		configurer.setInitialSize(new Point(400, 300));
-		configurer.setShowCoolBar(false);
-		configurer.setShowStatusLine(false);
-		configurer.setTitle("$windowTitle$");
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/helloRCP/java/Perspective.java b/ui/org.eclipse.pde.ui/templates_3.0/helloRCP/java/Perspective.java
deleted file mode 100644
index b38d535..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/helloRCP/java/Perspective.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package $packageName$;
-
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IPerspectiveFactory;
-
-public class Perspective implements IPerspectiveFactory {
-
-	public void createInitialLayout(IPageLayout layout) {
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/helloWorld/bin/icons/sample.gif b/ui/org.eclipse.pde.ui/templates_3.0/helloWorld/bin/icons/sample.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/helloWorld/bin/icons/sample.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/helloWorld/java/$className$.java b/ui/org.eclipse.pde.ui/templates_3.0/helloWorld/java/$className$.java
deleted file mode 100644
index 632fc8a..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/helloWorld/java/$className$.java
+++ /dev/null

@@ -1,64 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.jface.dialogs.MessageDialog;
-
-/**
- * Our sample action implements workbench action delegate.
- * The action proxy will be created by the workbench and
- * shown in the UI. When the user tries to use the action,
- * this delegate will be created and execution will be 
- * delegated to it.
- * @see IWorkbenchWindowActionDelegate
- */
-public class $className$ implements IWorkbenchWindowActionDelegate {
-	private IWorkbenchWindow window;
-	/**
-	 * The constructor.
-	 */
-	public $className$() {
-	}
-
-	/**
-	 * The action has been activated. The argument of the
-	 * method represents the 'real' action sitting
-	 * in the workbench UI.
-	 * @see IWorkbenchWindowActionDelegate#run
-	 */
-	public void run(IAction action) {
-		MessageDialog.openInformation(
-			window.getShell(),
-			"$pluginName$",
-			"$message$");
-	}
-
-	/**
-	 * Selection in the workbench has been changed. We 
-	 * can change the state of the 'real' action here
-	 * if we want, but this can only happen after 
-	 * the delegate has been created.
-	 * @see IWorkbenchWindowActionDelegate#selectionChanged
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-	}
-
-	/**
-	 * We can use this method to dispose of any system
-	 * resources we previously allocated.
-	 * @see IWorkbenchWindowActionDelegate#dispose
-	 */
-	public void dispose() {
-	}
-
-	/**
-	 * We will cache window object in order to
-	 * be able to provide parent shell for the message dialog.
-	 * @see IWorkbenchWindowActionDelegate#init
-	 */
-	public void init(IWorkbenchWindow window) {
-		this.window = window;
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/concepts/maintopic.html b/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/concepts/maintopic.html
deleted file mode 100644
index a476078..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/concepts/maintopic.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Main Topic</title>
-</head>
-
-<body>
-<h1>Main Topic</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/concepts/subtopic.html b/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/concepts/subtopic.html
deleted file mode 100644
index 8a61c50..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/concepts/subtopic.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Sub Topic</title>
-</head>
-
-<body>
-<h1>Sub Topic</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/concepts/subtopic2.html b/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/concepts/subtopic2.html
deleted file mode 100644
index 86bcbf9..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/concepts/subtopic2.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Sub Topic 2</title>
-</head>
-
-<body>
-<h1>Sub Topic 2</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/gettingstarted/maintopic.html b/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/gettingstarted/maintopic.html
deleted file mode 100644
index a476078..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/gettingstarted/maintopic.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Main Topic</title>
-</head>
-
-<body>
-<h1>Main Topic</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/gettingstarted/subtopic.html b/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/gettingstarted/subtopic.html
deleted file mode 100644
index 8a61c50..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/gettingstarted/subtopic.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Sub Topic</title>
-</head>
-
-<body>
-<h1>Sub Topic</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/gettingstarted/subtopic2.html b/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/gettingstarted/subtopic2.html
deleted file mode 100644
index 86bcbf9..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/gettingstarted/subtopic2.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Sub Topic 2</title>
-</head>
-
-<body>
-<h1>Sub Topic 2</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/maintopic.html b/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/maintopic.html
deleted file mode 100644
index a476078..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/maintopic.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Main Topic</title>
-</head>
-
-<body>
-<h1>Main Topic</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/reference/maintopic.html b/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/reference/maintopic.html
deleted file mode 100644
index a476078..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/reference/maintopic.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Main Topic</title>
-</head>
-
-<body>
-<h1>Main Topic</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/reference/subtopic.html b/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/reference/subtopic.html
deleted file mode 100644
index 8a61c50..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/reference/subtopic.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Sub Topic</title>
-</head>
-
-<body>
-<h1>Sub Topic</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/reference/subtopic2.html b/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/reference/subtopic2.html
deleted file mode 100644
index 86bcbf9..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/reference/subtopic2.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Sub Topic 2</title>
-</head>
-
-<body>
-<h1>Sub Topic 2</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/samples/maintopic.html b/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/samples/maintopic.html
deleted file mode 100644
index a476078..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/samples/maintopic.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Main Topic</title>
-</head>
-
-<body>
-<h1>Main Topic</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/samples/subtopic.html b/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/samples/subtopic.html
deleted file mode 100644
index 8a61c50..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/samples/subtopic.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Sub Topic</title>
-</head>
-
-<body>
-<h1>Sub Topic</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/samples/subtopic2.html b/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/samples/subtopic2.html
deleted file mode 100644
index 86bcbf9..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/samples/subtopic2.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Sub Topic 2</title>
-</head>
-
-<body>
-<h1>Sub Topic 2</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/subtopic.html b/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/subtopic.html
deleted file mode 100644
index 8a61c50..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/subtopic.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Sub Topic</title>
-</head>
-
-<body>
-<h1>Sub Topic</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/tasks/maintopic.html b/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/tasks/maintopic.html
deleted file mode 100644
index a476078..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/tasks/maintopic.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Main Topic</title>
-</head>
-
-<body>
-<h1>Main Topic</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/tasks/subtopic.html b/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/tasks/subtopic.html
deleted file mode 100644
index 8a61c50..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/tasks/subtopic.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Sub Topic</title>
-</head>
-
-<body>
-<h1>Sub Topic</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/tasks/subtopic2.html b/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/tasks/subtopic2.html
deleted file mode 100644
index 86bcbf9..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/tasks/subtopic2.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Sub Topic 2</title>
-</head>
-
-<body>
-<h1>Sub Topic 2</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/toc.html b/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/toc.html
deleted file mode 100644
index 326f0a9..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/html/toc.html
+++ /dev/null

@@ -1,13 +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">
-	<title>Table of Contents</title>
-</head>
-
-<body>
-<h1>Table of Contents</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/tocconcepts.xml b/ui/org.eclipse.pde.ui/templates_3.0/help/bin/tocconcepts.xml
deleted file mode 100644
index d01f925..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/tocconcepts.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Concepts" link_to="toc.xml#concepts"> 
-	<topic label="Main Topic"  href="html/concepts/maintopic.html"> 
-		<topic label="Sub Topic" href="html/concepts/subtopic.html" /> 
-	</topic>
-	<topic label="Main Topic 2">
-		<topic label="Sub Topic 2" href="html/concepts/subtopic2.html" /> 
-	</topic> 
-</toc>

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/tocgettingstarted.xml b/ui/org.eclipse.pde.ui/templates_3.0/help/bin/tocgettingstarted.xml
deleted file mode 100644
index 38f27e0..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/tocgettingstarted.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Getting Started" link_to="toc.xml#gettingstarted"> 
-	<topic label="Main Topic"  href="html/gettingstarted/maintopic.html"> 
-		<topic label="Sub Topic" href="html/gettingstarted/subtopic.html" /> 
-	</topic>
-	<topic label="Main Topic 2">
-		<topic label="Sub Topic 2" href="html/gettingstarted/subtopic2.html" />
-	</topic> 
-</toc>

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/tocreference.xml b/ui/org.eclipse.pde.ui/templates_3.0/help/bin/tocreference.xml
deleted file mode 100644
index 660cdec..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/tocreference.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Reference" link_to="toc.xml#reference"> 
-	<topic label="Main Topic"  href="html/reference/maintopic.html"> 
-		<topic label="Sub Topic" href="html/reference/subtopic.html" /> 
-	</topic>
-	<topic label="Main Topic 2">
-		<topic label="Sub Topic 2" href="html/reference/subtopic2.html" /> 
-	</topic> 
-</toc>

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/tocsamples.xml b/ui/org.eclipse.pde.ui/templates_3.0/help/bin/tocsamples.xml
deleted file mode 100644
index ddfa61e..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/tocsamples.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Samples" link_to="toc.xml#samples"> 
-	<topic label="Main Topic"  href="html/samples/maintopic.html"> 
-		<topic label="Sub Topic" href="html/samples/subtopic.html" /> 
-	</topic>
-	<topic label="Main Topic 2">
-		<topic label="Sub Topic 2" href="html/samples/subtopic2.html" /> 
-	</topic> 
-</toc>

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/toctasks.xml b/ui/org.eclipse.pde.ui/templates_3.0/help/bin/toctasks.xml
deleted file mode 100644
index c96b94b..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/help/bin/toctasks.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Tasks" link_to="toc.xml#tasks"> 
-	<topic label="Main Topic"  href="html/tasks/maintopic.html"> 
-		<topic label="Sub Topic" href="html/tasks/subtopic.html" /> 
-	</topic>
-	<topic label="Main Topic 2">
-		<topic label="Sub Topic 2" href="html/tasks/subtopic2.html" /> 
-	</topic> 
-</toc>

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/help/testToc.xml b/ui/org.eclipse.pde.ui/templates_3.0/help/testToc.xml
deleted file mode 100644
index bf1e67a..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/help/testToc.xml
+++ /dev/null

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Test TOC" topic="html/toc.html">
-	<link toc="toc.xml" />
-</toc>
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/help/toc.xml b/ui/org.eclipse.pde.ui/templates_3.0/help/toc.xml
deleted file mode 100644
index a07728d..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/help/toc.xml
+++ /dev/null

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-%if isPrimary
-<toc label="$tocLabel$" topic="html/toc.html">
-%else
-<toc label="$tocLabel$">
-%endif
-%if isPrimary && gettingStarted
-   <topic label="Getting Started">
-      <anchor id="gettingstarted"/>
-   </topic>
-%endif
-%if isPrimary && concepts
-   <topic label="Concepts">
-      <anchor id="concepts"/>
-   </topic>
-%endif
-%if isPrimary && tasks
-   <topic label="Tasks">
-      <anchor id="tasks"/>
-   </topic>
-%endif
-%if isPrimary && reference
-   <topic label="Reference">
-      <anchor id="reference"/>
-   </topic>
-%endif
-%if isPrimary && samples
-   <topic label="Samples">
-      <anchor id="samples"/>
-   </topic>
-%endif
-%if isPrimary && (gettingStarted || concepts || tasks || reference || samples) 
-%else
-	<topic label="Main Topic"  href="html/maintopic.html"> 
-		<topic label="Sub Topic" href="html/subtopic.html"/> 
-	</topic>
-	<topic label="Main Topic 2"/>
-%endif
-</toc>

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/intro/bin/content/link_obj.gif b/ui/org.eclipse.pde.ui/templates_3.0/intro/bin/content/link_obj.gif
deleted file mode 100644
index a4b0788..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/intro/bin/content/link_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/intro/bin/content/titlebanner.gif b/ui/org.eclipse.pde.ui/templates_3.0/intro/bin/content/titlebanner.gif
deleted file mode 100644
index 6737f76..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/intro/bin/content/titlebanner.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/intro/bin/splash.bmp b/ui/org.eclipse.pde.ui/templates_3.0/intro/bin/splash.bmp
deleted file mode 100644
index 99ea60d..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/intro/bin/splash.bmp
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/intro/content/root.css b/ui/org.eclipse.pde.ui/templates_3.0/intro/content/root.css
deleted file mode 100644
index 3413844..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/intro/content/root.css
+++ /dev/null

@@ -1,34 +0,0 @@
-/* Give some space for main div.*/

-#page-content {

-	text-align: center;

-	margin-top:100px;

-	}

-

-/* satisfy Mozilla */	

-div > div#page-content {

-	padding-left:30%;

-	}

-

-#links {

-	text-align:left;

-	width:23em;

-	} 

-

-/* Set the background picture and layout the text. */

-a {

-	display:block;

-	margin-bottom:20px;

-	background-repeat: no-repeat;

-	background-image: url("./link_obj.gif");

-	background-position: left;

-	height:48px;

-	}

-

-a span  { 

-	position: relative;

-	left:54px;

-	top:16px;

-	}

-	

-	

-


diff --git a/ui/org.eclipse.pde.ui/templates_3.0/intro/content/shared.css b/ui/org.eclipse.pde.ui/templates_3.0/intro/content/shared.css
deleted file mode 100644
index d24829e..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/intro/content/shared.css
+++ /dev/null

@@ -1,45 +0,0 @@
-/* Shared style applied to all pages */
-/* trick to get desired scroll bar behavior on all browsers */ 
-html,body {
-	overflow:auto;
-	border:0px;
-	height:100%;
-	} 
-	
-html > body {
-	height: auto;
-	overflow: visible;
-}
-	
-body {	
-	margin-left:14px;
-	margin-top:10px;
-	font-family:Tahoma;
-	font-size: 12px;
-	color:#000000;
-	background-image:url("./titlebanner.gif");
-	background-repeat: repeat-x;
-	} 
-	
-h1 {
-	text-align:left;
-	font-size: 16pt;
-	font-weight:normal;
-	color:#E5E5E5;
-	} 
-
-h4 {
-	color:#787878;
-	}	
-
-#content p {
-	padding-left:14px;
-	}
-	
-a {
-	color:#000000;
-	text-decoration:none;
-	}
-	
-
-

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/intro/ext.xml b/ui/org.eclipse.pde.ui/templates_3.0/intro/ext.xml
deleted file mode 100644
index 7b09909..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/intro/ext.xml
+++ /dev/null

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
-<introContent>
-  <extensionContent path="root/page-content/links/anchor1"> 
-  	<link label="Learn about Concept Three..." url="http://org.eclipse.ui.intro/showPage?id=concept3"/>
-  </extensionContent>
-  
-  <page id="concept3">
-	<include path="root/title_id" merge-style="false"/>
-	<group id="content" label="Concept Three"> 
-		<text>This is where Concept Three is explained.</text>
-		<text>This is the first topic from the root page of this Welcome:</text>
-		<include path="root/page-content/links/firstLink" />
-		<contentProvider id="contentProviderId" 
-			class="$packageName$.DynamicContentProvider" 
-			pluginId="$pluginId$"> 
-			<text>Content provider failed. Alternate text for content provider</text>
-		</contentProvider>
-	</group>
-   </page>
-		
-</introContent>

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/intro/introContent.xml b/ui/org.eclipse.pde.ui/templates_3.0/intro/introContent.xml
deleted file mode 100644
index 6deb232..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/intro/introContent.xml
+++ /dev/null

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
-<introContent>
-	
-	<page style-id="page_style" id="root" style="content/root.css">
-		<title id="title_id">Welcome to $productName$</title>
-		<group id="page-content"> 
-			<group id="links"> 
-				<link label="Learn about Concept One..." url="http://org.eclipse.ui.intro/showPage?id=concept1" id ="firstLink"/>
-				<link label="Learn about Concept Two..." url="http://org.eclipse.ui.intro/showPage?id=concept2" />
-				<anchor id="anchor1" /> 
-			</group> 
-		</group>
-	</page>
-		
-			
-	<page id="concept1">
-		<include path="root/title_id" merge-style="false"/>
-		<group id="content" label="Concept One">
-			<text>This is where Concept One is explained.</text>
-		</group>
-	</page>
-		
-	<page id="concept2">
-		<include path="root/title_id" merge-style="false"/>
-		<group id="content" label="Concept Two">
-			<text>This is where Concept Two is explained.</text>
-		</group>
-	</page>
-		
-
-</introContent>

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/intro/java/Application.java b/ui/org.eclipse.pde.ui/templates_3.0/intro/java/Application.java
deleted file mode 100644
index 33a205c..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/intro/java/Application.java
+++ /dev/null

@@ -1,27 +0,0 @@
-package $packageName$;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * This class controls all aspects of the application's execution
- */
-public class Application implements IPlatformRunnable {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IPlatformRunnable#run(java.lang.Object)
-	 */
-	public Object run(Object args) throws Exception {
-		Display display = PlatformUI.createDisplay();
-		try {
-			int returnCode = PlatformUI.createAndRunWorkbench(display, new ApplicationWorkbenchAdvisor());
-			if (returnCode == PlatformUI.RETURN_RESTART) {
-				return IPlatformRunnable.EXIT_RESTART;
-			}
-			return IPlatformRunnable.EXIT_OK;
-		} finally {
-			display.dispose();
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/intro/java/ApplicationWorkbenchAdvisor.java b/ui/org.eclipse.pde.ui/templates_3.0/intro/java/ApplicationWorkbenchAdvisor.java
deleted file mode 100644
index accafa3..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/intro/java/ApplicationWorkbenchAdvisor.java
+++ /dev/null

@@ -1,54 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.application.IActionBarConfigurer;
-import org.eclipse.ui.application.IWorkbenchConfigurer;
-import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
-import org.eclipse.ui.application.WorkbenchAdvisor;
-import org.eclipse.ui.IWorkbenchWindow;
-
-public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
-
-	private static final String PERSPECTIVE_ID = "$pluginId$.perspective";
-    
-    private ActionFactory.IWorkbenchAction introAction;
-    
-    public void initialize(IWorkbenchConfigurer configurer) {
-        super.initialize(configurer);
-        configurer.setSaveAndRestore(true);
-    }
-
-	public String getInitialWindowPerspectiveId() {
-		return PERSPECTIVE_ID;
-	}
-
-    public void preWindowOpen(IWorkbenchWindowConfigurer configurer) {
-        configurer.setInitialSize(new Point(700, 550));
-        configurer.setShowCoolBar(false);
-        configurer.setShowStatusLine(false);
-        configurer.setTitle("$productName$");
-    }
-
-    public void fillActionBars(IWorkbenchWindow window, IActionBarConfigurer configurer, int flags) {
-        super.fillActionBars(window, configurer, flags);
-        if ((flags & WorkbenchAdvisor.FILL_PROXY) == 0) {
-            introAction = ActionFactory.INTRO.create(window);
-            configurer.registerGlobalAction(introAction);
-        }
-        
-        if ((flags & WorkbenchAdvisor.FILL_MENU_BAR) != 0) {
-            IMenuManager menuManager = configurer.getMenuManager();
-            IMenuManager helpMenu = new MenuManager("&Help", "help");
-            menuManager.add(helpMenu);
-            helpMenu.add(introAction);
-        }
-        
-        introAction = ActionFactory.INTRO.create(window);
-        configurer.registerGlobalAction(introAction);
-
-    }
-
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/intro/java/DynamicContentProvider.java b/ui/org.eclipse.pde.ui/templates_3.0/intro/java/DynamicContentProvider.java
deleted file mode 100644
index 92af6d4..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/intro/java/DynamicContentProvider.java
+++ /dev/null

@@ -1,70 +0,0 @@
-package $packageName$;
-
-import java.io.*;
-import java.util.*;
-
-import org.eclipse.swt.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.forms.widgets.*;
-import org.eclipse.ui.intro.config.*;
-
-
-public class DynamicContentProvider implements IIntroContentProvider {
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.intro.config.IIntroContentProvider#init(org.eclipse.ui.intro.config.IIntroContentProviderSite)
-     */
-    public void init(IIntroContentProviderSite site) {
-
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.intro.config.IIntroContentProvider#createContent(java.lang.String,
-     *      java.io.PrintWriter)
-     */
-    public void createContent(String id, PrintWriter out) {
-        String content = getCurrentTimeString();
-        content = "<p>" + content + "</p>";
-        out.write(content);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.intro.config.IIntroContentProvider#createContent(java.lang.String,
-     *      org.eclipse.swt.widgets.Composite,
-     *      org.eclipse.ui.forms.widgets.FormToolkit)
-     */
-    public void createContent(String id, Composite parent, FormToolkit toolkit) {
-        String content = getCurrentTimeString();
-        Label label1 = toolkit.createLabel(parent, content, SWT.WRAP);
-        Label label2 = toolkit.createLabel(parent,
-                "Some content from SWT presentation", SWT.WRAP);
-
-
-    }
-
-    private String getCurrentTimeString() {
-        StringBuffer content = new StringBuffer(
-                "Dynamic content from Intro ContentProvider: ");
-        content.append("Current time is: ");
-        content.append(new Date(System.currentTimeMillis()));
-        return content.toString();
-    }
-
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.intro.config.IIntroContentProvider#dispose()
-     */
-    public void dispose() {
-
-    }
-
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/intro/java/Perspective.java b/ui/org.eclipse.pde.ui/templates_3.0/intro/java/Perspective.java
deleted file mode 100644
index b38d535..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/intro/java/Perspective.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package $packageName$;
-
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IPerspectiveFactory;
-
-public class Perspective implements IPerspectiveFactory {
-
-	public void createInitialLayout(IPageLayout layout) {
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/mail/bin/icons/sample.gif b/ui/org.eclipse.pde.ui/templates_3.0/mail/bin/icons/sample.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/mail/bin/icons/sample.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/mail/bin/icons/sample.icns b/ui/org.eclipse.pde.ui/templates_3.0/mail/bin/icons/sample.icns
deleted file mode 100644
index 1e92ccc..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/mail/bin/icons/sample.icns
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/mail/bin/icons/sample2.gif b/ui/org.eclipse.pde.ui/templates_3.0/mail/bin/icons/sample2.gif
deleted file mode 100644
index 252d7eb..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/mail/bin/icons/sample2.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/mail/bin/icons/sample3.gif b/ui/org.eclipse.pde.ui/templates_3.0/mail/bin/icons/sample3.gif
deleted file mode 100644
index b949ac9..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/mail/bin/icons/sample3.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/mail/bin/plugin.properties b/ui/org.eclipse.pde.ui/templates_3.0/mail/bin/plugin.properties
deleted file mode 100644
index 77a85f2..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/mail/bin/plugin.properties
+++ /dev/null

@@ -1,10 +0,0 @@
-aboutText=This RCP Application was generated from\n\
-the PDE Plug-in Project wizard.\n\n\
-This sample shows how to:\n\
-- add a top-level menu and toolbar with actions\n\
-- add keybindings to actions\n\
-- create views that can't be closed and\n\
-  multiple instances of the same view\n\
-- perspectives with placeholders for new views\n\
-- use the default about dialog\n\
-- create a product definition\n
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/mail/bin/product_lg.gif b/ui/org.eclipse.pde.ui/templates_3.0/mail/bin/product_lg.gif
deleted file mode 100644
index bd95e28..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/mail/bin/product_lg.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/mail/bin/splash.bmp b/ui/org.eclipse.pde.ui/templates_3.0/mail/bin/splash.bmp
deleted file mode 100644
index 99ea60d..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/mail/bin/splash.bmp
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/mail/java/$applicationClass$.java b/ui/org.eclipse.pde.ui/templates_3.0/mail/java/$applicationClass$.java
deleted file mode 100644
index d926eaa..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/mail/java/$applicationClass$.java
+++ /dev/null

@@ -1,27 +0,0 @@
-package $packageName$;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * This class controls all aspects of the application's execution
- */
-public class $applicationClass$ implements IPlatformRunnable {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IPlatformRunnable#run(java.lang.Object)
-	 */
-	public Object run(Object args) throws Exception {
-		Display display = PlatformUI.createDisplay();
-		try {
-			int returnCode = PlatformUI.createAndRunWorkbench(display, new ApplicationWorkbenchAdvisor());
-			if (returnCode == PlatformUI.RETURN_RESTART) {
-				return IPlatformRunnable.EXIT_RESTART;
-			}
-			return IPlatformRunnable.EXIT_OK;
-		} finally {
-			display.dispose();
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/mail/java/ApplicationWorkbenchAdvisor.java b/ui/org.eclipse.pde.ui/templates_3.0/mail/java/ApplicationWorkbenchAdvisor.java
deleted file mode 100644
index ca80cd0..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/mail/java/ApplicationWorkbenchAdvisor.java
+++ /dev/null

@@ -1,116 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.GroupMarker;
-import org.eclipse.jface.action.ICoolBarManager;
-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.action.ToolBarContributionItem;
-import org.eclipse.jface.action.ToolBarManager;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
-import org.eclipse.ui.application.IActionBarConfigurer;
-import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
-import org.eclipse.ui.application.WorkbenchAdvisor;
-
-/**
- * This workbench advisor creates the window advisor, and specifies
- * the perspective id for the initial window.
- */
-public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
-	
-	private static final String PERSPECTIVE_ID = "$pluginId$.perspective";
-
-    private IWorkbenchAction exitAction;
-    private IWorkbenchAction aboutAction;
-    private IWorkbenchAction newWindowAction;
-    private OpenViewAction openViewAction;
-    private Action messagePopupAction;
-
-	public String getInitialWindowPerspectiveId() {
-		return PERSPECTIVE_ID;
-	} 
-	
-	public void fillActionBars(IWorkbenchWindow window, IActionBarConfigurer configurer, int flags) {
-		if ((flags & FILL_PROXY) != 0) {
-			// Filling in fake action bars, for example when showing the customize perspective dialog.
-			// At this point, we don't have to create new actions, and instead simply add them to the
-			// provided actions bars.
-			if ((flags & FILL_MENU_BAR) != 0) {
-				fillMenuBar(configurer.getMenuManager());
-			}
-			if ((flags & FILL_COOL_BAR) != 0) {
-				fillCoolBar(configurer.getCoolBarManager());
-			}
-		} else {
-			makeActions(window, configurer);
-			fillMenuBar(configurer.getMenuManager());
-			fillCoolBar(configurer.getCoolBarManager());
-		}
-	}
-	
-	private void fillMenuBar(IMenuManager menuBar) {
-        MenuManager fileMenu = new MenuManager("&File", IWorkbenchActionConstants.M_FILE);
-        MenuManager helpMenu = new MenuManager("&Help", IWorkbenchActionConstants.M_HELP);
-        
-        menuBar.add(fileMenu);
-        // Add a group marker indicating where action set menus will appear.
-        menuBar.add(new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS));
-        menuBar.add(helpMenu);
-        
-        // File
-        fileMenu.add(newWindowAction);
-        fileMenu.add(new Separator());
-        fileMenu.add(messagePopupAction);
-        fileMenu.add(openViewAction);
-        fileMenu.add(new Separator());
-        fileMenu.add(exitAction);
-        
-        // Help
-        helpMenu.add(aboutAction);		
-	}
-	
-    private void fillCoolBar(ICoolBarManager coolBar) {
-        IToolBarManager toolbar = new ToolBarManager(SWT.FLAT | SWT.RIGHT);
-        coolBar.add(new ToolBarContributionItem(toolbar, "main"));   
-        toolbar.add(openViewAction);
-        toolbar.add(messagePopupAction);
-    }
-
-	
-	private void makeActions(IWorkbenchWindow window, IActionBarConfigurer configurer) {
-        exitAction = ActionFactory.QUIT.create(window);
-        configurer.registerGlobalAction(exitAction);
-        
-        aboutAction = ActionFactory.ABOUT.create(window);
-        configurer.registerGlobalAction(aboutAction);
-        
-        newWindowAction = ActionFactory.OPEN_NEW_WINDOW.create(window);
-        configurer.registerGlobalAction(newWindowAction);
-        
-        openViewAction = new OpenViewAction(window, "Open Another Message View", View.ID);
-        configurer.registerGlobalAction(openViewAction);
-        
-        messagePopupAction = new MessagePopupAction("Open Message", window);
-        configurer.registerGlobalAction(messagePopupAction);
-		
-	}
-	
-	public void preWindowOpen(IWorkbenchWindowConfigurer configurer) {
-		configurer.setInitialSize(new Point(600, 400));
-		configurer.setShowCoolBar(true);
-		configurer.setShowStatusLine(false);
-	}
-	
-	public void postWindowClose(IWorkbenchWindowConfigurer configurer) {
-		aboutAction.dispose();
-		exitAction.dispose();
-		newWindowAction.dispose();
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/mail/java/ICommandIds.java b/ui/org.eclipse.pde.ui/templates_3.0/mail/java/ICommandIds.java
deleted file mode 100644
index dd6d40e..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/mail/java/ICommandIds.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package $packageName$;
-
-/**
- * Interface defining the application's command IDs.
- * Key bindings can be defined for specific commands.
- * To associate an action with a command, use IAction.setActionDefinitionId(commandId).
- *
- * @see org.eclipse.jface.action.IAction#setActionDefinitionId(String)
- */
-public interface ICommandIds {
-
-    public static final String CMD_OPEN = "$pluginId$.open";
-    public static final String CMD_OPEN_MESSAGE = "$pluginId$.openMessage";
-    
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/mail/java/MessagePopupAction.java b/ui/org.eclipse.pde.ui/templates_3.0/mail/java/MessagePopupAction.java
deleted file mode 100644
index 8976bb4..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/mail/java/MessagePopupAction.java
+++ /dev/null

@@ -1,25 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.ui.IWorkbenchWindow;
-
-
-public class MessagePopupAction extends Action {
-
-    private final IWorkbenchWindow window;
-
-    MessagePopupAction(String text, IWorkbenchWindow window) {
-        super(text);
-        this.window = window;
-        // The id is used to refer to the action in a menu or toolbar
-        setId(ICommandIds.CMD_OPEN_MESSAGE);
-        // Associate the action with a pre-defined command, to allow key bindings.
-        setActionDefinitionId(ICommandIds.CMD_OPEN_MESSAGE);
-        setImageDescriptor($pluginClass$.getImageDescriptor("/icons/sample3.gif"));
-    }
-
-    public void run() {
-        MessageDialog.openInformation(window.getShell(), "Open", "Open Message Dialog!");
-    }
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/mail/java/NavigationView.java b/ui/org.eclipse.pde.ui/templates_3.0/mail/java/NavigationView.java
deleted file mode 100644
index aaae601..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/mail/java/NavigationView.java
+++ /dev/null

@@ -1,151 +0,0 @@
-package $packageName$;
-
-import java.util.ArrayList;
-
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.ViewPart;
-
-public class NavigationView extends ViewPart {
-	public static final String ID = "$pluginId$.navigationView";
-	private TreeViewer viewer;
-	 
-	class TreeObject {
-		private String name;
-		private TreeParent parent;
-		
-		public TreeObject(String name) {
-			this.name = name;
-		}
-		public String getName() {
-			return name;
-		}
-		public void setParent(TreeParent parent) {
-			this.parent = parent;
-		}
-		public TreeParent getParent() {
-			return parent;
-		}
-		public String toString() {
-			return getName();
-		}
-	}
-	
-	class TreeParent extends TreeObject {
-		private ArrayList children;
-		public TreeParent(String name) {
-			super(name);
-			children = new ArrayList();
-		}
-		public void addChild(TreeObject child) {
-			children.add(child);
-			child.setParent(this);
-		}
-		public void removeChild(TreeObject child) {
-			children.remove(child);
-			child.setParent(null);
-		}
-		public TreeObject[] getChildren() {
-			return (TreeObject[]) children.toArray(new TreeObject[children.size()]);
-		}
-		public boolean hasChildren() {
-			return children.size()>0;
-		}
-	}
-
-	class ViewContentProvider implements IStructuredContentProvider, 
-										   ITreeContentProvider {
-
-        public void inputChanged(Viewer v, Object oldInput, Object newInput) {
-		}
-        
-		public void dispose() {
-		}
-        
-		public Object[] getElements(Object parent) {
-			return getChildren(parent);
-		}
-        
-		public Object getParent(Object child) {
-			if (child instanceof TreeObject) {
-				return ((TreeObject)child).getParent();
-			}
-			return null;
-		}
-        
-		public Object[] getChildren(Object parent) {
-			if (parent instanceof TreeParent) {
-				return ((TreeParent)parent).getChildren();
-			}
-			return new Object[0];
-		}
-
-        public boolean hasChildren(Object parent) {
-			if (parent instanceof TreeParent)
-				return ((TreeParent)parent).hasChildren();
-			return false;
-		}
-	}
-	
-	class ViewLabelProvider extends LabelProvider {
-
-		public String getText(Object obj) {
-			return obj.toString();
-		}
-		public Image getImage(Object obj) {
-			String imageKey = ISharedImages.IMG_OBJ_ELEMENT;
-			if (obj instanceof TreeParent)
-			   imageKey = ISharedImages.IMG_OBJ_FOLDER;
-			return PlatformUI.getWorkbench().getSharedImages().getImage(imageKey);
-		}
-	}
-
-    /**
-     * We will set up a dummy model to initialize tree heararchy. In real
-     * code, you will connect to a real model and expose its hierarchy.
-     */
-    private TreeObject createDummyModel() {
-        TreeObject to1 = new TreeObject("Inbox");
-        TreeObject to2 = new TreeObject("Drafts");
-        TreeObject to3 = new TreeObject("Sent");
-        TreeParent p1 = new TreeParent("me@this.com");
-        p1.addChild(to1);
-        p1.addChild(to2);
-        p1.addChild(to3);
-
-        TreeObject to4 = new TreeObject("Inbox");
-        TreeParent p2 = new TreeParent("other@aol.com");
-        p2.addChild(to4);
-
-        TreeParent root = new TreeParent("");
-        root.addChild(p1);
-        root.addChild(p2);
-        return root;
-    }
-
-	/**
-     * This is a callback that will allow us to create the viewer and initialize
-     * it.
-     */
-	public void createPartControl(Composite parent) {
-		viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
-		viewer.setContentProvider(new ViewContentProvider());
-		viewer.setLabelProvider(new ViewLabelProvider());
-		viewer.setInput(createDummyModel());
-	}
-
-	/**
-	 * Passing the focus request to the viewer's control.
-	 */
-	public void setFocus() {
-		viewer.getControl().setFocus();
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/mail/java/OpenViewAction.java b/ui/org.eclipse.pde.ui/templates_3.0/mail/java/OpenViewAction.java
deleted file mode 100644
index 7ea8882..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/mail/java/OpenViewAction.java
+++ /dev/null

@@ -1,36 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-
-
-public class OpenViewAction extends Action {
-	
-	private final IWorkbenchWindow window;
-	private int instanceNum = 0;
-	private final String viewId;
-	
-	public OpenViewAction(IWorkbenchWindow window, String label, String viewId) {
-		this.window = window;
-		this.viewId = viewId;
-        setText(label);
-        // The id is used to refer to the action in a menu or toolbar
-		setId(ICommandIds.CMD_OPEN);
-        // Associate the action with a pre-defined command, to allow key bindings.
-		setActionDefinitionId(ICommandIds.CMD_OPEN);
-		setImageDescriptor($pluginClass$.getImageDescriptor("/icons/sample2.gif"));
-	}
-	
-	public void run() {
-		if(window != null) {	
-			try {
-				window.getActivePage().showView(viewId, Integer.toString(instanceNum++), IWorkbenchPage.VIEW_ACTIVATE);
-			} catch (PartInitException e) {
-				MessageDialog.openError(window.getShell(), "Error", "Error opening view:" + e.getMessage());
-			}
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/mail/java/Perspective.java b/ui/org.eclipse.pde.ui/templates_3.0/mail/java/Perspective.java
deleted file mode 100644
index 86a9dd9..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/mail/java/Perspective.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package $packageName$;
-
-import org.eclipse.ui.IFolderLayout;
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IPerspectiveFactory;
-
-public class Perspective implements IPerspectiveFactory {
-
-	public void createInitialLayout(IPageLayout layout) {
-		String editorArea = layout.getEditorArea();
-		layout.setEditorAreaVisible(false);
-		
-		layout.addStandaloneView(NavigationView.ID,  false, IPageLayout.LEFT, 0.25f, editorArea);
-		IFolderLayout folder = layout.createFolder("messages", IPageLayout.TOP, 0.5f, editorArea);
-		folder.addPlaceholder(View.ID + ":*");
-		folder.addView(View.ID);
-		
-		layout.getViewLayout(NavigationView.ID).setCloseable(false);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/mail/java/View.java b/ui/org.eclipse.pde.ui/templates_3.0/mail/java/View.java
deleted file mode 100644
index 2843b23..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/mail/java/View.java
+++ /dev/null

@@ -1,72 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.part.ViewPart;
-
-public class View extends ViewPart {
-
-	public static final String ID = "$pluginId$.view";
-	
-	private Font boldFont;
-
-	public void createPartControl(Composite parent) {
-		Composite top = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		top.setLayout(layout);
-		// top banner
-		Composite banner = new Composite(top, SWT.NONE);
-		banner.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL, GridData.VERTICAL_ALIGN_BEGINNING, true, false));
-		layout = new GridLayout();
-		layout.marginHeight = 5;
-		layout.marginWidth = 10;
-		layout.numColumns = 2;
-		banner.setLayout(layout);
-		// setup bold font
-		Font defaultFont = JFaceResources.getDefaultFont();
-		FontData[] data = defaultFont.getFontData();
-		for (int i = 0; i < data.length; i++) {
-			data[i].setStyle(SWT.BOLD);
-		}
-		boldFont = new Font(top.getDisplay(), data);
-		Label l = new Label(banner, SWT.WRAP);
-		l.setText("Subject:");
-		l.setFont(boldFont);
-		l = new Label(banner, SWT.WRAP);
-		l.setText("This is a message about the cool Eclipse RCP!");
-		
-		l = new Label(banner, SWT.WRAP);
-		l.setText("From:");
-		l.setFont(boldFont);
-		final Label link = new Label(banner, SWT.WRAP);
-		link.setText("nicole@mail.org");
-		link.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_BLUE));
-		
-		l = new Label(banner, SWT.WRAP);
-		l.setText("Date:");
-		l.setFont(boldFont);
-		l = new Label(banner, SWT.WRAP);
-		l.setText("10:34 am");
-		// message contents
-		Text text = new Text(top, SWT.MULTI | SWT.WRAP);
-		text.setText("This RCP Application was generated from the PDE Plug-in Project wizard. This sample shows how to:\n"+
-						"- add a top-level menu and toolbar with actions\n"+
-						"- add keybindings to actions\n" +
-						"- create views that can't be closed and\n"+
-						"  multiple instances of the same view\n"+
-						"- perspectives with placeholders for new views\n"+
-						"- use the default about dialog\n"+
-						"- create a product definition\n");
-		text.setLayoutData(new GridData(GridData.FILL_BOTH));
-	}
-
-	public void setFocus() {
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/multiPageEditor/bin/icons/sample.gif b/ui/org.eclipse.pde.ui/templates_3.0/multiPageEditor/bin/icons/sample.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/multiPageEditor/bin/icons/sample.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/multiPageEditor/java/$contributorClassName$.java b/ui/org.eclipse.pde.ui/templates_3.0/multiPageEditor/java/$contributorClassName$.java
deleted file mode 100644
index 2a1d8b4..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/multiPageEditor/java/$contributorClassName$.java
+++ /dev/null

@@ -1,103 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.ide.IDEActionFactory;
-import org.eclipse.ui.part.MultiPageEditorActionBarContributor;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.texteditor.ITextEditorActionConstants;
-
-/**
- * Manages the installation/deinstallation of global actions for multi-page editors.
- * Responsible for the redirection of global actions to the active editor.
- * Multi-page contributor replaces the contributors for the individual editors in the multi-page editor.
- */
-public class $contributorClassName$ extends MultiPageEditorActionBarContributor {
-	private IEditorPart activeEditorPart;
-	private Action sampleAction;
-	/**
-	 * Creates a multi-page contributor.
-	 */
-	public $contributorClassName$() {
-		super();
-		createActions();
-	}
-	/**
-	 * Returns the action registed with the given text editor.
-	 * @return IAction or null if editor is null.
-	 */
-	protected IAction getAction(ITextEditor editor, String actionID) {
-		return (editor == null ? null : editor.getAction(actionID));
-	}
-	/* (non-JavaDoc)
-	 * Method declared in AbstractMultiPageEditorActionBarContributor.
-	 */
-
-	public void setActivePage(IEditorPart part) {
-		if (activeEditorPart == part)
-			return;
-
-		activeEditorPart = part;
-
-		IActionBars actionBars = getActionBars();
-		if (actionBars != null) {
-
-			ITextEditor editor = (part instanceof ITextEditor) ? (ITextEditor) part : null;
-
-			actionBars.setGlobalActionHandler(
-				ActionFactory.DELETE.getId(),
-				getAction(editor, ITextEditorActionConstants.DELETE));
-			actionBars.setGlobalActionHandler(
-				ActionFactory.UNDO.getId(),
-				getAction(editor, ITextEditorActionConstants.UNDO));
-			actionBars.setGlobalActionHandler(
-				ActionFactory.REDO.getId(),
-				getAction(editor, ITextEditorActionConstants.REDO));
-			actionBars.setGlobalActionHandler(
-				ActionFactory.CUT.getId(),
-				getAction(editor, ITextEditorActionConstants.CUT));
-			actionBars.setGlobalActionHandler(
-				ActionFactory.COPY.getId(),
-				getAction(editor, ITextEditorActionConstants.COPY));
-			actionBars.setGlobalActionHandler(
-				ActionFactory.PASTE.getId(),
-				getAction(editor, ITextEditorActionConstants.PASTE));
-			actionBars.setGlobalActionHandler(
-				ActionFactory.SELECT_ALL.getId(),
-				getAction(editor, ITextEditorActionConstants.SELECT_ALL));
-			actionBars.setGlobalActionHandler(
-				ActionFactory.FIND.getId(),
-				getAction(editor, ITextEditorActionConstants.FIND));
-			actionBars.setGlobalActionHandler(
-				IDEActionFactory.BOOKMARK.getId(),
-				getAction(editor, IDEActionFactory.BOOKMARK.getId()));
-			actionBars.updateActionBars();
-		}
-	}
-	private void createActions() {
-		sampleAction = new Action() {
-			public void run() {
-				MessageDialog.openInformation(null, "$pluginName$", "Sample Action Executed");
-			}
-		};
-		sampleAction.setText("Sample Action");
-		sampleAction.setToolTipText("Sample Action tool tip");
-		sampleAction.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().
-				getImageDescriptor(IDE.SharedImages.IMG_OBJS_TASK_TSK));
-	}
-	public void contributeToMenu(IMenuManager manager) {
-		IMenuManager menu = new MenuManager("Editor &Menu");
-		manager.prependToGroup(IWorkbenchActionConstants.MB_ADDITIONS, menu);
-		menu.add(sampleAction);
-	}
-	public void contributeToToolBar(IToolBarManager manager) {
-		manager.add(new Separator());
-		manager.add(sampleAction);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/multiPageEditor/java/$editorClassName$.java b/ui/org.eclipse.pde.ui/templates_3.0/multiPageEditor/java/$editorClassName$.java
deleted file mode 100644
index 9e388b0..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/multiPageEditor/java/$editorClassName$.java
+++ /dev/null

@@ -1,239 +0,0 @@
-package $packageName$;
-
-
-import java.io.StringWriter;
-import java.text.Collator;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.layout.FillLayout;
-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.Display;
-import org.eclipse.swt.widgets.FontDialog;
-import org.eclipse.ui.*;
-import org.eclipse.ui.editors.text.TextEditor;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.MultiPageEditorPart;
-import org.eclipse.ui.ide.IDE;
-
-/**
- * An example showing how to create a multi-page editor.
- * This example has 3 pages:
- * <ul>
- * <li>page 0 contains a nested text editor.
- * <li>page 1 allows you to change the font used in page 2
- * <li>page 2 shows the words in page 0 in sorted order
- * </ul>
- */
-public class $editorClassName$ extends MultiPageEditorPart implements IResourceChangeListener{
-
-	/** The text editor used in page 0. */
-	private TextEditor editor;
-
-	/** The font chosen in page 1. */
-	private Font font;
-
-	/** The text widget used in page 2. */
-	private StyledText text;
-	/**
-	 * Creates a multi-page editor example.
-	 */
-	public $editorClassName$() {
-		super();
-		ResourcesPlugin.getWorkspace().addResourceChangeListener(this);
-	}
-	/**
-	 * Creates page 0 of the multi-page editor,
-	 * which contains a text editor.
-	 */
-	void createPage0() {
-		try {
-			editor = new TextEditor();
-			int index = addPage(editor, getEditorInput());
-			setPageText(index, editor.getTitle());
-		} catch (PartInitException e) {
-			ErrorDialog.openError(
-				getSite().getShell(),
-				"Error creating nested text editor",
-				null,
-				e.getStatus());
-		}
-	}
-	/**
-	 * Creates page 1 of the multi-page editor,
-	 * which allows you to change the font used in page 2.
-	 */
-	void createPage1() {
-
-		Composite composite = new Composite(getContainer(), SWT.NONE);
-		GridLayout layout = new GridLayout();
-		composite.setLayout(layout);
-		layout.numColumns = 2;
-
-		Button fontButton = new Button(composite, SWT.NONE);
-		GridData gd = new GridData(GridData.BEGINNING);
-		gd.horizontalSpan = 2;
-		fontButton.setLayoutData(gd);
-		fontButton.setText("Change Font...");
-		
-		fontButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				setFont();
-			}
-		});
-
-		int index = addPage(composite);
-		setPageText(index, "Properties");
-	}
-	/**
-	 * Creates page 2 of the multi-page editor,
-	 * which shows the sorted text.
-	 */
-	void createPage2() {
-		Composite composite = new Composite(getContainer(), SWT.NONE);
-		FillLayout layout = new FillLayout();
-		composite.setLayout(layout);
-		text = new StyledText(composite, SWT.H_SCROLL | SWT.V_SCROLL);
-		text.setEditable(false);
-
-		int index = addPage(composite);
-		setPageText(index, "Preview");
-	}
-	/**
-	 * Creates the pages of the multi-page editor.
-	 */
-	protected void createPages() {
-		createPage0();
-		createPage1();
-		createPage2();
-	}
-	/**
-	 * The <code>MultiPageEditorPart</code> implementation of this 
-	 * <code>IWorkbenchPart</code> method disposes all nested editors.
-	 * Subclasses may extend.
-	 */
-	public void dispose() {
-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
-		super.dispose();
-	}
-	/**
-	 * Saves the multi-page editor's document.
-	 */
-	public void doSave(IProgressMonitor monitor) {
-		getEditor(0).doSave(monitor);
-	}
-	/**
-	 * Saves the multi-page editor's document as another file.
-	 * Also updates the text for page 0's tab, and updates this multi-page editor's input
-	 * to correspond to the nested editor's.
-	 */
-	public void doSaveAs() {
-		IEditorPart editor = getEditor(0);
-		editor.doSaveAs();
-		setPageText(0, editor.getTitle());
-		setInput(editor.getEditorInput());
-	}
-	/* (non-Javadoc)
-	 * Method declared on IEditorPart
-	 */
-	public void gotoMarker(IMarker marker) {
-		setActivePage(0);
-		IDE.gotoMarker(getEditor(0), marker);
-	}
-	/**
-	 * The <code>MultiPageEditorExample</code> implementation of this method
-	 * checks that the input is an instance of <code>IFileEditorInput</code>.
-	 */
-	public void init(IEditorSite site, IEditorInput editorInput)
-		throws PartInitException {
-		if (!(editorInput instanceof IFileEditorInput))
-			throw new PartInitException("Invalid Input: Must be IFileEditorInput");
-		super.init(site, editorInput);
-	}
-	/* (non-Javadoc)
-	 * Method declared on IEditorPart.
-	 */
-	public boolean isSaveAsAllowed() {
-		return true;
-	}
-	/**
-	 * Calculates the contents of page 2 when the it is activated.
-	 */
-	protected void pageChange(int newPageIndex) {
-		super.pageChange(newPageIndex);
-		if (newPageIndex == 2) {
-			sortWords();
-		}
-	}
-	/**
-	 * Closes all project files on project close.
-	 */
-	public void resourceChanged(final IResourceChangeEvent event){
-		if(event.getType() == IResourceChangeEvent.PRE_CLOSE){
-			Display.getDefault().asyncExec(new Runnable(){
-				public void run(){
-					IWorkbenchPage[] pages = getSite().getWorkbenchWindow().getPages();
-					for (int i = 0; i<pages.length; i++){
-						if(((FileEditorInput)editor.getEditorInput()).getFile().getProject().equals(event.getResource())){
-							IEditorPart editorPart = pages[i].findEditor(editor.getEditorInput());
-							pages[i].closeEditor(editorPart,true);
-						}
-					}
-				}            
-			});
-		}
-	}
-	/**
-	 * Sets the font related data to be applied to the text in page 2.
-	 */
-	void setFont() {
-		FontDialog fontDialog = new FontDialog(getSite().getShell());
-		fontDialog.setFontList(text.getFont().getFontData());
-		FontData fontData = fontDialog.open();
-		if (fontData != null) {
-			if (font != null)
-				font.dispose();
-			font = new Font(text.getDisplay(), fontData);
-			text.setFont(font);
-		}
-	}
-	/**
-	 * Sorts the words in page 0, and shows them in page 2.
-	 */
-	void sortWords() {
-
-		String editorText =
-			editor.getDocumentProvider().getDocument(editor.getEditorInput()).get();
-
-		StringTokenizer tokenizer =
-			new StringTokenizer(editorText, " \t\n\r\f!@#\u0024%^&*()-_=+`~[]{};:'\",.<>/?|\\");
-		ArrayList editorWords = new ArrayList();
-		while (tokenizer.hasMoreTokens()) {
-			editorWords.add(tokenizer.nextToken());
-		}
-
-		Collections.sort(editorWords, Collator.getInstance());
-		StringWriter displayText = new StringWriter();
-		for (int i = 0; i < editorWords.size(); i++) {
-			displayText.write(((String) editorWords.get(i)));
-			displayText.write(System.getProperty("line.separator"));
-		}
-		text.setText(displayText.toString());
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/newWizard/bin/icons/sample.gif b/ui/org.eclipse.pde.ui/templates_3.0/newWizard/bin/icons/sample.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/newWizard/bin/icons/sample.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/newWizard/java/$wizardClassName$.java b/ui/org.eclipse.pde.ui/templates_3.0/newWizard/java/$wizardClassName$.java
deleted file mode 100644
index 1449ce0..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/newWizard/java/$wizardClassName$.java
+++ /dev/null

@@ -1,150 +0,0 @@
-package $packageName$;
-
-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.core.runtime.*;
-import org.eclipse.jface.operation.*;
-import java.lang.reflect.InvocationTargetException;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.CoreException;
-import java.io.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.ide.IDE;
-
-/**
- * This is a sample new wizard. Its role is to create a new file 
- * resource in the provided container. If the container resource
- * (a folder or a project) is selected in the workspace 
- * when the wizard is opened, it will accept it as the target
- * container. The wizard creates one file with the extension
- * "$extension$". If a sample multi-page editor (also available
- * as a template) is registered for the same extension, it will
- * be able to open it.
- */
-
-public class $wizardClassName$ extends Wizard implements INewWizard {
-	private $wizardPageClassName$ page;
-	private ISelection selection;
-
-	/**
-	 * Constructor for $wizardClassName$.
-	 */
-	public $wizardClassName$() {
-		super();
-		setNeedsProgressMonitor(true);
-	}
-	
-	/**
-	 * Adding the page to the wizard.
-	 */
-
-	public void addPages() {
-		page = new $wizardPageClassName$(selection);
-		addPage(page);
-	}
-
-	/**
-	 * This method is called when 'Finish' button is pressed in
-	 * the wizard. We will create an operation and run it
-	 * using wizard as execution context.
-	 */
-	public boolean performFinish() {
-		final String containerName = page.getContainerName();
-		final String fileName = page.getFileName();
-		IRunnableWithProgress op = new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor) throws InvocationTargetException {
-				try {
-					doFinish(containerName, fileName, monitor);
-				} catch (CoreException e) {
-					throw new InvocationTargetException(e);
-				} finally {
-					monitor.done();
-				}
-			}
-		};
-		try {
-			getContainer().run(true, false, op);
-		} catch (InterruptedException e) {
-			return false;
-		} catch (InvocationTargetException e) {
-			Throwable realException = e.getTargetException();
-			MessageDialog.openError(getShell(), "Error", realException.getMessage());
-			return false;
-		}
-		return true;
-	}
-	
-	/**
-	 * The worker method. It will find the container, create the
-	 * file if missing or just replace its contents, and open
-	 * the editor on the newly created file.
-	 */
-
-	private void doFinish(
-		String containerName,
-		String fileName,
-		IProgressMonitor monitor)
-		throws CoreException {
-		// create a sample file
-		monitor.beginTask("Creating " + fileName, 2);
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		IResource resource = root.findMember(new Path(containerName));
-		if (!resource.exists() || !(resource instanceof IContainer)) {
-			throwCoreException("Container \"" + containerName + "\" does not exist.");
-		}
-		IContainer container = (IContainer) resource;
-		final IFile file = container.getFile(new Path(fileName));
-		try {
-			InputStream stream = openContentStream();
-			if (file.exists()) {
-				file.setContents(stream, true, true, monitor);
-			} else {
-				file.create(stream, true, monitor);
-			}
-			stream.close();
-		} catch (IOException e) {
-		}
-		monitor.worked(1);
-		monitor.setTaskName("Opening file for editing...");
-		getShell().getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				IWorkbenchPage page =
-					PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-				try {
-					IDE.openEditor(page, file, true);
-				} catch (PartInitException e) {
-				}
-			}
-		});
-		monitor.worked(1);
-	}
-	
-	/**
-	 * We will initialize file contents with a sample text.
-	 */
-
-	private InputStream openContentStream() {
-		String contents =
-			"This is the initial file contents for *.$extension$ file that should be word-sorted in the Preview page of the multi-page editor";
-		return new ByteArrayInputStream(contents.getBytes());
-	}
-
-	private void throwCoreException(String message) throws CoreException {
-		IStatus status =
-			new Status(IStatus.ERROR, "$pluginId$", IStatus.OK, message, null);
-		throw new CoreException(status);
-	}
-
-	/**
-	 * We will accept the selection in the workbench to see if
-	 * we can initialize from it.
-	 * @see IWorkbenchWizard#init(IWorkbench, IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		this.selection = selection;
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/newWizard/java/$wizardPageClassName$.java b/ui/org.eclipse.pde.ui/templates_3.0/newWizard/java/$wizardPageClassName$.java
deleted file mode 100644
index 3b7b1c1..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/newWizard/java/$wizardPageClassName$.java
+++ /dev/null

@@ -1,185 +0,0 @@
-package $packageName$;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.WizardPage;
-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.dialogs.ContainerSelectionDialog;
-
-/**
- * The "New" wizard page allows setting the container for the new file as well
- * as the file name. The page will only accept file name without the extension
- * OR with the extension that matches the expected one ($extension$).
- */
-
-public class $wizardPageClassName$ extends WizardPage {
-	private Text containerText;
-
-	private Text fileText;
-
-	private ISelection selection;
-
-	/**
-	 * Constructor for SampleNewWizardPage.
-	 * 
-	 * @param pageName
-	 */
-	public $wizardPageClassName$(ISelection selection) {
-		super("wizardPage");
-		setTitle("Multi-page Editor File");
-		setDescription("This wizard creates a new file with *.$extension$ extension that can be opened by a multi-page editor.");
-		this.selection = selection;
-	}
-
-	/**
-	 * @see IDialogPage#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite container = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		container.setLayout(layout);
-		layout.numColumns = 3;
-		layout.verticalSpacing = 9;
-		Label label = new Label(container, SWT.NULL);
-		label.setText("&Container:");
-
-		containerText = new Text(container, SWT.BORDER | SWT.SINGLE);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		containerText.setLayoutData(gd);
-		containerText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				dialogChanged();
-			}
-		});
-
-		Button button = new Button(container, SWT.PUSH);
-		button.setText("Browse...");
-		button.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleBrowse();
-			}
-		});
-		label = new Label(container, SWT.NULL);
-		label.setText("&File name:");
-
-		fileText = new Text(container, SWT.BORDER | SWT.SINGLE);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		fileText.setLayoutData(gd);
-		fileText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				dialogChanged();
-			}
-		});
-		initialize();
-		dialogChanged();
-		setControl(container);
-	}
-
-	/**
-	 * Tests if the current workbench selection is a suitable container to use.
-	 */
-
-	private void initialize() {
-		if (selection != null && selection.isEmpty() == false
-				&& selection instanceof IStructuredSelection) {
-			IStructuredSelection ssel = (IStructuredSelection) selection;
-			if (ssel.size() > 1)
-				return;
-			Object obj = ssel.getFirstElement();
-			if (obj instanceof IResource) {
-				IContainer container;
-				if (obj instanceof IContainer)
-					container = (IContainer) obj;
-				else
-					container = ((IResource) obj).getParent();
-				containerText.setText(container.getFullPath().toString());
-			}
-		}
-		fileText.setText("$initialFileName$");
-	}
-
-	/**
-	 * Uses the standard container selection dialog to choose the new value for
-	 * the container field.
-	 */
-
-	private void handleBrowse() {
-		ContainerSelectionDialog dialog = new ContainerSelectionDialog(
-				getShell(), ResourcesPlugin.getWorkspace().getRoot(), false,
-				"Select new file container");
-		if (dialog.open() == ContainerSelectionDialog.OK) {
-			Object[] result = dialog.getResult();
-			if (result.length == 1) {
-				containerText.setText(((Path) result[0]).toString());
-			}
-		}
-	}
-
-	/**
-	 * Ensures that both text fields are set.
-	 */
-
-	private void dialogChanged() {
-		IResource container = ResourcesPlugin.getWorkspace().getRoot()
-				.findMember(new Path(getContainerName()));
-		String fileName = getFileName();
-
-		if (getContainerName().length() == 0) {
-			updateStatus("File container must be specified");
-			return;
-		}
-		if (container == null
-				|| (container.getType() & (IResource.PROJECT | IResource.FOLDER)) == 0) {
-			updateStatus("File container must exist");
-			return;
-		}
-		if (!container.isAccessible()) {
-			updateStatus("Project must be writable");
-			return;
-		}
-		if (fileName.length() == 0) {
-			updateStatus("File name must be specified");
-			return;
-		}
-		if (fileName.replace('\\', '/').indexOf('/', 1) > 0) {
-			updateStatus("File name must be valid");
-			return;
-		}
-		int dotLoc = fileName.lastIndexOf('.');
-		if (dotLoc != -1) {
-			String ext = fileName.substring(dotLoc + 1);
-			if (ext.equalsIgnoreCase("$extension$") == false) {
-				updateStatus("File extension must be \"$extension$\"");
-				return;
-			}
-		}
-		updateStatus(null);
-	}
-
-	private void updateStatus(String message) {
-		setErrorMessage(message);
-		setPageComplete(message == null);
-	}
-
-	public String getContainerName() {
-		return containerText.getText();
-	}
-
-	public String getFileName() {
-		return fileText.getText();
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/popupMenus/java/$actionClass$.java b/ui/org.eclipse.pde.ui/templates_3.0/popupMenus/java/$actionClass$.java
deleted file mode 100644
index 5073eb4..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/popupMenus/java/$actionClass$.java
+++ /dev/null

@@ -1,42 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-
-public class $actionClass$ implements IObjectActionDelegate {
-
-	/**
-	 * Constructor for Action1.
-	 */
-	public $actionClass$() {
-		super();
-	}
-
-	/**
-	 * @see IObjectActionDelegate#setActivePart(IAction, IWorkbenchPart)
-	 */
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-	}
-
-	/**
-	 * @see IActionDelegate#run(IAction)
-	 */
-	public void run(IAction action) {
-		Shell shell = new Shell();
-		MessageDialog.openInformation(
-			shell,
-			"$pluginName$",
-			"$actionLabel$ was executed.");
-	}
-
-	/**
-	 * @see IActionDelegate#selectionChanged(IAction, ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/preferences/java/$pageClassName$.java b/ui/org.eclipse.pde.ui/templates_3.0/preferences/java/$pageClassName$.java
deleted file mode 100644
index eabb539..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/preferences/java/$pageClassName$.java
+++ /dev/null

@@ -1,71 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.preference.*;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.IWorkbench;
-import $fullPluginClassName$;
-
-/**
- * This class represents a preference page that
- * is contributed to the Preferences dialog. By 
- * subclassing <samp>FieldEditorPreferencePage</samp>, we
- * can use the field support built into JFace that allows
- * us to create a page that is small and knows how to 
- * save, restore and apply itself.
- * <p>
- * This page is used to modify preferences only. They
- * are stored in the preference store that belongs to
- * the main plug-in class. That way, preferences can
- * be accessed directly via the preference store.
- */
-
-%Options in the file
-%
-% packageName (inherit)
-% fullPluginClassName
-% pageClassName
-% pluginClassName
-%
-public class $pageClassName$
-	extends FieldEditorPreferencePage
-	implements IWorkbenchPreferencePage {
-
-	public $pageClassName$() {
-		super(GRID);
-		setPreferenceStore($pluginClassName$.getDefault().getPreferenceStore());
-		setDescription("A demonstration of a preference page implementation");
-	}
-	
-	/**
-	 * Creates the field editors. Field editors are abstractions of
-	 * the common GUI blocks needed to manipulate various types
-	 * of preferences. Each field editor knows how to save and
-	 * restore itself.
-	 */
-	public void createFieldEditors() {
-		addField(new DirectoryFieldEditor(PreferenceConstants.P_PATH, 
-				"&Directory preference:", getFieldEditorParent()));
-		addField(
-			new BooleanFieldEditor(
-				PreferenceConstants.P_BOOLEAN,
-				"&An example of a boolean preference",
-				getFieldEditorParent()));
-
-		addField(new RadioGroupFieldEditor(
-				PreferenceConstants.P_CHOICE,
-			"An example of a multiple-choice preference",
-			1,
-			new String[][] { { "&Choice 1", "choice1" }, {
-				"C&hoice 2", "choice2" }
-		}, getFieldEditorParent()));
-		addField(
-			new StringFieldEditor(PreferenceConstants.P_STRING, "A &text preference:", getFieldEditorParent()));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
-	 */
-	public void init(IWorkbench workbench) {
-	}
-	
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/preferences/java/PreferenceConstants.java b/ui/org.eclipse.pde.ui/templates_3.0/preferences/java/PreferenceConstants.java
deleted file mode 100644
index 9cc4912..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/preferences/java/PreferenceConstants.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package $packageName$;
-
-/**
- * Constant definitions for plug-in preferences
- */
-public class PreferenceConstants {
-
-	public static final String P_PATH = "pathPreference";
-
-	public static final String P_BOOLEAN = "booleanPreference";
-
-	public static final String P_CHOICE = "choicePreference";
-
-	public static final String P_STRING = "stringPreference";
-	
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/preferences/java/PreferenceInitializer.java b/ui/org.eclipse.pde.ui/templates_3.0/preferences/java/PreferenceInitializer.java
deleted file mode 100644
index 0f55ebc..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/preferences/java/PreferenceInitializer.java
+++ /dev/null

@@ -1,27 +0,0 @@
-package $packageName$;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-import $fullPluginClassName$;
-
-/**
- * Class used to initialize default preference values.
- */
-public class PreferenceInitializer extends AbstractPreferenceInitializer {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
-	 */
-	public void initializeDefaultPreferences() {
-		IPreferenceStore store = $pluginClassName$.getDefault()
-				.getPreferenceStore();
-		store.setDefault(PreferenceConstants.P_BOOLEAN, true);
-		store.setDefault(PreferenceConstants.P_CHOICE, "choice2");
-		store.setDefault(PreferenceConstants.P_STRING,
-				"Default value");
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/propertyPages/java/$className$.java b/ui/org.eclipse.pde.ui/templates_3.0/propertyPages/java/$className$.java
deleted file mode 100644
index 14c2b18..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/propertyPages/java/$className$.java
+++ /dev/null

@@ -1,125 +0,0 @@
-package $packageName$;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.QualifiedName;
-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;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.PropertyPage;
-
-public class $className$ extends PropertyPage {
-
-	private static final String PATH_TITLE = "Path:";
-	private static final String OWNER_TITLE = "&Owner:";
-	private static final String OWNER_PROPERTY = "OWNER";
-	private static final String DEFAULT_OWNER = "John Doe";
-
-	private static final int TEXT_FIELD_WIDTH = 50;
-
-	private Text ownerText;
-
-	/**
-	 * Constructor for SamplePropertyPage.
-	 */
-	public $className$() {
-		super();
-	}
-
-	private void addFirstSection(Composite parent) {
-		Composite composite = createDefaultComposite(parent);
-
-		//Label for path field
-		Label pathLabel = new Label(composite, SWT.NONE);
-		pathLabel.setText(PATH_TITLE);
-
-		// Path text field
-		Text pathValueText = new Text(composite, SWT.WRAP | SWT.READ_ONLY);
-		pathValueText.setText(((IResource) getElement()).getFullPath().toString());
-	}
-
-	private void addSeparator(Composite parent) {
-		Label separator = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
-		GridData gridData = new GridData();
-		gridData.horizontalAlignment = GridData.FILL;
-		gridData.grabExcessHorizontalSpace = true;
-		separator.setLayoutData(gridData);
-	}
-
-	private void addSecondSection(Composite parent) {
-		Composite composite = createDefaultComposite(parent);
-
-		// Label for owner field
-		Label ownerLabel = new Label(composite, SWT.NONE);
-		ownerLabel.setText(OWNER_TITLE);
-
-		// Owner text field
-		ownerText = new Text(composite, SWT.SINGLE | SWT.BORDER);
-		GridData gd = new GridData();
-		gd.widthHint = convertWidthInCharsToPixels(TEXT_FIELD_WIDTH);
-		ownerText.setLayoutData(gd);
-
-		// Populate owner text field
-		try {
-			String owner =
-				((IResource) getElement()).getPersistentProperty(
-					new QualifiedName("", OWNER_PROPERTY));
-			ownerText.setText((owner != null) ? owner : DEFAULT_OWNER);
-		} catch (CoreException e) {
-			ownerText.setText(DEFAULT_OWNER);
-		}
-	}
-
-	/**
-	 * @see PreferencePage#createContents(Composite)
-	 */
-	protected Control createContents(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		composite.setLayout(layout);
-		GridData data = new GridData(GridData.FILL);
-		data.grabExcessHorizontalSpace = true;
-		composite.setLayoutData(data);
-
-		addFirstSection(composite);
-		addSeparator(composite);
-		addSecondSection(composite);
-		return composite;
-	}
-
-	private Composite createDefaultComposite(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		composite.setLayout(layout);
-
-		GridData data = new GridData();
-		data.verticalAlignment = GridData.FILL;
-		data.horizontalAlignment = GridData.FILL;
-		composite.setLayoutData(data);
-
-		return composite;
-	}
-
-	protected void performDefaults() {
-		// Populate the owner text field with the default value
-		ownerText.setText(DEFAULT_OWNER);
-	}
-	
-	public boolean performOk() {
-		// store the value in the owner text field
-		try {
-			((IResource) getElement()).setPersistentProperty(
-				new QualifiedName("", OWNER_PROPERTY),
-				ownerText.getText());
-		} catch (CoreException e) {
-			return false;
-		}
-		return true;
-	}
-
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/view/bin/icons/sample.gif b/ui/org.eclipse.pde.ui/templates_3.0/view/bin/icons/sample.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/view/bin/icons/sample.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/view/java/$className$.java b/ui/org.eclipse.pde.ui/templates_3.0/view/java/$className$.java
deleted file mode 100644
index 1e75a25..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/view/java/$className$.java
+++ /dev/null

@@ -1,384 +0,0 @@
-package $packageName$;
-
-%  if viewType =="treeViewer"
-import java.util.ArrayList;
-% endif
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.part.*;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.ui.*;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.SWT;
-% if viewType == "treeViewer"
-import org.eclipse.core.runtime.IAdaptable;
-% endif
-
-
-/**
- * This sample class demonstrates how to plug-in a new
- * workbench view. The view shows data obtained from the
- * model. The sample creates a dummy model on the fly,
- * but a real implementation would connect to the model
- * available either in this or another plug-in (e.g. the workspace).
- * The view is connected to the model using a content provider.
- * <p>
- * The view uses a label provider to define how model
- * objects should be presented in the view. Each
- * view can present the same model objects using
- * different labels and icons, if needed. Alternatively,
- * a single label provider can be shared between views
- * in order to ensure that objects of the same type are
- * presented in the same way everywhere.
- * <p>
- */
-% Options in the template:
-%
-% packageName
-% className
-% viewName
-% viewCategoryId
-% viewCategoryName
-% viewType
-% doubleClick
-% popup
-% localToolbar
-% localPulldown
-% sorter
-% filter
-% drillDown
-
-public class $className$ extends ViewPart {
-%if viewType == "tableViewer"
-	private TableViewer viewer;
-%else
-%  if viewType == "treeViewer"
-	private TreeViewer viewer;
-	private DrillDownAdapter drillDownAdapter;
-%  endif
-%endif
-%if (localToolbar || localPulldown || popup)
-	private Action action1;
-	private Action action2;
-%endif
-%if doubleClick
-	private Action doubleClickAction;
-%endif
-
-	/*
-	 * The content provider class is responsible for
-	 * providing objects to the view. It can wrap
-	 * existing objects in adapters or simply return
-	 * objects as-is. These objects may be sensitive
-	 * to the current input of the view, or ignore
-	 * it and always show the same content 
-	 * (like Task List, for example).
-	 */
-	 
-%if viewType == "tableViewer"
-	class ViewContentProvider implements IStructuredContentProvider {
-		public void inputChanged(Viewer v, Object oldInput, Object newInput) {
-		}
-		public void dispose() {
-		}
-		public Object[] getElements(Object parent) {
-			return new String[] { "One", "Two", "Three" };
-		}
-	}
-%else
-%  if viewType =="treeViewer"
-	class TreeObject implements IAdaptable {
-		private String name;
-		private TreeParent parent;
-		
-		public TreeObject(String name) {
-			this.name = name;
-		}
-		public String getName() {
-			return name;
-		}
-		public void setParent(TreeParent parent) {
-			this.parent = parent;
-		}
-		public TreeParent getParent() {
-			return parent;
-		}
-		public String toString() {
-			return getName();
-		}
-		public Object getAdapter(Class key) {
-			return null;
-		}
-	}
-	
-	class TreeParent extends TreeObject {
-		private ArrayList children;
-		public TreeParent(String name) {
-			super(name);
-			children = new ArrayList();
-		}
-		public void addChild(TreeObject child) {
-			children.add(child);
-			child.setParent(this);
-		}
-		public void removeChild(TreeObject child) {
-			children.remove(child);
-			child.setParent(null);
-		}
-		public TreeObject [] getChildren() {
-			return (TreeObject [])children.toArray(new TreeObject[children.size()]);
-		}
-		public boolean hasChildren() {
-			return children.size()>0;
-		}
-	}
-
-	class ViewContentProvider implements IStructuredContentProvider, 
-										   ITreeContentProvider {
-		private TreeParent invisibleRoot;
-
-		public void inputChanged(Viewer v, Object oldInput, Object newInput) {
-		}
-		public void dispose() {
-		}
-		public Object[] getElements(Object parent) {
-			if (parent.equals(getViewSite())) {
-				if (invisibleRoot==null) initialize();
-				return getChildren(invisibleRoot);
-			}
-			return getChildren(parent);
-		}
-		public Object getParent(Object child) {
-			if (child instanceof TreeObject) {
-				return ((TreeObject)child).getParent();
-			}
-			return null;
-		}
-		public Object [] getChildren(Object parent) {
-			if (parent instanceof TreeParent) {
-				return ((TreeParent)parent).getChildren();
-			}
-			return new Object[0];
-		}
-		public boolean hasChildren(Object parent) {
-			if (parent instanceof TreeParent)
-				return ((TreeParent)parent).hasChildren();
-			return false;
-		}
-/*
- * We will set up a dummy model to initialize tree heararchy.
- * In a real code, you will connect to a real model and
- * expose its hierarchy.
- */
-		private void initialize() {
-			TreeObject to1 = new TreeObject("Leaf 1");
-			TreeObject to2 = new TreeObject("Leaf 2");
-			TreeObject to3 = new TreeObject("Leaf 3");
-			TreeParent p1 = new TreeParent("Parent 1");
-			p1.addChild(to1);
-			p1.addChild(to2);
-			p1.addChild(to3);
-			
-			TreeObject to4 = new TreeObject("Leaf 4");
-			TreeParent p2 = new TreeParent("Parent 2");
-			p2.addChild(to4);
-			
-			TreeParent root = new TreeParent("Root");
-			root.addChild(p1);
-			root.addChild(p2);
-			
-			invisibleRoot = new TreeParent("");
-			invisibleRoot.addChild(root);
-		}
-	}
-%  endif
-%endif
-%if viewType == "tableViewer"
-	class ViewLabelProvider extends LabelProvider implements ITableLabelProvider {
-		public String getColumnText(Object obj, int index) {
-			return getText(obj);
-		}
-		public Image getColumnImage(Object obj, int index) {
-			return getImage(obj);
-		}
-		public Image getImage(Object obj) {
-			return PlatformUI.getWorkbench().
-					getSharedImages().getImage(ISharedImages.IMG_OBJ_ELEMENT);
-		}
-	}
-%else
-	class ViewLabelProvider extends LabelProvider {
-
-		public String getText(Object obj) {
-			return obj.toString();
-		}
-		public Image getImage(Object obj) {
-			String imageKey = ISharedImages.IMG_OBJ_ELEMENT;
-			if (obj instanceof TreeParent)
-			   imageKey = ISharedImages.IMG_OBJ_FOLDER;
-			return PlatformUI.getWorkbench().getSharedImages().getImage(imageKey);
-		}
-	}
-%endif
-%if sorter
-	class NameSorter extends ViewerSorter {
-	}
-%endif
-
-	/**
-	 * The constructor.
-	 */
-	public $className$() {
-	}
-
-	/**
-	 * This is a callback that will allow us
-	 * to create the viewer and initialize it.
-	 */
-	public void createPartControl(Composite parent) {
-%if viewType =="tableViewer"
-		viewer = new TableViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
-%else
-%  if viewType =="treeViewer"
-		viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
-		drillDownAdapter = new DrillDownAdapter(viewer);
-%  endif
-%endif
-		viewer.setContentProvider(new ViewContentProvider());
-		viewer.setLabelProvider(new ViewLabelProvider());
-%if sorter
-		viewer.setSorter(new NameSorter());
-%endif
-		viewer.setInput(getViewSite());
-%if (localToolbar || localPulldown || popup)
-		makeActions();
-%endif
-%if popup
-		hookContextMenu();
-%endif
-%if doubleClick
-		hookDoubleClickAction();
-%endif
-%if (localToolbar || localPulldown)
-		contributeToActionBars();
-%endif
-	}
-
-%if popup	
-	private void hookContextMenu() {
-		MenuManager menuMgr = new MenuManager("#PopupMenu");
-		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(new IMenuListener() {
-			public void menuAboutToShow(IMenuManager manager) {
-				$className$.this.fillContextMenu(manager);
-			}
-		});
-		Menu menu = menuMgr.createContextMenu(viewer.getControl());
-		viewer.getControl().setMenu(menu);
-		getSite().registerContextMenu(menuMgr, viewer);
-	}
-%endif
-
-%if (localToolbar || localPulldown)	
-	private void contributeToActionBars() {
-		IActionBars bars = getViewSite().getActionBars();
-%if localPulldown
-		fillLocalPullDown(bars.getMenuManager());
-%endif
-%if localToolbar
-		fillLocalToolBar(bars.getToolBarManager());
-%endif
-	}
-%endif
-
-%if localPulldown	
-	private void fillLocalPullDown(IMenuManager manager) {
-		manager.add(action1);
-		manager.add(new Separator());
-		manager.add(action2);
-	}
-%endif
-
-%if popup	
-	private void fillContextMenu(IMenuManager manager) {
-		manager.add(action1);
-		manager.add(action2);
-%   if viewType == "treeViewer"
-		manager.add(new Separator());
-		drillDownAdapter.addNavigationActions(manager);
-%   endif
-		// Other plug-ins can contribute there actions here
-		manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-	}
-%endif
-	
-%if localToolbar
-	private void fillLocalToolBar(IToolBarManager manager) {
-		manager.add(action1);
-		manager.add(action2);
-%   if viewType == "treeViewer"
-		manager.add(new Separator());
-		drillDownAdapter.addNavigationActions(manager);
-%  endif
-	}
-%endif
-
-%if (localToolbar || localPulldown || popup)	
-	private void makeActions() {
-		action1 = new Action() {
-			public void run() {
-				showMessage("Action 1 executed");
-			}
-		};
-		action1.setText("Action 1");
-		action1.setToolTipText("Action 1 tooltip");
-		action1.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().
-			getImageDescriptor(ISharedImages.IMG_OBJS_INFO_TSK));
-		
-		action2 = new Action() {
-			public void run() {
-				showMessage("Action 2 executed");
-			}
-		};
-		action2.setText("Action 2");
-		action2.setToolTipText("Action 2 tooltip");
-		action2.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().
-				getImageDescriptor(ISharedImages.IMG_OBJS_INFO_TSK));
-%   if doubleClick		
-		doubleClickAction = new Action() {
-			public void run() {
-				ISelection selection = viewer.getSelection();
-				Object obj = ((IStructuredSelection)selection).getFirstElement();
-				showMessage("Double-click detected on "+obj.toString());
-			}
-		};
-%   endif
-	}
-%endif
-
-%if doubleClick	
-	private void hookDoubleClickAction() {
-		viewer.addDoubleClickListener(new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent event) {
-				doubleClickAction.run();
-			}
-		});
-	}
-%endif	
-	private void showMessage(String message) {
-		MessageDialog.openInformation(
-			viewer.getControl().getShell(),
-			"$viewName$",
-			message);
-	}
-
-	/**
-	 * Passing the focus request to the viewer's control.
-	 */
-	public void setFocus() {
-		viewer.getControl().setFocus();
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/viewRCP/java/$applicationClass$.java b/ui/org.eclipse.pde.ui/templates_3.0/viewRCP/java/$applicationClass$.java
deleted file mode 100644
index d926eaa..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/viewRCP/java/$applicationClass$.java
+++ /dev/null

@@ -1,27 +0,0 @@
-package $packageName$;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * This class controls all aspects of the application's execution
- */
-public class $applicationClass$ implements IPlatformRunnable {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IPlatformRunnable#run(java.lang.Object)
-	 */
-	public Object run(Object args) throws Exception {
-		Display display = PlatformUI.createDisplay();
-		try {
-			int returnCode = PlatformUI.createAndRunWorkbench(display, new ApplicationWorkbenchAdvisor());
-			if (returnCode == PlatformUI.RETURN_RESTART) {
-				return IPlatformRunnable.EXIT_RESTART;
-			}
-			return IPlatformRunnable.EXIT_OK;
-		} finally {
-			display.dispose();
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/viewRCP/java/ApplicationWorkbenchAdvisor.java b/ui/org.eclipse.pde.ui/templates_3.0/viewRCP/java/ApplicationWorkbenchAdvisor.java
deleted file mode 100644
index 45ab28e..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/viewRCP/java/ApplicationWorkbenchAdvisor.java
+++ /dev/null

@@ -1,53 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.action.GroupMarker;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.application.IActionBarConfigurer;
-import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
-import org.eclipse.ui.application.WorkbenchAdvisor;
-
-public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
-	
-	private static final String PERSPECTIVE_ID = "$pluginId$.perspective";
-
-	public String getInitialWindowPerspectiveId() {
-		return PERSPECTIVE_ID;
-	}
-
-	public void preWindowOpen(IWorkbenchWindowConfigurer configurer) {
-		configurer.setInitialSize(new Point(400, 300));
-		configurer.setShowCoolBar(false);
-		configurer.setShowStatusLine(false);
-		configurer.setTitle("$windowTitle$");
-	}
-
-	public void fillActionBars(IWorkbenchWindow window,
-			IActionBarConfigurer configurer, int flags) {
-		super.fillActionBars(window, configurer, flags);
-		if ((flags & FILL_MENU_BAR) != 0) {
-			fillMenuBar(window, configurer);
-		}
-	}
-
-	private void fillMenuBar(IWorkbenchWindow window,
-			IActionBarConfigurer configurer) {
-		IMenuManager menuBar = configurer.getMenuManager();
-		menuBar.add(createFileMenu(window));
-	}
-
-	private MenuManager createFileMenu(IWorkbenchWindow window) {
-		MenuManager menu = new MenuManager("File", //$NON-NLS-1$
-				IWorkbenchActionConstants.M_FILE);
-		menu.add(new GroupMarker(IWorkbenchActionConstants.FILE_START));
-		menu.add(new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS));
-		menu.add(ActionFactory.QUIT.create(window));
-		menu.add(new GroupMarker(IWorkbenchActionConstants.FILE_END));
-		return menu;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/viewRCP/java/Perspective.java b/ui/org.eclipse.pde.ui/templates_3.0/viewRCP/java/Perspective.java
deleted file mode 100644
index 4d16ecf..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/viewRCP/java/Perspective.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package $packageName$;
-
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IPerspectiveFactory;
-
-public class Perspective implements IPerspectiveFactory {
-
-	public void createInitialLayout(IPageLayout layout) {
-		String editorArea = layout.getEditorArea();
-		layout.setEditorAreaVisible(false);
-		layout.setFixed(true);
-		
-		layout.addStandaloneView(View.ID,  false, IPageLayout.LEFT, 1.0f, editorArea);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.0/viewRCP/java/View.java b/ui/org.eclipse.pde.ui/templates_3.0/viewRCP/java/View.java
deleted file mode 100644
index 8a70946..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.0/viewRCP/java/View.java
+++ /dev/null

@@ -1,73 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.ViewPart;
-
-public class View extends ViewPart {
-	public static final String ID = "$pluginId$.view";
-
-	private TableViewer viewer;
-
-	/**
-	 * The content provider class is responsible for providing objects to the
-	 * view. It can wrap existing objects in adapters or simply return objects
-	 * as-is. These objects may be sensitive to the current input of the view,
-	 * or ignore it and always show the same content (like Task List, for
-	 * example).
-	 */
-	class ViewContentProvider implements IStructuredContentProvider {
-		public void inputChanged(Viewer v, Object oldInput, Object newInput) {
-		}
-
-		public void dispose() {
-		}
-
-		public Object[] getElements(Object parent) {
-			return new String[] { "One", "Two", "Three" };
-		}
-	}
-
-	class ViewLabelProvider extends LabelProvider implements
-			ITableLabelProvider {
-		public String getColumnText(Object obj, int index) {
-			return getText(obj);
-		}
-
-		public Image getColumnImage(Object obj, int index) {
-			return getImage(obj);
-		}
-
-		public Image getImage(Object obj) {
-			return PlatformUI.getWorkbench().getSharedImages().getImage(
-					ISharedImages.IMG_OBJ_ELEMENT);
-		}
-	}
-
-	/**
-	 * This is a callback that will allow us to create the viewer and initialize
-	 * it.
-	 */
-	public void createPartControl(Composite parent) {
-		viewer = new TableViewer(parent, SWT.MULTI | SWT.H_SCROLL
-				| SWT.V_SCROLL);
-		viewer.setContentProvider(new ViewContentProvider());
-		viewer.setLabelProvider(new ViewLabelProvider());
-		viewer.setInput(getViewSite());
-	}
-
-	/**
-	 * Passing the focus request to the viewer's control.
-	 */
-	public void setFocus() {
-		viewer.getControl().setFocus();
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/editor/bin/icons/sample.gif b/ui/org.eclipse.pde.ui/templates_3.1/editor/bin/icons/sample.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/editor/bin/icons/sample.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/editor/java/$editorClass$.java b/ui/org.eclipse.pde.ui/templates_3.1/editor/java/$editorClass$.java
deleted file mode 100644
index d248dae..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/editor/java/$editorClass$.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package $packageName$;
-
-import org.eclipse.ui.editors.text.TextEditor;
-
-public class $editorClass$ extends TextEditor {
-
-	private ColorManager colorManager;
-
-	public $editorClass$() {
-		super();
-		colorManager = new ColorManager();
-		setSourceViewerConfiguration(new XMLConfiguration(colorManager));
-		setDocumentProvider(new XMLDocumentProvider());
-	}
-	public void dispose() {
-		colorManager.dispose();
-		super.dispose();
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/editor/java/ColorManager.java b/ui/org.eclipse.pde.ui/templates_3.1/editor/java/ColorManager.java
deleted file mode 100644
index f98c700..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/editor/java/ColorManager.java
+++ /dev/null

@@ -1,28 +0,0 @@
-package $packageName$;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Display;
-
-public class ColorManager {
-
-	protected Map fColorTable = new HashMap(10);
-
-	public void dispose() {
-		Iterator e = fColorTable.values().iterator();
-		while (e.hasNext())
-			 ((Color) e.next()).dispose();
-	}
-	public Color getColor(RGB rgb) {
-		Color color = (Color) fColorTable.get(rgb);
-		if (color == null) {
-			color = new Color(Display.getCurrent(), rgb);
-			fColorTable.put(rgb, color);
-		}
-		return color;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/editor/java/IXMLColorConstants.java b/ui/org.eclipse.pde.ui/templates_3.1/editor/java/IXMLColorConstants.java
deleted file mode 100644
index 8425b44..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/editor/java/IXMLColorConstants.java
+++ /dev/null

@@ -1,11 +0,0 @@
-package $packageName$;
-
-import org.eclipse.swt.graphics.RGB;
-
-public interface IXMLColorConstants {
-	RGB XML_COMMENT = new RGB(128, 0, 0);
-	RGB PROC_INSTR = new RGB(128, 128, 128);
-	RGB STRING = new RGB(0, 128, 0);
-	RGB DEFAULT = new RGB(0, 0, 0);
-	RGB TAG = new RGB(0, 0, 128);
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/editor/java/NonRuleBasedDamagerRepairer.java b/ui/org.eclipse.pde.ui/templates_3.1/editor/java/NonRuleBasedDamagerRepairer.java
deleted file mode 100644
index 2a90346..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/editor/java/NonRuleBasedDamagerRepairer.java
+++ /dev/null

@@ -1,138 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.text.BadLocationException;
-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.presentation.IPresentationDamager;
-import org.eclipse.jface.text.presentation.IPresentationRepairer;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.swt.custom.StyleRange;
-
-public class NonRuleBasedDamagerRepairer
-	implements IPresentationDamager, IPresentationRepairer {
-
-	/** The document this object works on */
-	protected IDocument fDocument;
-	/** The default text attribute if non is returned as data by the current token */
-	protected TextAttribute fDefaultTextAttribute;
-	
-	/**
-	 * Constructor for NonRuleBasedDamagerRepairer.
-	 */
-	public NonRuleBasedDamagerRepairer(TextAttribute defaultTextAttribute) {
-		Assert.isNotNull(defaultTextAttribute);
-
-		fDefaultTextAttribute = defaultTextAttribute;
-	}
-
-	/**
-	 * @see IPresentationRepairer#setDocument(IDocument)
-	 */
-	public void setDocument(IDocument document) {
-		fDocument = document;
-	}
-
-	/**
-	 * Returns the end offset of the line that contains the specified offset or
-	 * if the offset is inside a line delimiter, the end offset of the next line.
-	 *
-	 * @param offset the offset whose line end offset must be computed
-	 * @return the line end offset for the given offset
-	 * @exception BadLocationException if offset is invalid in the current document
-	 */
-	protected int endOfLineOf(int offset) throws BadLocationException {
-
-		IRegion info = fDocument.getLineInformationOfOffset(offset);
-		if (offset <= info.getOffset() + info.getLength())
-			return info.getOffset() + info.getLength();
-
-		int line = fDocument.getLineOfOffset(offset);
-		try {
-			info = fDocument.getLineInformation(line + 1);
-			return info.getOffset() + info.getLength();
-		} catch (BadLocationException x) {
-			return fDocument.getLength();
-		}
-	}
-
-	/**
-	 * @see IPresentationDamager#getDamageRegion(ITypedRegion, DocumentEvent, boolean)
-	 */
-	public IRegion getDamageRegion(
-		ITypedRegion partition,
-		DocumentEvent event,
-		boolean documentPartitioningChanged) {
-		if (!documentPartitioningChanged) {
-			try {
-
-				IRegion info =
-					fDocument.getLineInformationOfOffset(event.getOffset());
-				int start = Math.max(partition.getOffset(), info.getOffset());
-
-				int end =
-					event.getOffset()
-						+ (event.getText() == null
-							? event.getLength()
-							: event.getText().length());
-
-				if (info.getOffset() <= end
-					&& end <= info.getOffset() + info.getLength()) {
-					// optimize the case of the same line
-					end = info.getOffset() + info.getLength();
-				} else
-					end = endOfLineOf(end);
-
-				end =
-					Math.min(
-						partition.getOffset() + partition.getLength(),
-						end);
-				return new Region(start, end - start);
-
-			} catch (BadLocationException x) {
-			}
-		}
-
-		return partition;
-	}
-
-	/**
-	 * @see IPresentationRepairer#createPresentation(TextPresentation, ITypedRegion)
-	 */
-	public void createPresentation(
-		TextPresentation presentation,
-		ITypedRegion region) {
-		addRange(
-			presentation,
-			region.getOffset(),
-			region.getLength(),
-			fDefaultTextAttribute);
-	}
-
-	/**
-	 * Adds style information to the given text presentation.
-	 *
-	 * @param presentation the text presentation to be extended
-	 * @param offset the offset of the range to be styled
-	 * @param length the length of the range to be styled
-	 * @param attr the attribute describing the style of the range to be styled
-	 */
-	protected void addRange(
-		TextPresentation presentation,
-		int offset,
-		int length,
-		TextAttribute attr) {
-		if (attr != null)
-			presentation.addStyleRange(
-				new StyleRange(
-					offset,
-					length,
-					attr.getForeground(),
-					attr.getBackground(),
-					attr.getStyle()));
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/editor/java/TagRule.java b/ui/org.eclipse.pde.ui/templates_3.1/editor/java/TagRule.java
deleted file mode 100644
index a9efd22..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/editor/java/TagRule.java
+++ /dev/null

@@ -1,31 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.text.rules.*;
-
-public class TagRule extends MultiLineRule {
-
-	public TagRule(IToken token) {
-		super("<", ">", token);
-	}
-	protected boolean sequenceDetected(
-		ICharacterScanner scanner,
-		char[] sequence,
-		boolean eofAllowed) {
-		int c = scanner.read();
-		if (sequence[0] == '<') {
-			if (c == '?') {
-				// processing instruction - abort
-				scanner.unread();
-				return false;
-			}
-			if (c == '!') {
-				scanner.unread();
-				// comment - abort
-				return false;
-			}
-		} else if (sequence[0] == '>') {
-			scanner.unread();
-		}
-		return super.sequenceDetected(scanner, sequence, eofAllowed);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/editor/java/XMLConfiguration.java b/ui/org.eclipse.pde.ui/templates_3.1/editor/java/XMLConfiguration.java
deleted file mode 100644
index 31d0c0c..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/editor/java/XMLConfiguration.java
+++ /dev/null

@@ -1,79 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextDoubleClickStrategy;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.jface.text.presentation.IPresentationReconciler;
-import org.eclipse.jface.text.presentation.PresentationReconciler;
-import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
-import org.eclipse.jface.text.rules.Token;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.text.source.SourceViewerConfiguration;
-
-public class XMLConfiguration extends SourceViewerConfiguration {
-	private XMLDoubleClickStrategy doubleClickStrategy;
-	private XMLTagScanner tagScanner;
-	private XMLScanner scanner;
-	private ColorManager colorManager;
-
-	public XMLConfiguration(ColorManager colorManager) {
-		this.colorManager = colorManager;
-	}
-	public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
-		return new String[] {
-			IDocument.DEFAULT_CONTENT_TYPE,
-			XMLPartitionScanner.XML_COMMENT,
-			XMLPartitionScanner.XML_TAG };
-	}
-	public ITextDoubleClickStrategy getDoubleClickStrategy(
-		ISourceViewer sourceViewer,
-		String contentType) {
-		if (doubleClickStrategy == null)
-			doubleClickStrategy = new XMLDoubleClickStrategy();
-		return doubleClickStrategy;
-	}
-
-	protected XMLScanner getXMLScanner() {
-		if (scanner == null) {
-			scanner = new XMLScanner(colorManager);
-			scanner.setDefaultReturnToken(
-				new Token(
-					new TextAttribute(
-						colorManager.getColor(IXMLColorConstants.DEFAULT))));
-		}
-		return scanner;
-	}
-	protected XMLTagScanner getXMLTagScanner() {
-		if (tagScanner == null) {
-			tagScanner = new XMLTagScanner(colorManager);
-			tagScanner.setDefaultReturnToken(
-				new Token(
-					new TextAttribute(
-						colorManager.getColor(IXMLColorConstants.TAG))));
-		}
-		return tagScanner;
-	}
-
-	public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) {
-		PresentationReconciler reconciler = new PresentationReconciler();
-
-		DefaultDamagerRepairer dr =
-			new DefaultDamagerRepairer(getXMLTagScanner());
-		reconciler.setDamager(dr, XMLPartitionScanner.XML_TAG);
-		reconciler.setRepairer(dr, XMLPartitionScanner.XML_TAG);
-
-		dr = new DefaultDamagerRepairer(getXMLScanner());
-		reconciler.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE);
-		reconciler.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);
-
-		NonRuleBasedDamagerRepairer ndr =
-			new NonRuleBasedDamagerRepairer(
-				new TextAttribute(
-					colorManager.getColor(IXMLColorConstants.XML_COMMENT)));
-		reconciler.setDamager(ndr, XMLPartitionScanner.XML_COMMENT);
-		reconciler.setRepairer(ndr, XMLPartitionScanner.XML_COMMENT);
-
-		return reconciler;
-	}
-
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/editor/java/XMLDocumentProvider.java b/ui/org.eclipse.pde.ui/templates_3.1/editor/java/XMLDocumentProvider.java
deleted file mode 100644
index 9536ecf..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/editor/java/XMLDocumentProvider.java
+++ /dev/null

@@ -1,25 +0,0 @@
-package $packageName$;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.rules.FastPartitioner;
-import org.eclipse.ui.editors.text.FileDocumentProvider;
-
-public class XMLDocumentProvider extends FileDocumentProvider {
-
-	protected IDocument createDocument(Object element) throws CoreException {
-		IDocument document = super.createDocument(element);
-		if (document != null) {
-			IDocumentPartitioner partitioner =
-				new FastPartitioner(
-					new XMLPartitionScanner(),
-					new String[] {
-						XMLPartitionScanner.XML_TAG,
-						XMLPartitionScanner.XML_COMMENT });
-			partitioner.connect(document);
-			document.setDocumentPartitioner(partitioner);
-		}
-		return document;
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/editor/java/XMLDoubleClickStrategy.java b/ui/org.eclipse.pde.ui/templates_3.1/editor/java/XMLDoubleClickStrategy.java
deleted file mode 100644
index bc901f7..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/editor/java/XMLDoubleClickStrategy.java
+++ /dev/null

@@ -1,112 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.text.*;
-
-public class XMLDoubleClickStrategy implements ITextDoubleClickStrategy {
-	protected ITextViewer fText;
-
-	public void doubleClicked(ITextViewer part) {
-		int pos = part.getSelectedRange().x;
-
-		if (pos < 0)
-			return;
-
-		fText = part;
-
-		if (!selectComment(pos)) {
-			selectWord(pos);
-		}
-	}
-	protected boolean selectComment(int caretPos) {
-		IDocument doc = fText.getDocument();
-		int startPos, endPos;
-
-		try {
-			int pos = caretPos;
-			char c = ' ';
-
-			while (pos >= 0) {
-				c = doc.getChar(pos);
-				if (c == '\\') {
-					pos -= 2;
-					continue;
-				}
-				if (c == Character.LINE_SEPARATOR || c == '\"')
-					break;
-				--pos;
-			}
-
-			if (c != '\"')
-				return false;
-
-			startPos = pos;
-
-			pos = caretPos;
-			int length = doc.getLength();
-			c = ' ';
-
-			while (pos < length) {
-				c = doc.getChar(pos);
-				if (c == Character.LINE_SEPARATOR || c == '\"')
-					break;
-				++pos;
-			}
-			if (c != '\"')
-				return false;
-
-			endPos = pos;
-
-			int offset = startPos + 1;
-			int len = endPos - offset;
-			fText.setSelectedRange(offset, len);
-			return true;
-		} catch (BadLocationException x) {
-		}
-
-		return false;
-	}
-	protected boolean selectWord(int caretPos) {
-
-		IDocument doc = fText.getDocument();
-		int startPos, endPos;
-
-		try {
-
-			int pos = caretPos;
-			char c;
-
-			while (pos >= 0) {
-				c = doc.getChar(pos);
-				if (!Character.isJavaIdentifierPart(c))
-					break;
-				--pos;
-			}
-
-			startPos = pos;
-
-			pos = caretPos;
-			int length = doc.getLength();
-
-			while (pos < length) {
-				c = doc.getChar(pos);
-				if (!Character.isJavaIdentifierPart(c))
-					break;
-				++pos;
-			}
-
-			endPos = pos;
-			selectRange(startPos, endPos);
-			return true;
-
-		} catch (BadLocationException x) {
-		}
-
-		return false;
-	}
-
-	private void selectRange(int startPos, int stopPos) {
-		int offset = startPos + 1;
-		int length = stopPos - offset;
-		fText.setSelectedRange(offset, length);
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/editor/java/XMLPartitionScanner.java b/ui/org.eclipse.pde.ui/templates_3.1/editor/java/XMLPartitionScanner.java
deleted file mode 100644
index bbd1ef4..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/editor/java/XMLPartitionScanner.java
+++ /dev/null

@@ -1,22 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.text.rules.*;
-
-public class XMLPartitionScanner extends RuleBasedPartitionScanner {
-	public final static String XML_DEFAULT = "__xml_default";
-	public final static String XML_COMMENT = "__xml_comment";
-	public final static String XML_TAG = "__xml_tag";
-
-	public XMLPartitionScanner() {
-
-		IToken xmlComment = new Token(XML_COMMENT);
-		IToken tag = new Token(XML_TAG);
-
-		IPredicateRule[] rules = new IPredicateRule[2];
-
-		rules[0] = new MultiLineRule("<!--", "-->", xmlComment);
-		rules[1] = new TagRule(tag);
-
-		setPredicateRules(rules);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/editor/java/XMLScanner.java b/ui/org.eclipse.pde.ui/templates_3.1/editor/java/XMLScanner.java
deleted file mode 100644
index c0a2bc2..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/editor/java/XMLScanner.java
+++ /dev/null

@@ -1,22 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.text.rules.*;
-import org.eclipse.jface.text.*;
-
-public class XMLScanner extends RuleBasedScanner {
-
-	public XMLScanner(ColorManager manager) {
-		IToken procInstr =
-			new Token(
-				new TextAttribute(
-					manager.getColor(IXMLColorConstants.PROC_INSTR)));
-
-		IRule[] rules = new IRule[2];
-		//Add rule for processing instructions
-		rules[0] = new SingleLineRule("<?", "?>", procInstr);
-		// Add generic whitespace rule.
-		rules[1] = new WhitespaceRule(new XMLWhitespaceDetector());
-
-		setRules(rules);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/editor/java/XMLTagScanner.java b/ui/org.eclipse.pde.ui/templates_3.1/editor/java/XMLTagScanner.java
deleted file mode 100644
index 109a6ee..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/editor/java/XMLTagScanner.java
+++ /dev/null

@@ -1,24 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.text.*;
-import org.eclipse.jface.text.rules.*;
-
-public class XMLTagScanner extends RuleBasedScanner {
-
-	public XMLTagScanner(ColorManager manager) {
-		IToken string =
-			new Token(
-				new TextAttribute(manager.getColor(IXMLColorConstants.STRING)));
-
-		IRule[] rules = new IRule[3];
-
-		// Add rule for double quotes
-		rules[0] = new SingleLineRule("\"", "\"", string, '\\');
-		// Add a rule for single quotes
-		rules[1] = new SingleLineRule("'", "'", string, '\\');
-		// Add generic whitespace rule.
-		rules[2] = new WhitespaceRule(new XMLWhitespaceDetector());
-
-		setRules(rules);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/editor/java/XMLWhitespaceDetector.java b/ui/org.eclipse.pde.ui/templates_3.1/editor/java/XMLWhitespaceDetector.java
deleted file mode 100644
index 3faa92a..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/editor/java/XMLWhitespaceDetector.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.text.rules.IWhitespaceDetector;
-
-public class XMLWhitespaceDetector implements IWhitespaceDetector {
-
-	public boolean isWhitespace(char c) {
-		return (c == ' ' || c == '\t' || c == '\n' || c == '\r');
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/helloRCP/java/$applicationClass$.java b/ui/org.eclipse.pde.ui/templates_3.1/helloRCP/java/$applicationClass$.java
deleted file mode 100644
index d926eaa..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/helloRCP/java/$applicationClass$.java
+++ /dev/null

@@ -1,27 +0,0 @@
-package $packageName$;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * This class controls all aspects of the application's execution
- */
-public class $applicationClass$ implements IPlatformRunnable {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IPlatformRunnable#run(java.lang.Object)
-	 */
-	public Object run(Object args) throws Exception {
-		Display display = PlatformUI.createDisplay();
-		try {
-			int returnCode = PlatformUI.createAndRunWorkbench(display, new ApplicationWorkbenchAdvisor());
-			if (returnCode == PlatformUI.RETURN_RESTART) {
-				return IPlatformRunnable.EXIT_RESTART;
-			}
-			return IPlatformRunnable.EXIT_OK;
-		} finally {
-			display.dispose();
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/helloRCP/java/ApplicationActionBarAdvisor.java b/ui/org.eclipse.pde.ui/templates_3.1/helloRCP/java/ApplicationActionBarAdvisor.java
deleted file mode 100644
index 91c7c98..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/helloRCP/java/ApplicationActionBarAdvisor.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.application.ActionBarAdvisor;
-import org.eclipse.ui.application.IActionBarConfigurer;
-
-public class ApplicationActionBarAdvisor extends ActionBarAdvisor {
-
-    public ApplicationActionBarAdvisor(IActionBarConfigurer configurer) {
-        super(configurer);
-    }
-
-    protected void makeActions(IWorkbenchWindow window) {
-    }
-
-    protected void fillMenuBar(IMenuManager menuBar) {
-    }
-    
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/helloRCP/java/ApplicationWorkbenchAdvisor.java b/ui/org.eclipse.pde.ui/templates_3.1/helloRCP/java/ApplicationWorkbenchAdvisor.java
deleted file mode 100644
index d257049..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/helloRCP/java/ApplicationWorkbenchAdvisor.java
+++ /dev/null

@@ -1,18 +0,0 @@
-package $packageName$;
-
-import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
-import org.eclipse.ui.application.WorkbenchAdvisor;
-import org.eclipse.ui.application.WorkbenchWindowAdvisor;
-
-public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
-
-	private static final String PERSPECTIVE_ID = "$pluginId$.perspective";
-
-    public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) {
-        return new ApplicationWorkbenchWindowAdvisor(configurer);
-    }
-
-	public String getInitialWindowPerspectiveId() {
-		return PERSPECTIVE_ID;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/helloRCP/java/ApplicationWorkbenchWindowAdvisor.java b/ui/org.eclipse.pde.ui/templates_3.1/helloRCP/java/ApplicationWorkbenchWindowAdvisor.java
deleted file mode 100644
index f06f848..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/helloRCP/java/ApplicationWorkbenchWindowAdvisor.java
+++ /dev/null

@@ -1,26 +0,0 @@
-package $packageName$;
-
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.ui.application.ActionBarAdvisor;
-import org.eclipse.ui.application.IActionBarConfigurer;
-import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
-import org.eclipse.ui.application.WorkbenchWindowAdvisor;
-
-public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
-
-    public ApplicationWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) {
-        super(configurer);
-    }
-
-    public ActionBarAdvisor createActionBarAdvisor(IActionBarConfigurer configurer) {
-        return new ApplicationActionBarAdvisor(configurer);
-    }
-    
-    public void preWindowOpen() {
-        IWorkbenchWindowConfigurer configurer = getWindowConfigurer();
-        configurer.setInitialSize(new Point(400, 300));
-        configurer.setShowCoolBar(false);
-        configurer.setShowStatusLine(false);
-        configurer.setTitle("$windowTitle$");
-    }
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/helloRCP/java/Perspective.java b/ui/org.eclipse.pde.ui/templates_3.1/helloRCP/java/Perspective.java
deleted file mode 100644
index b38d535..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/helloRCP/java/Perspective.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package $packageName$;
-
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IPerspectiveFactory;
-
-public class Perspective implements IPerspectiveFactory {
-
-	public void createInitialLayout(IPageLayout layout) {
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/intro/bin/content/link_obj.gif b/ui/org.eclipse.pde.ui/templates_3.1/intro/bin/content/link_obj.gif
deleted file mode 100644
index a4b0788..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/intro/bin/content/link_obj.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/intro/bin/content/titlebanner.gif b/ui/org.eclipse.pde.ui/templates_3.1/intro/bin/content/titlebanner.gif
deleted file mode 100644
index 6737f76..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/intro/bin/content/titlebanner.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/intro/bin/splash.bmp b/ui/org.eclipse.pde.ui/templates_3.1/intro/bin/splash.bmp
deleted file mode 100644
index 99ea60d..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/intro/bin/splash.bmp
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/intro/content/concept1.xhtml b/ui/org.eclipse.pde.ui/templates_3.1/intro/content/concept1.xhtml
deleted file mode 100644
index 839c9f8..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/intro/content/concept1.xhtml
+++ /dev/null

@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>Concept1.xhtml</title>
-  <link rel="stylesheet" href="shared.css" type="text/css" />	
-  </head>
-
-<body>
-<h1>Welcome to $productName$</h1>
-<h4>Concept One</h4>
-<p>This is where Concept One is explained.</p>
-</body>
-</html>

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/intro/content/concept2.xhtml b/ui/org.eclipse.pde.ui/templates_3.1/intro/content/concept2.xhtml
deleted file mode 100644
index aab6830..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/intro/content/concept2.xhtml
+++ /dev/null

@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>Concept2.xhtml</title>
-  <link rel="stylesheet" href="shared.css" type="text/css" />
-  </head>
-
-<body>
-<h1>Welcome to $productName$</h1>
-<h4>Concept Two</h4>
-<p>This is where Concept Two is explained.</p>
-</body>
-</html>

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/intro/content/concept3.xhtml b/ui/org.eclipse.pde.ui/templates_3.1/intro/content/concept3.xhtml
deleted file mode 100644
index c27f382..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/intro/content/concept3.xhtml
+++ /dev/null

@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>Concept2.xhtml</title>
-  <link rel="stylesheet" href="shared.css" type="text/css" />
-  </head>
-
-<body>
-<h1>Welcome to $productName$</h1>
-<h4>Concept Three</h4>
-<p>This is where Concept Three is explained. </p> 
-<p>This is the first topic from the Root page of this Welcome:
-
-<!-- This is where we use the Intro include element. This include specifies that we need 
-to grab an XHTML element with id "firstH4" from an intro page with id "root". --> 
-<include path="root/firstLink" />
-<br />
-<!-- This is where we use the Intro dynamicContent element. The class is loaded from the specified plugin. --> 
-<contentProvider id="contentProviderId" class="$packageName$.DynamicContentProvider" pluginId="$pluginId$"> 
-</contentProvider> 
-</p>
-
-
-<p>&nbsp;</p>
-<p align="justify">(This page demonstrates how to contribute to an existing Welcome. 
-It was contributed using the <code>org.eclipse.ui.intro.configExtension</code> 
-extension point. It also 
-demonstrates how to use the <code>include</code> and the <code>dynamicContent</code> intro elements to 
-include external XHTML content and to create dynamic XHTML content, 
-respectively. Check the XHTML source for this page for usage of intro elements.) </p> 
-
-</body>
-</html>

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/intro/content/extContent.xhtml b/ui/org.eclipse.pde.ui/templates_3.1/intro/content/extContent.xhtml
deleted file mode 100644
index 80a9665..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/intro/content/extContent.xhtml
+++ /dev/null

@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>root.xhtml</title>
-  <link rel="stylesheet" href="root.css" type="text/css" />
-  </head>
-
-<body>
-<a href="http://org.eclipse.ui.intro/showPage?id=concept3">
-	<img border="0" src="link_obj.gif" alt="Concept3" />
-	Learn about Concept Three...</a>
-</body>
-</html>

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/intro/content/root.css b/ui/org.eclipse.pde.ui/templates_3.1/intro/content/root.css
deleted file mode 100644
index f25a1fc..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/intro/content/root.css
+++ /dev/null

@@ -1,28 +0,0 @@
-img {
-	width: 48px;
-	height: 48px;
-	vertical-align: middle;
-	}
-
-/* Give some space for main div.*/	
-.page-style {
-	text-align: center;
-	margin-top:100px;
-	}
-	
-/* satisfy Mozilla */	
-body > div.page-style {
-	padding-left:30%;
-	}
-
-
-#content {
-	text-align:left;
-	width:23em;
-	} 
-
-
-
-
-		
-

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/intro/content/root.xhtml b/ui/org.eclipse.pde.ui/templates_3.1/intro/content/root.xhtml
deleted file mode 100644
index 182f2cd..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/intro/content/root.xhtml
+++ /dev/null

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>root.xhtml</title>
-  <link rel="stylesheet" href="shared.css" type="text/css" />
-  <link rel="stylesheet" href="root.css" type="text/css" />
-  </head>
-
-<body> 
-<h1>Welcome to $productName$</h1>
-<div class="page-style">
-  <div id="content"> 	
-	
-		<a href="http://org.eclipse.ui.intro/showPage?id=concept1" id="firstLink">
-			<img border="0" src="link_obj.gif" alt="Concept1" />
-			Learn about Concept One... 
-		</a>
-	
-		<a href="http://org.eclipse.ui.intro/showPage?id=concept2">
-			<img border="0" src="link_obj.gif" alt="Concept2" />
-			Learn about Concept Two...</a>
-	<anchor id="anchor1" /> 
-  </div> 
-</div>
-</body>
-</html>

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/intro/content/shared.css b/ui/org.eclipse.pde.ui/templates_3.1/intro/content/shared.css
deleted file mode 100644
index 8a05736..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/intro/content/shared.css
+++ /dev/null

@@ -1,45 +0,0 @@
-/* Shared style applied to all pages */

-/* trick to get desired scroll bar behavior on all browsers */ 

-html {

-	overflow:auto;

-	border:0px;

-	height:100%;

-	}

-

-	

-body {	

-	margin-left:14px;

-	margin-top:10px;

-	font-family:Tahoma;

-	font-size: 12px;

-	color:#000000;

-	background-image:url("./titlebanner.gif");

-	background-repeat: repeat-x;

-	} 

-	

-h1 {

-	text-align:left;

-	font-size: 16pt;

-	font-weight:normal;

-	color:#E5E5E5;

-	} 

-

-h4 {

-	color:#787878;

-	}	

-	

-a {

-	display:block;

-	font-family:Tahoma;

-	font-size: 12px;

-	color:#000000;

-	font-weight:normal;

-	text-decoration:none;

-	padding-bottom:20px;

-	}

-	

-p {

-	padding-left:14px;

-	}

-	

-


diff --git a/ui/org.eclipse.pde.ui/templates_3.1/intro/ext.xml b/ui/org.eclipse.pde.ui/templates_3.1/intro/ext.xml
deleted file mode 100644
index d08a22a..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/intro/ext.xml
+++ /dev/null

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<introContent>
-  <extensionContent content="content/extContent.xhtml" path="root/anchor1" />
-  <page id="concept3" content="content/concept3.xhtml"/>
-</introContent>

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/intro/introContent.xml b/ui/org.eclipse.pde.ui/templates_3.1/intro/introContent.xml
deleted file mode 100644
index c5dff2d..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/intro/introContent.xml
+++ /dev/null

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<introContent>
-    <page id="root" content="content/root.xhtml"/>
-    <page id="concept1" content="content/concept1.xhtml"/>
-    <page id="concept2" content="content/concept2.xhtml"/>
-</introContent>

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/intro/java/Application.java b/ui/org.eclipse.pde.ui/templates_3.1/intro/java/Application.java
deleted file mode 100644
index 33a205c..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/intro/java/Application.java
+++ /dev/null

@@ -1,27 +0,0 @@
-package $packageName$;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * This class controls all aspects of the application's execution
- */
-public class Application implements IPlatformRunnable {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IPlatformRunnable#run(java.lang.Object)
-	 */
-	public Object run(Object args) throws Exception {
-		Display display = PlatformUI.createDisplay();
-		try {
-			int returnCode = PlatformUI.createAndRunWorkbench(display, new ApplicationWorkbenchAdvisor());
-			if (returnCode == PlatformUI.RETURN_RESTART) {
-				return IPlatformRunnable.EXIT_RESTART;
-			}
-			return IPlatformRunnable.EXIT_OK;
-		} finally {
-			display.dispose();
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/intro/java/ApplicationActionBarAdvisor.java b/ui/org.eclipse.pde.ui/templates_3.1/intro/java/ApplicationActionBarAdvisor.java
deleted file mode 100644
index 475c67b..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/intro/java/ApplicationActionBarAdvisor.java
+++ /dev/null

@@ -1,34 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
-import org.eclipse.ui.application.ActionBarAdvisor;
-import org.eclipse.ui.application.IActionBarConfigurer;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.IWorkbenchWindow;
-
-public class ApplicationActionBarAdvisor extends ActionBarAdvisor {
-
-    private IWorkbenchAction introAction;
-    
-	public ApplicationActionBarAdvisor(IActionBarConfigurer configurer) {
-		super(configurer);
-	}
-
-	protected void makeActions(IWorkbenchWindow window) {
-		introAction = ActionFactory.INTRO.create(window);
-		register(introAction);
-	}
-
-	protected void fillMenuBar(IMenuManager menuBar) {
-		
-		MenuManager helpMenu = new MenuManager("&Help", IWorkbenchActionConstants.M_HELP);
-		menuBar.add(helpMenu);
-
-		// Help
-		helpMenu.add(introAction);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/intro/java/ApplicationWorkbenchAdvisor.java b/ui/org.eclipse.pde.ui/templates_3.1/intro/java/ApplicationWorkbenchAdvisor.java
deleted file mode 100644
index f29f957..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/intro/java/ApplicationWorkbenchAdvisor.java
+++ /dev/null

@@ -1,24 +0,0 @@
-package $packageName$;
-
-import org.eclipse.ui.application.IWorkbenchConfigurer;
-import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
-import org.eclipse.ui.application.WorkbenchAdvisor;
-import org.eclipse.ui.application.WorkbenchWindowAdvisor;
-
-public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
-
-	private static final String PERSPECTIVE_ID = "$pluginId$.perspective";
-
-    public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) {
-        return new ApplicationWorkbenchWindowAdvisor(configurer);
-    }
-    
-    public void initialize(IWorkbenchConfigurer configurer) {
-        super.initialize(configurer);
-        configurer.setSaveAndRestore(true);
-    }
-
-	public String getInitialWindowPerspectiveId() {
-		return PERSPECTIVE_ID;
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/intro/java/ApplicationWorkbenchWindowAdvisor.java b/ui/org.eclipse.pde.ui/templates_3.1/intro/java/ApplicationWorkbenchWindowAdvisor.java
deleted file mode 100644
index 65072fe..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/intro/java/ApplicationWorkbenchWindowAdvisor.java
+++ /dev/null

@@ -1,26 +0,0 @@
-package $packageName$;
-
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.ui.application.ActionBarAdvisor;
-import org.eclipse.ui.application.IActionBarConfigurer;
-import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
-import org.eclipse.ui.application.WorkbenchWindowAdvisor;
-
-public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
-
-    public ApplicationWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) {
-        super(configurer);
-    }
-
-    public ActionBarAdvisor createActionBarAdvisor(IActionBarConfigurer configurer) {
-        return new ApplicationActionBarAdvisor(configurer);
-    }
-    
-    public void preWindowOpen() {
-        IWorkbenchWindowConfigurer configurer = getWindowConfigurer();
-        configurer.setInitialSize(new Point(700, 550));
-        configurer.setShowCoolBar(false);
-        configurer.setShowStatusLine(false);
-        configurer.setTitle("$productName$");
-    }
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/intro/java/DynamicContentProvider.java b/ui/org.eclipse.pde.ui/templates_3.1/intro/java/DynamicContentProvider.java
deleted file mode 100644
index d2b442a..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/intro/java/DynamicContentProvider.java
+++ /dev/null

@@ -1,50 +0,0 @@
-package $packageName$;
-
-import java.io.*;
-import java.util.*;
-
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.forms.widgets.*;
-import org.eclipse.ui.intro.config.*;
-import org.w3c.dom.*;
-
-//
-
-public class DynamicContentProvider implements IIntroXHTMLContentProvider {
-
-
-    public void init(IIntroContentProviderSite site) {
-    }
-
-
-    public void createContent(String id, PrintWriter out) {
-    }
-
-    public void createContent(String id, Composite parent, FormToolkit toolkit) {
-    }
-
-    private String getCurrentTimeString() {
-        StringBuffer content = new StringBuffer(
-                "Dynamic content from Intro ContentProvider: ");
-        content.append("Current time is: ");
-        content.append(new Date(System.currentTimeMillis()));
-        return content.toString();
-    }
-
-    public void createContent(String id, Element parent) {
-        Document dom = parent.getOwnerDocument();
-        Element para = dom.createElement("p");
-        para.setAttribute("id", "someDynamicContentId");
-        para.appendChild(dom.createTextNode(getCurrentTimeString()));
-        parent.appendChild(para);
-
-    }
-
-
-    public void dispose() {
-
-    }
-
-
-
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/intro/java/Perspective.java b/ui/org.eclipse.pde.ui/templates_3.1/intro/java/Perspective.java
deleted file mode 100644
index b38d535..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/intro/java/Perspective.java
+++ /dev/null

@@ -1,10 +0,0 @@
-package $packageName$;
-
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IPerspectiveFactory;
-
-public class Perspective implements IPerspectiveFactory {
-
-	public void createInitialLayout(IPageLayout layout) {
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/mail/bin/icons/sample.gif b/ui/org.eclipse.pde.ui/templates_3.1/mail/bin/icons/sample.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/mail/bin/icons/sample.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/mail/bin/icons/sample.icns b/ui/org.eclipse.pde.ui/templates_3.1/mail/bin/icons/sample.icns
deleted file mode 100644
index 1e92ccc..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/mail/bin/icons/sample.icns
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/mail/bin/icons/sample2.gif b/ui/org.eclipse.pde.ui/templates_3.1/mail/bin/icons/sample2.gif
deleted file mode 100644
index 252d7eb..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/mail/bin/icons/sample2.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/mail/bin/icons/sample3.gif b/ui/org.eclipse.pde.ui/templates_3.1/mail/bin/icons/sample3.gif
deleted file mode 100644
index b949ac9..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/mail/bin/icons/sample3.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/mail/bin/plugin.properties b/ui/org.eclipse.pde.ui/templates_3.1/mail/bin/plugin.properties
deleted file mode 100644
index 77a85f2..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/mail/bin/plugin.properties
+++ /dev/null

@@ -1,10 +0,0 @@
-aboutText=This RCP Application was generated from\n\
-the PDE Plug-in Project wizard.\n\n\
-This sample shows how to:\n\
-- add a top-level menu and toolbar with actions\n\
-- add keybindings to actions\n\
-- create views that can't be closed and\n\
-  multiple instances of the same view\n\
-- perspectives with placeholders for new views\n\
-- use the default about dialog\n\
-- create a product definition\n
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/mail/bin/product_lg.gif b/ui/org.eclipse.pde.ui/templates_3.1/mail/bin/product_lg.gif
deleted file mode 100644
index bd95e28..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/mail/bin/product_lg.gif
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/mail/bin/splash.bmp b/ui/org.eclipse.pde.ui/templates_3.1/mail/bin/splash.bmp
deleted file mode 100644
index 99ea60d..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/mail/bin/splash.bmp
+++ /dev/null
Binary files differ

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/mail/java/$applicationClass$.java b/ui/org.eclipse.pde.ui/templates_3.1/mail/java/$applicationClass$.java
deleted file mode 100644
index d926eaa..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/mail/java/$applicationClass$.java
+++ /dev/null

@@ -1,27 +0,0 @@
-package $packageName$;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * This class controls all aspects of the application's execution
- */
-public class $applicationClass$ implements IPlatformRunnable {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IPlatformRunnable#run(java.lang.Object)
-	 */
-	public Object run(Object args) throws Exception {
-		Display display = PlatformUI.createDisplay();
-		try {
-			int returnCode = PlatformUI.createAndRunWorkbench(display, new ApplicationWorkbenchAdvisor());
-			if (returnCode == PlatformUI.RETURN_RESTART) {
-				return IPlatformRunnable.EXIT_RESTART;
-			}
-			return IPlatformRunnable.EXIT_OK;
-		} finally {
-			display.dispose();
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/mail/java/ApplicationActionBarAdvisor.java b/ui/org.eclipse.pde.ui/templates_3.1/mail/java/ApplicationActionBarAdvisor.java
deleted file mode 100644
index 88d8b9c..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/mail/java/ApplicationActionBarAdvisor.java
+++ /dev/null

@@ -1,91 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.GroupMarker;
-import org.eclipse.jface.action.ICoolBarManager;
-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.action.ToolBarContributionItem;
-import org.eclipse.jface.action.ToolBarManager;
-import org.eclipse.swt.SWT;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
-import org.eclipse.ui.application.ActionBarAdvisor;
-import org.eclipse.ui.application.IActionBarConfigurer;
-
-/**
- * An action bar advisor is responsible for creating, adding, and disposing of the
- * actions added to a workbench window. Each window will be populated with
- * new actions.
- */
-public class ApplicationActionBarAdvisor extends ActionBarAdvisor {
-
-    // Actions - important to allocate these only in makeActions, and then use them
-    // in the fill methods.  This ensures that the actions aren't recreated
-    // when fillActionBars is called with FILL_PROXY.
-    private IWorkbenchAction exitAction;
-    private IWorkbenchAction aboutAction;
-    private IWorkbenchAction newWindowAction;
-    private OpenViewAction openViewAction;
-    private Action messagePopupAction;
-    
-
-    public ApplicationActionBarAdvisor(IActionBarConfigurer configurer) {
-        super(configurer);
-    }
-    
-    protected void makeActions(final IWorkbenchWindow window) {
-        // Creates the actions and registers them.
-        // Registering is needed to ensure that key bindings work.
-        // The corresponding commands keybindings are defined in the plugin.xml file.
-        // Registering also provides automatic disposal of the actions when
-        // the window is closed.
-
-        exitAction = ActionFactory.QUIT.create(window);
-        register(exitAction);
-        
-        aboutAction = ActionFactory.ABOUT.create(window);
-        register(aboutAction);
-        
-        newWindowAction = ActionFactory.OPEN_NEW_WINDOW.create(window);
-        register(newWindowAction);
-        
-        openViewAction = new OpenViewAction(window, "Open Another Message View", View.ID);
-        register(openViewAction);
-        
-        messagePopupAction = new MessagePopupAction("Open Message", window);
-        register(messagePopupAction);
-    }
-    
-    protected void fillMenuBar(IMenuManager menuBar) {
-        MenuManager fileMenu = new MenuManager("&File", IWorkbenchActionConstants.M_FILE);
-        MenuManager helpMenu = new MenuManager("&Help", IWorkbenchActionConstants.M_HELP);
-        
-        menuBar.add(fileMenu);
-        // Add a group marker indicating where action set menus will appear.
-        menuBar.add(new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS));
-        menuBar.add(helpMenu);
-        
-        // File
-        fileMenu.add(newWindowAction);
-        fileMenu.add(new Separator());
-        fileMenu.add(messagePopupAction);
-        fileMenu.add(openViewAction);
-        fileMenu.add(new Separator());
-        fileMenu.add(exitAction);
-        
-        // Help
-        helpMenu.add(aboutAction);
-    }
-    
-    protected void fillCoolBar(ICoolBarManager coolBar) {
-        IToolBarManager toolbar = new ToolBarManager(SWT.FLAT | SWT.RIGHT);
-        coolBar.add(new ToolBarContributionItem(toolbar, "main"));   
-        toolbar.add(openViewAction);
-        toolbar.add(messagePopupAction);
-    }
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/mail/java/ApplicationWorkbenchAdvisor.java b/ui/org.eclipse.pde.ui/templates_3.1/mail/java/ApplicationWorkbenchAdvisor.java
deleted file mode 100644
index 2cf26b5..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/mail/java/ApplicationWorkbenchAdvisor.java
+++ /dev/null

@@ -1,23 +0,0 @@
-package $packageName$;
-
-import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
-import org.eclipse.ui.application.WorkbenchAdvisor;
-import org.eclipse.ui.application.WorkbenchWindowAdvisor;
-
-/**
- * This workbench advisor creates the window advisor, and specifies
- * the perspective id for the initial window.
- */
-public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
-	
-	private static final String PERSPECTIVE_ID = "$pluginId$.perspective";
-
-    public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) {
-        return new ApplicationWorkbenchWindowAdvisor(configurer);
-    }
-
-	public String getInitialWindowPerspectiveId() {
-		return PERSPECTIVE_ID;
-	} 
-	
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/mail/java/ApplicationWorkbenchWindowAdvisor.java b/ui/org.eclipse.pde.ui/templates_3.1/mail/java/ApplicationWorkbenchWindowAdvisor.java
deleted file mode 100644
index 57183c0..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/mail/java/ApplicationWorkbenchWindowAdvisor.java
+++ /dev/null

@@ -1,26 +0,0 @@
-package $packageName$;
-
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.ui.application.ActionBarAdvisor;
-import org.eclipse.ui.application.IActionBarConfigurer;
-import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
-import org.eclipse.ui.application.WorkbenchWindowAdvisor;
-
-public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
-
-    public ApplicationWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) {
-        super(configurer);
-    }
-
-    public ActionBarAdvisor createActionBarAdvisor(IActionBarConfigurer configurer) {
-        return new ApplicationActionBarAdvisor(configurer);
-    }
-    
-    public void preWindowOpen() {
-        IWorkbenchWindowConfigurer configurer = getWindowConfigurer();
-        configurer.setInitialSize(new Point(600, 400));
-        configurer.setShowCoolBar(true);
-        configurer.setShowStatusLine(false);
-    }
-    
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/mail/java/ICommandIds.java b/ui/org.eclipse.pde.ui/templates_3.1/mail/java/ICommandIds.java
deleted file mode 100644
index dd6d40e..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/mail/java/ICommandIds.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package $packageName$;
-
-/**
- * Interface defining the application's command IDs.
- * Key bindings can be defined for specific commands.
- * To associate an action with a command, use IAction.setActionDefinitionId(commandId).
- *
- * @see org.eclipse.jface.action.IAction#setActionDefinitionId(String)
- */
-public interface ICommandIds {
-
-    public static final String CMD_OPEN = "$pluginId$.open";
-    public static final String CMD_OPEN_MESSAGE = "$pluginId$.openMessage";
-    
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/mail/java/MessagePopupAction.java b/ui/org.eclipse.pde.ui/templates_3.1/mail/java/MessagePopupAction.java
deleted file mode 100644
index 8976bb4..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/mail/java/MessagePopupAction.java
+++ /dev/null

@@ -1,25 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.ui.IWorkbenchWindow;
-
-
-public class MessagePopupAction extends Action {
-
-    private final IWorkbenchWindow window;
-
-    MessagePopupAction(String text, IWorkbenchWindow window) {
-        super(text);
-        this.window = window;
-        // The id is used to refer to the action in a menu or toolbar
-        setId(ICommandIds.CMD_OPEN_MESSAGE);
-        // Associate the action with a pre-defined command, to allow key bindings.
-        setActionDefinitionId(ICommandIds.CMD_OPEN_MESSAGE);
-        setImageDescriptor($pluginClass$.getImageDescriptor("/icons/sample3.gif"));
-    }
-
-    public void run() {
-        MessageDialog.openInformation(window.getShell(), "Open", "Open Message Dialog!");
-    }
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/mail/java/NavigationView.java b/ui/org.eclipse.pde.ui/templates_3.1/mail/java/NavigationView.java
deleted file mode 100644
index aaae601..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/mail/java/NavigationView.java
+++ /dev/null

@@ -1,151 +0,0 @@
-package $packageName$;
-
-import java.util.ArrayList;
-
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.ViewPart;
-
-public class NavigationView extends ViewPart {
-	public static final String ID = "$pluginId$.navigationView";
-	private TreeViewer viewer;
-	 
-	class TreeObject {
-		private String name;
-		private TreeParent parent;
-		
-		public TreeObject(String name) {
-			this.name = name;
-		}
-		public String getName() {
-			return name;
-		}
-		public void setParent(TreeParent parent) {
-			this.parent = parent;
-		}
-		public TreeParent getParent() {
-			return parent;
-		}
-		public String toString() {
-			return getName();
-		}
-	}
-	
-	class TreeParent extends TreeObject {
-		private ArrayList children;
-		public TreeParent(String name) {
-			super(name);
-			children = new ArrayList();
-		}
-		public void addChild(TreeObject child) {
-			children.add(child);
-			child.setParent(this);
-		}
-		public void removeChild(TreeObject child) {
-			children.remove(child);
-			child.setParent(null);
-		}
-		public TreeObject[] getChildren() {
-			return (TreeObject[]) children.toArray(new TreeObject[children.size()]);
-		}
-		public boolean hasChildren() {
-			return children.size()>0;
-		}
-	}
-
-	class ViewContentProvider implements IStructuredContentProvider, 
-										   ITreeContentProvider {
-
-        public void inputChanged(Viewer v, Object oldInput, Object newInput) {
-		}
-        
-		public void dispose() {
-		}
-        
-		public Object[] getElements(Object parent) {
-			return getChildren(parent);
-		}
-        
-		public Object getParent(Object child) {
-			if (child instanceof TreeObject) {
-				return ((TreeObject)child).getParent();
-			}
-			return null;
-		}
-        
-		public Object[] getChildren(Object parent) {
-			if (parent instanceof TreeParent) {
-				return ((TreeParent)parent).getChildren();
-			}
-			return new Object[0];
-		}
-
-        public boolean hasChildren(Object parent) {
-			if (parent instanceof TreeParent)
-				return ((TreeParent)parent).hasChildren();
-			return false;
-		}
-	}
-	
-	class ViewLabelProvider extends LabelProvider {
-
-		public String getText(Object obj) {
-			return obj.toString();
-		}
-		public Image getImage(Object obj) {
-			String imageKey = ISharedImages.IMG_OBJ_ELEMENT;
-			if (obj instanceof TreeParent)
-			   imageKey = ISharedImages.IMG_OBJ_FOLDER;
-			return PlatformUI.getWorkbench().getSharedImages().getImage(imageKey);
-		}
-	}
-
-    /**
-     * We will set up a dummy model to initialize tree heararchy. In real
-     * code, you will connect to a real model and expose its hierarchy.
-     */
-    private TreeObject createDummyModel() {
-        TreeObject to1 = new TreeObject("Inbox");
-        TreeObject to2 = new TreeObject("Drafts");
-        TreeObject to3 = new TreeObject("Sent");
-        TreeParent p1 = new TreeParent("me@this.com");
-        p1.addChild(to1);
-        p1.addChild(to2);
-        p1.addChild(to3);
-
-        TreeObject to4 = new TreeObject("Inbox");
-        TreeParent p2 = new TreeParent("other@aol.com");
-        p2.addChild(to4);
-
-        TreeParent root = new TreeParent("");
-        root.addChild(p1);
-        root.addChild(p2);
-        return root;
-    }
-
-	/**
-     * This is a callback that will allow us to create the viewer and initialize
-     * it.
-     */
-	public void createPartControl(Composite parent) {
-		viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
-		viewer.setContentProvider(new ViewContentProvider());
-		viewer.setLabelProvider(new ViewLabelProvider());
-		viewer.setInput(createDummyModel());
-	}
-
-	/**
-	 * Passing the focus request to the viewer's control.
-	 */
-	public void setFocus() {
-		viewer.getControl().setFocus();
-	}
-}
\ No newline at end of file

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/mail/java/OpenViewAction.java b/ui/org.eclipse.pde.ui/templates_3.1/mail/java/OpenViewAction.java
deleted file mode 100644
index 7ea8882..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/mail/java/OpenViewAction.java
+++ /dev/null

@@ -1,36 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-
-
-public class OpenViewAction extends Action {
-	
-	private final IWorkbenchWindow window;
-	private int instanceNum = 0;
-	private final String viewId;
-	
-	public OpenViewAction(IWorkbenchWindow window, String label, String viewId) {
-		this.window = window;
-		this.viewId = viewId;
-        setText(label);
-        // The id is used to refer to the action in a menu or toolbar
-		setId(ICommandIds.CMD_OPEN);
-        // Associate the action with a pre-defined command, to allow key bindings.
-		setActionDefinitionId(ICommandIds.CMD_OPEN);
-		setImageDescriptor($pluginClass$.getImageDescriptor("/icons/sample2.gif"));
-	}
-	
-	public void run() {
-		if(window != null) {	
-			try {
-				window.getActivePage().showView(viewId, Integer.toString(instanceNum++), IWorkbenchPage.VIEW_ACTIVATE);
-			} catch (PartInitException e) {
-				MessageDialog.openError(window.getShell(), "Error", "Error opening view:" + e.getMessage());
-			}
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/mail/java/Perspective.java b/ui/org.eclipse.pde.ui/templates_3.1/mail/java/Perspective.java
deleted file mode 100644
index 86a9dd9..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/mail/java/Perspective.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package $packageName$;
-
-import org.eclipse.ui.IFolderLayout;
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IPerspectiveFactory;
-
-public class Perspective implements IPerspectiveFactory {
-
-	public void createInitialLayout(IPageLayout layout) {
-		String editorArea = layout.getEditorArea();
-		layout.setEditorAreaVisible(false);
-		
-		layout.addStandaloneView(NavigationView.ID,  false, IPageLayout.LEFT, 0.25f, editorArea);
-		IFolderLayout folder = layout.createFolder("messages", IPageLayout.TOP, 0.5f, editorArea);
-		folder.addPlaceholder(View.ID + ":*");
-		folder.addView(View.ID);
-		
-		layout.getViewLayout(NavigationView.ID).setCloseable(false);
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/mail/java/View.java b/ui/org.eclipse.pde.ui/templates_3.1/mail/java/View.java
deleted file mode 100644
index 224edbc..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/mail/java/View.java
+++ /dev/null

@@ -1,77 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Font;
-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.Link;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.part.ViewPart;
-
-public class View extends ViewPart {
-
-	public static final String ID = "$pluginId$.view";
-	
-	public void createPartControl(Composite parent) {
-		Composite top = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		top.setLayout(layout);
-		// top banner
-		Composite banner = new Composite(top, SWT.NONE);
-		banner.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL, GridData.VERTICAL_ALIGN_BEGINNING, true, false));
-		layout = new GridLayout();
-		layout.marginHeight = 5;
-		layout.marginWidth = 10;
-		layout.numColumns = 2;
-		banner.setLayout(layout);
-		
-		// setup bold font
-		Font boldFont = JFaceResources.getFontRegistry().getBold(JFaceResources.DEFAULT_FONT);    
-		
-		Label l = new Label(banner, SWT.WRAP);
-		l.setText("Subject:");
-		l.setFont(boldFont);
-		l = new Label(banner, SWT.WRAP);
-		l.setText("This is a message about the cool Eclipse RCP!");
-		
-		l = new Label(banner, SWT.WRAP);
-		l.setText("From:");
-		l.setFont(boldFont);
-    
-		final Link link = new Link(banner, SWT.NONE);
-		link.setText("<a>nicole@mail.org</a>");
-		link.addSelectionListener(new SelectionAdapter() {    
-			public void widgetSelected(SelectionEvent e) {
-				MessageDialog.openInformation(getSite().getShell(), "Not Implemented", "Imagine the address book or a new message being created now.");
-			}    
-		});
-    
-		l = new Label(banner, SWT.WRAP);
-		l.setText("Date:");
-		l.setFont(boldFont);
-		l = new Label(banner, SWT.WRAP);
-		l.setText("10:34 am");
-		// message contents
-		Text text = new Text(top, SWT.MULTI | SWT.WRAP);
-		text.setText("This RCP Application was generated from the PDE Plug-in Project wizard. This sample shows how to:\n"+
-						"- add a top-level menu and toolbar with actions\n"+
-						"- add keybindings to actions\n" +
-						"- create views that can't be closed and\n"+
-						"  multiple instances of the same view\n"+
-						"- perspectives with placeholders for new views\n"+
-						"- use the default about dialog\n"+
-						"- create a product definition\n");
-		text.setLayoutData(new GridData(GridData.FILL_BOTH));
-	}
-
-	public void setFocus() {
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/viewRCP/java/$applicationClass$.java b/ui/org.eclipse.pde.ui/templates_3.1/viewRCP/java/$applicationClass$.java
deleted file mode 100644
index d926eaa..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/viewRCP/java/$applicationClass$.java
+++ /dev/null

@@ -1,27 +0,0 @@
-package $packageName$;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * This class controls all aspects of the application's execution
- */
-public class $applicationClass$ implements IPlatformRunnable {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IPlatformRunnable#run(java.lang.Object)
-	 */
-	public Object run(Object args) throws Exception {
-		Display display = PlatformUI.createDisplay();
-		try {
-			int returnCode = PlatformUI.createAndRunWorkbench(display, new ApplicationWorkbenchAdvisor());
-			if (returnCode == PlatformUI.RETURN_RESTART) {
-				return IPlatformRunnable.EXIT_RESTART;
-			}
-			return IPlatformRunnable.EXIT_OK;
-		} finally {
-			display.dispose();
-		}
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/viewRCP/java/ApplicationActionBarAdvisor.java b/ui/org.eclipse.pde.ui/templates_3.1/viewRCP/java/ApplicationActionBarAdvisor.java
deleted file mode 100644
index 623c61b..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/viewRCP/java/ApplicationActionBarAdvisor.java
+++ /dev/null

@@ -1,48 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
-import org.eclipse.ui.application.ActionBarAdvisor;
-import org.eclipse.ui.application.IActionBarConfigurer;
-
-/**
- * An action bar advisor is responsible for creating, adding, and disposing of
- * the actions added to a workbench window. Each window will be populated with
- * new actions.
- */
-public class ApplicationActionBarAdvisor extends ActionBarAdvisor {
-
-	// Actions - important to allocate these only in makeActions, and then use
-	// them
-	// in the fill methods. This ensures that the actions aren't recreated
-	// when fillActionBars is called with FILL_PROXY.
-	private IWorkbenchAction exitAction;
-
-	public ApplicationActionBarAdvisor(IActionBarConfigurer configurer) {
-		super(configurer);
-	}
-
-	protected void makeActions(final IWorkbenchWindow window) {
-		// Creates the actions and registers them.
-		// Registering is needed to ensure that key bindings work.
-		// The corresponding commands keybindings are defined in the plugin.xml
-		// file.
-		// Registering also provides automatic disposal of the actions when
-		// the window is closed.
-
-		exitAction = ActionFactory.QUIT.create(window);
-		register(exitAction);
-	}
-
-	protected void fillMenuBar(IMenuManager menuBar) {
-		MenuManager fileMenu = new MenuManager("&File",
-				IWorkbenchActionConstants.M_FILE);
-		menuBar.add(fileMenu);
-		fileMenu.add(exitAction);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/viewRCP/java/ApplicationWorkbenchAdvisor.java b/ui/org.eclipse.pde.ui/templates_3.1/viewRCP/java/ApplicationWorkbenchAdvisor.java
deleted file mode 100644
index ac5e997..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/viewRCP/java/ApplicationWorkbenchAdvisor.java
+++ /dev/null

@@ -1,20 +0,0 @@
-package $packageName$;
-
-import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
-import org.eclipse.ui.application.WorkbenchAdvisor;
-import org.eclipse.ui.application.WorkbenchWindowAdvisor;
-
-public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
-
-	private static final String PERSPECTIVE_ID = "$pluginId$.perspective";
-
-	public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(
-			IWorkbenchWindowConfigurer configurer) {
-		return new ApplicationWorkbenchWindowAdvisor(configurer);
-	}
-
-	public String getInitialWindowPerspectiveId() {
-		return PERSPECTIVE_ID;
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/viewRCP/java/ApplicationWorkbenchWindowAdvisor.java b/ui/org.eclipse.pde.ui/templates_3.1/viewRCP/java/ApplicationWorkbenchWindowAdvisor.java
deleted file mode 100644
index 2f2ddbb..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/viewRCP/java/ApplicationWorkbenchWindowAdvisor.java
+++ /dev/null

@@ -1,27 +0,0 @@
-package $packageName$;
-
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.ui.application.ActionBarAdvisor;
-import org.eclipse.ui.application.IActionBarConfigurer;
-import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
-import org.eclipse.ui.application.WorkbenchWindowAdvisor;
-
-public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
-
-	public ApplicationWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) {
-		super(configurer);
-	}
-
-	public ActionBarAdvisor createActionBarAdvisor(
-			IActionBarConfigurer configurer) {
-		return new ApplicationActionBarAdvisor(configurer);
-	}
-
-	public void preWindowOpen() {
-		IWorkbenchWindowConfigurer configurer = getWindowConfigurer();
-		configurer.setInitialSize(new Point(400, 300));
-		configurer.setShowCoolBar(false);
-		configurer.setShowStatusLine(false);
-		configurer.setTitle("$windowTitle$");
-	}
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/viewRCP/java/Perspective.java b/ui/org.eclipse.pde.ui/templates_3.1/viewRCP/java/Perspective.java
deleted file mode 100644
index 4d16ecf..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/viewRCP/java/Perspective.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package $packageName$;
-
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IPerspectiveFactory;
-
-public class Perspective implements IPerspectiveFactory {
-
-	public void createInitialLayout(IPageLayout layout) {
-		String editorArea = layout.getEditorArea();
-		layout.setEditorAreaVisible(false);
-		layout.setFixed(true);
-		
-		layout.addStandaloneView(View.ID,  false, IPageLayout.LEFT, 1.0f, editorArea);
-	}
-
-}

diff --git a/ui/org.eclipse.pde.ui/templates_3.1/viewRCP/java/View.java b/ui/org.eclipse.pde.ui/templates_3.1/viewRCP/java/View.java
deleted file mode 100644
index 8a70946..0000000
--- a/ui/org.eclipse.pde.ui/templates_3.1/viewRCP/java/View.java
+++ /dev/null

@@ -1,73 +0,0 @@
-package $packageName$;
-
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.ViewPart;
-
-public class View extends ViewPart {
-	public static final String ID = "$pluginId$.view";
-
-	private TableViewer viewer;
-
-	/**
-	 * The content provider class is responsible for providing objects to the
-	 * view. It can wrap existing objects in adapters or simply return objects
-	 * as-is. These objects may be sensitive to the current input of the view,
-	 * or ignore it and always show the same content (like Task List, for
-	 * example).
-	 */
-	class ViewContentProvider implements IStructuredContentProvider {
-		public void inputChanged(Viewer v, Object oldInput, Object newInput) {
-		}
-
-		public void dispose() {
-		}
-
-		public Object[] getElements(Object parent) {
-			return new String[] { "One", "Two", "Three" };
-		}
-	}
-
-	class ViewLabelProvider extends LabelProvider implements
-			ITableLabelProvider {
-		public String getColumnText(Object obj, int index) {
-			return getText(obj);
-		}
-
-		public Image getColumnImage(Object obj, int index) {
-			return getImage(obj);
-		}
-
-		public Image getImage(Object obj) {
-			return PlatformUI.getWorkbench().getSharedImages().getImage(
-					ISharedImages.IMG_OBJ_ELEMENT);
-		}
-	}
-
-	/**
-	 * This is a callback that will allow us to create the viewer and initialize
-	 * it.
-	 */
-	public void createPartControl(Composite parent) {
-		viewer = new TableViewer(parent, SWT.MULTI | SWT.H_SCROLL
-				| SWT.V_SCROLL);
-		viewer.setContentProvider(new ViewContentProvider());
-		viewer.setLabelProvider(new ViewLabelProvider());
-		viewer.setInput(getViewSite());
-	}
-
-	/**
-	 * Passing the focus request to the viewer's control.
-	 */
-	public void setFocus() {
-		viewer.getControl().setFocus();
-	}
-}
\ No newline at end of file